- rediff patches

- fix the Python signatures of the QsciAbstractAPIs and QsciAPIs ctors

diff --git a/missing-header.patch b/missing-header.patch
index 6a514a4ed993c00470a861dfb96a108dcff78914..b15b09f2bd336a4a30f25ccc98f0ac2f8c85f1da 100644 (file)
--- 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 af84d315ae626e01af86d83d49268bb2c4099403..9c5237ad81764237517cdd26f6042f314e1f3d72 100644 (file)
--- 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 ea15a756a8d42ce6727d469e97d80512d380583a..4ed6cdc8dc137250604ffe3d0bcc7551b88ed7b9 100644 (file)
--- 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 f43824288bfec1921facd5a844f5665c1576fff4..44e154d2a9b863b7c61693498bd96ec6145ffc0c 100644 (file)
--- 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 f34d82ae63b82382b1436aa6ec4cc1d199cb8698..086be150828ad36ba157a4933fd764059c5e8f98 100644 (file)
--- 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 eb5e07385e07d609d875d87910ed5713c5ede7ac..92926a2df99ddc284aae908dc2935cba196334e9 100644 (file)
--- 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/qscintilla2.spec b/qscintilla2.spec
index 05bb2db2d310c5726cc2ca09f9e2af45a765899d..5ccd4232c5dd05fc54af51589f675ed9a1e1cb93 100644 (file)
--- 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/sip-check.patch b/sip-check.patch
index 48fa76313761b837e118ac72f9e7c8a56fa3d3d3..00b61f5ffea6eb28c3cd9d862d2686044fd7097b 100644 (file)
--- 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: