diff --git a/0011-Fixed-the-Python-signatures-of-the-QsciAPIs-ctors.patch b/0011-Fixed-the-Python-signatures-of-the-QsciAPIs-ctors.patch deleted file mode 100644 index 113f9ce1d2ab104a00b3dd6d0eab0b2439efca16..0000000000000000000000000000000000000000 --- a/0011-Fixed-the-Python-signatures-of-the-QsciAPIs-ctors.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 02a0c43b1b0d586498d905f919fa795d3a616b5e Mon Sep 17 00:00:00 2001 -From: phil Thompson -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 - diff --git a/fix-build-error.patch b/fix-build-error.patch index d7b17db413d444f03cfa5fd705eb5c0e632f9ba5..2e87efbdc64d6fa6d6287de00640c5cc75ff4202 100644 --- a/fix-build-error.patch +++ b/fix-build-error.patch @@ -1,8 +1,8 @@ -diff -Nur qscintilla-2.11.2/Qt4Qt5/Qsci/qsciglobal.h QScintilla_gpl-2.11.2/Qt4Qt5/Qsci/qsciglobal.h ---- qscintilla-2.11.2/Qt4Qt5/Qsci/qsciglobal.h 2019-06-27 13:40:05.000000000 +0800 -+++ QScintilla_gpl-2.11.2/Qt4Qt5/Qsci/qsciglobal.h 2019-06-25 20:49:27.000000000 +0800 +diff -Nur qscintilla-2.11.6/Qt4Qt5/Qsci/qsciglobal.h qscintilla-2.11.6/Qt4Qt5/Qsci/qsciglobal.h +--- qscintilla-2.11.6/Qt4Qt5/Qsci/qsciglobal.h 2019-06-27 13:40:05.000000000 +0800 ++++ qscintilla-2.11.6/Qt4Qt5/Qsci/qsciglobal.h 2019-06-25 20:49:27.000000000 +0800 @@ -28,11 +28,15 @@ - #define QSCINTILLA_VERSION_STR "2.11.2" + #define QSCINTILLA_VERSION_STR "2.11.6" -// Define QSCINTILLA_MAKE_DLL to create a QScintilla shared library. @@ -21,10 +21,10 @@ diff -Nur qscintilla-2.11.2/Qt4Qt5/Qsci/qsciglobal.h QScintilla_gpl-2.11.2/Qt4Qt #endif -diff -Nur qscintilla-2.11.2/Qt4Qt5/qscintilla.pro QScintilla_gpl-2.11.2/Qt4Qt5/qscintilla.pro ---- qscintilla-2.11.2/Qt4Qt5/qscintilla.pro 2019-06-27 13:40:05.000000000 +0800 -+++ QScintilla_gpl-2.11.2/Qt4Qt5/qscintilla.pro 2019-06-25 20:49:27.000000000 +0800 -@@ -68,18 +68,20 @@ +diff -Nur qscintilla-2.11.6/Qt4Qt5/qscintilla.pro qscintilla-2.11.6/Qt4Qt5/qscintilla.pro +--- qscintilla-2.11.6/Qt4Qt5/qscintilla.pro 2021-01-06 10:52:53.000000000 +0800 ++++ qscintilla-2.11.6/Qt4Qt5/qscintilla.pro 2025-01-05 18:47:19.443415100 +0800 +@@ -72,18 +72,20 @@ # Scintilla namespace rather than pollute the global namespace. #DEFINES += SCI_NAMESPACE @@ -47,11 +47,11 @@ diff -Nur qscintilla-2.11.2/Qt4Qt5/qscintilla.pro QScintilla_gpl-2.11.2/Qt4Qt5/q greaterThan(QT_MAJOR_VERSION, 4) { features.path = $$[QT_HOST_DATA]/mkspecs/features -@@ -91,6 +93,7 @@ +@@ -95,6 +97,7 @@ } else { features.files = $$PWD/features/qscintilla2.prf } +INSTALLS += features HEADERS = \ - ./Qsci/qsciglobal.h \ + ./Qsci/qsciglobal.h \ diff --git a/qscintilla.spec b/qscintilla.spec index dd996d9e31faf537d96e32adfcbc104802c3a733..2c8869b0d7a2d661ad02f4eee77f1163c1e70905 100644 --- a/qscintilla.spec +++ b/qscintilla.spec @@ -1,56 +1,25 @@ %global scintilla_ver 3.10.1 %global sip_ver 4.19.7 -%if ! 0%{?bootstrap} -%global python3 1 -%endif -%global qt5 1 %global py3_sipdir %{_datadir}/sip %global py3_sip %{_bindir}/sip Name: qscintilla -Version: 2.11.2 -Release: 2 -License: LGPL-2.1 andGPL-3.0+ and GPL+ +Version: 2.11.6 +Release: 1 +License: GPL-3.0-only Summary: A Scintilla port to Qt Url: https://github.com/opencor/qscintilla -Source0: https://github.com/opencor/qscintilla/archive/v2.11.2.tar.gz +Source0: https://github.com/opencor/qscintilla/archive/refs/tags/v%{version}.tar.gz 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} BuildRequires: pkgconfig(Qt5Designer) pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets) -%endif Provides: bundled(scintilla) = %{scintilla_ver} %description QScintilla is a port of Scintilla to the Qt GUI toolkit. %{?scintilla_ver:This version of QScintilla is based on Scintilla v%{scintilla_ver}.} -%if 0%{?python3} -%package -n python3-qscintilla -Summary: QScintilla python3 bindings -BuildRequires: python3-devel python3-PyQt4-devel -Provides: %{name}-python3 = %{version}-%{release} -Provides: python3-PyQt5-Qsci = %{version}-%{release} -Requires: %{name}%{?_isa} = %{version}-%{release} python3-PyQt4 -%{?_sip_api:Requires: python3-pyqt4-sip-api(%{_sip_api_major}) >= %{_sip_api}} - -%description -n python3-qscintilla -%{summary}. - -%package -n python3-qscintilla-devel -Summary: Development files for QScintilla python3 bindings -Provides: %{name}-python3-devel = %{version}-%{release} -Requires: python3-PyQt4-devel -BuildArch: noarch - -%description -n python3-qscintilla-devel -%{summary}. -%endif - -%if 0%{?qt5} %package qt5 Summary: A Scintilla port to Qt5 Provides: bundled(scintilla) = %{scintilla_ver} @@ -65,7 +34,6 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release} qt5-qtbase-deve %description qt5-devel %{summary}. -%if 0%{?python3} %package -n python3-qscintilla-qt5 Summary: QScintilla-qt5 python3 bindings BuildRequires: python3-qt5 python3-qt5-devel python3-sip-devel >= %{sip_ver} @@ -85,69 +53,50 @@ BuildArch: noarch %description -n python3-qscintilla-qt5-devel %{summary}. -%endif -%endif %prep -%setup -q -n qscintilla-%{version} -%patch100 -p1 -b .sip_check -%patch101 -p1 -b .qurl -%patch102 -p1 -%patch103 -p1 +%autosetup -p1 -n qscintilla-%{version} %build -%if 0%{?qt5} PATH=%{_qt5_bindir}:$PATH; export PATH -cp -a Qt4Qt5 Qt5/ -pushd Qt5 + +pushd Qt4Qt5 %{qmake_qt5} qscintilla.pro %make_build popd -QMAKEFEATURES=`pwd`/Qt5/features; export QMAKEFEATURES -cp -a designer-Qt4Qt5 designer-Qt5/ -pushd designer-Qt5 -%{qmake_qt5} designer.pro INCLUDEPATH+=../Qt5 LIBS+=-L../Qt5 + +QMAKEFEATURES=`pwd`/Qt4Qt5/features; export QMAKEFEATURES +pushd designer-Qt4Qt5 +%{qmake_qt5} designer.pro INCLUDEPATH+=../Qt4Qt5 LIBS+=-L../Qt4Qt5 %make_build popd -%if 0%{?python3} -cp -a Python Python3-qt5 -pushd Python3-qt5 + +pushd Python %{__python3} \ configure.py --verbose \ --pyqt=PyQt5 \ --sip=/usr/bin/sip-pyqt5 \ - --qsci-incdir=../Qt5 --qsci-libdir=../Qt5 + --qsci-incdir=../Qt4Qt5 --qsci-libdir=../Qt4Qt5 + +pushd Qsci +%{qmake_qt5} Qsci.pro -o Makefile +popd %make_build popd -%endif -%endif %install -%if 0%{?qt5} -make -C Qt5 install INSTALL_ROOT=%{buildroot} +make -C Qt4Qt5 install INSTALL_ROOT=%{buildroot} ln -s libqscintilla2_qt5.so %{buildroot}%{_qt5_libdir}/libqscintilla2-qt5.so -make -C designer-Qt5 install INSTALL_ROOT=%{buildroot} -%if 0%{?python3} -make -C Python3-qt5 install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} +make -C designer-Qt4Qt5 install INSTALL_ROOT=%{buildroot} +make -C Python install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} test -x %{buildroot}%{python3_sitearch}/PyQt5/Qsci.so || \ chmod a+x %{buildroot}%{python3_sitearch}/PyQt5/Qsci.so -%endif -%endif + %find_lang qscintilla --with-qt -%if 0%{?qt5} grep "%{_qt5_translationdir}" qscintilla.lang > qscintilla-qt5.lang -%endif -%if ! ( 0%{?qt5} && 0%{?python3}) -rm -rfv %{buildroot}%{_qt5_datadir}/qsci/ -%endif - -%check - -%if 0%{?qt5} -%ldconfig_scriptlets qt5 %files qt5 -f qscintilla-qt5.lang -%doc NEWS README +%doc NEWS %license LICENSE %{_qt5_libdir}/libqscintilla2_qt5.so.15* %{_qt5_plugindir}/designer/libqscintillaplugin.so @@ -159,7 +108,6 @@ rm -rfv %{buildroot}%{_qt5_datadir}/qsci/ %{_qt5_archdatadir}/mkspecs/features/qscintilla2.prf %{_qt5_libdir}/libqscintilla2-qt5.so -%if 0%{?python3} %files -n python3-qscintilla-qt5 %{python3_sitearch}/PyQt5/Qsci.* %{_qt5_datadir}/qsci/ @@ -167,10 +115,13 @@ rm -rfv %{buildroot}%{_qt5_datadir}/qsci/ %files -n python3-qscintilla-qt5-devel %{py3_sipdir}/PyQt5/Qsci/ -%endif -%endif %changelog +* Sun Jan 05 2025 Funda Wang - 2.11.6-1 +- update to 2.11.6 +- drop redunctant conditions regarding qt5 and python3, as we only provide + single flavour for now + * Fri Feb 18 2022 liwu - 2.11.2-2 - Fix build error of qscintilla diff --git a/v2.11.2.tar.gz b/v2.11.2.tar.gz deleted file mode 100644 index 7a13b7e744e2a9d109b55f18672574da6ddf9b8d..0000000000000000000000000000000000000000 Binary files a/v2.11.2.tar.gz and /dev/null differ diff --git a/v2.11.6.tar.gz b/v2.11.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d52210587bc6745df68d1d9149a5642c2cc82647 Binary files /dev/null and b/v2.11.6.tar.gz differ