!4 [sync] PR-3: 修复 qscintilla在22.03 LTS分支编译失败

From: @openeuler-sync-bot 
Reviewed-by: @yangzhao_kl 
Signed-off-by: @yangzhao_kl
This commit is contained in:
openeuler-ci-bot 2022-08-31 01:37:50 +00:00 committed by Gitee
commit 782b84c49b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 46 additions and 1 deletions

View File

@ -0,0 +1,40 @@
From 02a0c43b1b0d586498d905f919fa795d3a616b5e Mon Sep 17 00:00:00 2001
From: phil Thompson <phil@riverbankcomputing.com>
Date: Tue, 23 Jun 2020 12:34:22 +0300
Subject: Fixed the Python signatures of the QsciAbstractAPIs and
QsciAPIs ctors,
---
Python/sip/qsciabstractapis.sip | 2 +-
Python/sip/qsciapis.sip | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Python/sip/qsciabstractapis.sip b/Python/sip/qsciabstractapis.sip
index e0240a0..a00f630 100644
--- a/Python/sip/qsciabstractapis.sip
+++ b/Python/sip/qsciabstractapis.sip
@@ -25,7 +25,7 @@ class QsciAbstractAPIs : QObject
%End
public:
- QsciAbstractAPIs(QsciLexer *lexer /TransferThis/ = 0);
+ QsciAbstractAPIs(QsciLexer *lexer /TransferThis/);
virtual ~QsciAbstractAPIs();
QsciLexer *lexer() const;
diff --git a/Python/sip/qsciapis.sip b/Python/sip/qsciapis.sip
index d5ad7d5..dbea1d7 100644
--- a/Python/sip/qsciapis.sip
+++ b/Python/sip/qsciapis.sip
@@ -25,7 +25,7 @@ class QsciAPIs : QsciAbstractAPIs
%End
public:
- QsciAPIs(QsciLexer *lexer /TransferThis/ = 0);
+ QsciAPIs(QsciLexer *lexer /TransferThis/);
virtual ~QsciAPIs();
void add(const QString &entry);
--
2.27.0

View File

@ -8,7 +8,7 @@
%global py3_sip %{_bindir}/sip
Name: qscintilla
Version: 2.11.2
Release: 1
Release: 2
License: LGPL-2.1 andGPL-3.0+ and GPL+
Summary: A Scintilla port to Qt
Url: https://github.com/opencor/qscintilla
@ -16,6 +16,7 @@ Source0: https://github.com/opencor/qscintilla/archive/v2.11.2.tar.g
Patch100: QScintilla_gpl-2_10_7-sip_check.patch
Patch101: QScintilla_gpl-2_11-QUrl.patch
Patch102: fix-build-error.patch
Patch103: 0011-Fixed-the-Python-signatures-of-the-QsciAPIs-ctors.patch
BuildRequires: gcc-c++
BuildRequires: pkgconfig(QtDesigner) pkgconfig(QtGui) pkgconfig(QtScript) pkgconfig(QtXml)
%if 0%{?qt5}
@ -92,6 +93,7 @@ BuildArch: noarch
%patch100 -p1 -b .sip_check
%patch101 -p1 -b .qurl
%patch102 -p1
%patch103 -p1
%build
%if 0%{?qt5}
@ -169,5 +171,8 @@ rm -rfv %{buildroot}%{_qt5_datadir}/qsci/
%endif
%changelog
* Fri Feb 18 2022 liwu <liwu13@huawei.com> - 2.11.2-2
- Fix build error of qscintilla
* Mon Jan 11 2021 leiju <leiju4@huawei.com> - 2.11.2-1
- package init