[packages/qscintilla2] - rediff patches - fix the Python signatures of the QsciAbstractAPIs and QsciAPIs ctors
baggins
baggins at pld-linux.org
Fri Mar 5 20:20:20 CET 2021
commit 57b2ad6bb83d192cf857a2488a19f00821b9c0a3
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Mar 5 20:19:54 2021 +0100
- rediff patches
- fix the Python signatures of the QsciAbstractAPIs and QsciAPIs ctors
missing-header.patch | 5 +++--
py-config.patch | 14 ++++----------
python-install.patch | 9 +++++----
qscintilla2-internal_build.patch | 30 ++++++++++++++++--------------
qscintilla2-outoftree.patch | 11 ++++++-----
qscintilla2-qt5.patch | 7 ++++---
qscintilla2.spec | 2 ++
sip-check.patch | 8 ++++----
8 files changed, 44 insertions(+), 42 deletions(-)
---
diff --git a/qscintilla2.spec b/qscintilla2.spec
index 05bb2db..5ccd423 100644
--- a/qscintilla2.spec
+++ b/qscintilla2.spec
@@ -28,6 +28,7 @@ Patch5: py-config.patch
Patch6: python-install.patch
Patch7: sip-check.patch
Patch8: missing-header.patch
+Patch9: 0011-Fixed-the-Python-signatures-of-the-QsciAPIs-ctors.patch
URL: http://www.riverbankcomputing.co.uk/software/qscintilla/
%if %{with python2}
BuildRequires: python-sip-devel >= 2:%{sip_ver}
@@ -295,6 +296,7 @@ Wiązania Pythona 3 dla komponentu QScintilla2 (wersja dla PyQt5).
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%build
for qt in %{?with_qt4:qt4} %{?with_qt5:qt5} ; do
diff --git a/missing-header.patch b/missing-header.patch
index 6a514a4..b15b09f 100644
--- a/missing-header.patch
+++ b/missing-header.patch
@@ -1,5 +1,6 @@
---- QScintilla_gpl-2.11.2/Qt4Qt5/Qsci/qsciscintillabase.h~ 2019-06-25 14:49:27.000000000 +0200
-+++ QScintilla_gpl-2.11.2/Qt4Qt5/Qsci/qsciscintillabase.h 2019-09-14 22:16:51.138484959 +0200
+diff -urNp -x '*.orig' QScintilla_gpl-2.11.2.org/Qt4Qt5/Qsci/qsciscintillabase.h QScintilla_gpl-2.11.2/Qt4Qt5/Qsci/qsciscintillabase.h
+--- QScintilla_gpl-2.11.2.org/Qt4Qt5/Qsci/qsciscintillabase.h 2019-06-25 14:49:27.000000000 +0200
++++ QScintilla_gpl-2.11.2/Qt4Qt5/Qsci/qsciscintillabase.h 2021-03-05 20:11:28.523442560 +0100
@@ -27,6 +27,7 @@
#include <QByteArray>
#include <QPoint>
diff --git a/py-config.patch b/py-config.patch
index af84d31..9c5237a 100644
--- a/py-config.patch
+++ b/py-config.patch
@@ -1,13 +1,7 @@
-
-target_config.src_dir and thus sip_file is an absolute path,
-this means the head from os.path.split() winn _never_be empty,
-it will always contain at least a '/'. This whole while loop
-does not make any sense to me since config seems to be interested
-in checking if sip_file is a full path or only a file name.
-
---- QScintilla_gpl-2.11.2/Python/configure.py~ 2019-10-06 09:53:25.000000000 +0200
-+++ QScintilla_gpl-2.11.2/Python/configure.py 2019-10-06 09:53:37.516896207 +0200
-@@ -1354,8 +1354,6 @@
+diff -urNp -x '*.orig' QScintilla_gpl-2.11.2.org/Python/configure.py QScintilla_gpl-2.11.2/Python/configure.py
+--- QScintilla_gpl-2.11.2.org/Python/configure.py 2021-03-05 20:11:27.686780829 +0100
++++ QScintilla_gpl-2.11.2/Python/configure.py 2021-03-05 20:11:27.783446925 +0100
+@@ -1354,8 +1354,6 @@ def _generate_code(target_config, opts,
sip_file = os.path.join(target_config.src_dir, module_config.get_sip_file(target_config))
head, tail = os.path.split(sip_file)
diff --git a/python-install.patch b/python-install.patch
index ea15a75..4ed6cdc 100644
--- a/python-install.patch
+++ b/python-install.patch
@@ -1,6 +1,7 @@
---- QScintilla-gpl-2.9.1/Python/configure.py~ 2015-12-05 19:19:23.000000000 +0100
-+++ QScintilla-gpl-2.9.1/Python/configure.py 2015-12-05 19:53:29.639660268 +0100
-@@ -619,7 +619,7 @@
+diff -urNp -x '*.orig' QScintilla_gpl-2.11.2.org/Python/configure.py QScintilla_gpl-2.11.2/Python/configure.py
+--- QScintilla_gpl-2.11.2.org/Python/configure.py 2021-03-05 20:11:27.933446039 +0100
++++ QScintilla_gpl-2.11.2/Python/configure.py 2021-03-05 20:11:28.030112136 +0100
+@@ -645,7 +645,7 @@ class _HostPythonConfiguration:
self.inc_dir = sysconfig.get_python_inc()
self.venv_inc_dir = sysconfig.get_python_inc(prefix=sys.prefix)
@@ -9,7 +10,7 @@
self.debug = hasattr(sys, 'gettotalrefcount')
if sys.platform == 'win32':
-@@ -1564,7 +1564,10 @@
+@@ -1564,7 +1564,10 @@ sip.files =''' % quote(path))
fn = fn.replace(os.sep, '/')
fn = os.path.normpath(fn)
diff --git a/qscintilla2-internal_build.patch b/qscintilla2-internal_build.patch
index f438242..44e154d 100644
--- a/qscintilla2-internal_build.patch
+++ b/qscintilla2-internal_build.patch
@@ -1,17 +1,7 @@
---- QScintilla-2.8-gpl/designer-Qt4Qt5/designer.pro.orig 2006-12-25 04:56:07.000000000 +0100
-+++ QScintilla-2.8-gpl/designer-Qt4Qt5/designer.pro 2006-12-26 02:54:57.792560260 +0100
-@@ -3,6 +3,8 @@
-
- TEMPLATE = lib
- TARGET = qscintillaplugin
-+INCLUDEPATH = ../Qt4Qt5
-+LIBPATH = ../Qt4Qt5
-
- CONFIG += designer release plugin
-
---- QScintilla-gpl-2.8.4/Python/configure.py.orig 2014-09-11 19:15:17.000000000 +0200
-+++ QScintilla-gpl-2.8.4/Python/configure.py 2014-11-02 14:41:09.187039766 +0100
-@@ -1418,7 +1418,7 @@
+diff -urNp -x '*.orig' QScintilla_gpl-2.11.2.org/Python/configure.py QScintilla_gpl-2.11.2/Python/configure.py
+--- QScintilla_gpl-2.11.2.org/Python/configure.py 2019-06-25 14:49:28.000000000 +0200
++++ QScintilla_gpl-2.11.2/Python/configure.py 2021-03-05 20:11:27.050117920 +0100
+@@ -1602,7 +1602,7 @@ INSTALLS += sip
includepath = qmake_config.get('INCLUDEPATH')
if includepath:
@@ -20,3 +10,15 @@
# Make sure the SIP include directory is searched before the Python include
# directory if they are different.
+diff -urNp -x '*.orig' QScintilla_gpl-2.11.2.org/designer-Qt4Qt5/designer.pro QScintilla_gpl-2.11.2/designer-Qt4Qt5/designer.pro
+--- QScintilla_gpl-2.11.2.org/designer-Qt4Qt5/designer.pro 2019-06-25 14:49:28.000000000 +0200
++++ QScintilla_gpl-2.11.2/designer-Qt4Qt5/designer.pro 2021-03-05 20:11:27.050117920 +0100
+@@ -3,6 +3,8 @@
+
+ TEMPLATE = lib
+ TARGET = qscintillaplugin
++INCLUDEPATH = ../Qt4Qt5
++LIBPATH = ../Qt4Qt5
+
+ CONFIG += plugin qscintilla2
+
diff --git a/qscintilla2-outoftree.patch b/qscintilla2-outoftree.patch
index f34d82a..086be15 100644
--- a/qscintilla2-outoftree.patch
+++ b/qscintilla2-outoftree.patch
@@ -1,6 +1,7 @@
---- QScintilla-gpl-2.8.4/Python/configure.py.orig 2014-11-04 16:22:47.229532126 +0100
-+++ QScintilla-gpl-2.8.4/Python/configure.py 2014-11-07 22:03:55.811128882 +0100
-@@ -278,7 +278,7 @@
+diff -urNp -x '*.orig' QScintilla_gpl-2.11.2.org/Python/configure.py QScintilla_gpl-2.11.2/Python/configure.py
+--- QScintilla_gpl-2.11.2.org/Python/configure.py 2021-03-05 20:11:27.200117035 +0100
++++ QScintilla_gpl-2.11.2/Python/configure.py 2021-03-05 20:11:27.296783130 +0100
+@@ -294,7 +294,7 @@ class ModuleConfiguration(object):
return None
path = os.path.join(target_configuration.qsci_sip_dir, 'Qsci')
@@ -9,7 +10,7 @@
return path, files
-@@ -1257,7 +1257,7 @@
+@@ -1351,7 +1351,7 @@ def _generate_code(target_config, opts,
# any '-I' needed appears first.
pkg_root = os.path.dirname(os.path.abspath(__file__))
@@ -18,7 +19,7 @@
head, tail = os.path.split(sip_file)
while head:
-@@ -1611,8 +1611,11 @@
+@@ -1823,8 +1823,11 @@ def _main(argv, pkg_config):
arguments. pkg_config is the package configuration.
"""
diff --git a/qscintilla2-qt5.patch b/qscintilla2-qt5.patch
index eb5e073..92926a2 100644
--- a/qscintilla2-qt5.patch
+++ b/qscintilla2-qt5.patch
@@ -1,6 +1,7 @@
---- QScintilla-gpl-2.8.4/Python/configure.py.orig 2014-11-12 22:27:21.379600943 +0100
-+++ QScintilla-gpl-2.8.4/Python/configure.py 2014-11-13 18:23:22.469922749 +0100
-@@ -289,7 +289,7 @@
+diff -urNp -x '*.orig' QScintilla_gpl-2.11.2.org/Python/configure.py QScintilla_gpl-2.11.2/Python/configure.py
+--- QScintilla_gpl-2.11.2.org/Python/configure.py 2021-03-05 20:11:27.443448932 +0100
++++ QScintilla_gpl-2.11.2/Python/configure.py 2021-03-05 20:11:27.536781714 +0100
+@@ -306,7 +306,7 @@ class ModuleConfiguration(object):
version of Qt. target_configuration is the target configuration.
"""
diff --git a/sip-check.patch b/sip-check.patch
index 48fa763..00b61f5 100644
--- a/sip-check.patch
+++ b/sip-check.patch
@@ -1,7 +1,7 @@
-diff -up QScintilla_gpl-2.10.7/Python/configure.py.sip-check QScintilla_gpl-2.10.7/Python/configure.py
---- QScintilla_gpl-2.10.7/Python/configure.py.sip-check 2018-06-29 06:57:42.000000000 -0500
-+++ QScintilla_gpl-2.10.7/Python/configure.py 2018-07-22 11:48:43.271510206 -0500
-@@ -875,14 +875,14 @@ class _TargetConfiguration:
+diff -urNp -x '*.orig' QScintilla_gpl-2.11.2.org/Python/configure.py QScintilla_gpl-2.11.2/Python/configure.py
+--- QScintilla_gpl-2.11.2.org/Python/configure.py 2021-03-05 20:11:28.180111251 +0100
++++ QScintilla_gpl-2.11.2/Python/configure.py 2021-03-05 20:11:28.276777348 +0100
+@@ -880,14 +880,14 @@ class _TargetConfiguration:
try:
from PyQt5 import QtCore
except ImportError:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qscintilla2.git/commitdiff/57b2ad6bb83d192cf857a2488a19f00821b9c0a3
More information about the pld-cvs-commit
mailing list