- up to 2.11.2

- addy pyqt bconds
- fix qt config syntax

diff --git a/missing-header.patch b/missing-header.patch
new file mode 100644 (file)
index 0000000..6a514a4
--- /dev/null
+++ b/missing-header.patch
@@ -0,0 +1,10 @@
+--- 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
+@@ -27,6 +27,7 @@
+ #include <QByteArray>
+ #include <QPoint>
+ #include <QTimer>
++#include <QUrl>
+ 
+ #include <Qsci/qsciglobal.h>
+ 

diff --git a/python-install.patch b/python-install.patch
index bb7b10c5a1c5cd7244465220828088eb8cf2b4ab..346b92792a42d88e023d45c3d220f6d2009ee8d2 100644 (file)
--- a/python-install.patch
+++ b/python-install.patch
@@ -6,6 +6,6 @@
          self.venv_inc_dir = sysconfig.get_python_inc(prefix=sys.prefix)
 -        self.module_dir = sysconfig.get_python_lib(plat_specific=1)
 +        self.module_dir = os.path.join(sysconfig.get_python_lib(plat_specific=1,standard_lib=1), 'site-packages')
+         self.debug = hasattr(sys, 'gettotalrefcount')
  
          if sys.platform == 'win32':
-             self.data_dir = sys.prefix

diff --git a/qscintilla2-outoftree.patch b/qscintilla2-outoftree.patch
index 64d5a17a0bbc06fe84e26a333c6ea72935c45220..f34d82ae63b82382b1436aa6ec4cc1d199cb8698 100644 (file)
--- a/qscintilla2-outoftree.patch
+++ b/qscintilla2-outoftree.patch
@@ -10,23 +10,23 @@
          return path, files
  
 @@ -1257,7 +1257,7 @@
-     argv.append('-c')
-     argv.append('.')
+     # any '-I' needed appears first.
+     pkg_root = os.path.dirname(os.path.abspath(__file__))
  
--    argv.append(module_config.get_sip_file(target_config))
-+    argv.append(os.path.join(target_config.src_dir, module_config.get_sip_file(target_config)))
+-    sip_file = module_config.get_sip_file(target_config)
++    sip_file = os.path.join(target_config.src_dir, module_config.get_sip_file(target_config))
  
-     check_file = 'sipAPI%s.h' % module_config.name
-     _remove_file(check_file)
+     head, tail = os.path.split(sip_file)
+     while head:
 @@ -1611,8 +1611,11 @@
-     line arguments.  module_config is the module configuration.
+     arguments.  pkg_config is the package configuration.
      """
  
 +    src_dir = os.path.dirname(os.path.abspath(__file__))
 +
      # Create the default target configuration.
-     target_config = _TargetConfiguration(module_config)
+     target_config = _TargetConfiguration(pkg_config)
 +    target_config.src_dir = src_dir
  
      # Parse the command line.
-     p = _create_optparser(target_config, module_config)
+     p = _create_optparser(target_config, pkg_config)

diff --git a/qscintilla2.spec b/qscintilla2.spec
index fb22a9e0b6040734ed756a110641f28118470445..129f4cbe82eed26a68adabbe02e5b5c903de9e51 100644 (file)
--- a/qscintilla2.spec
+++ b/qscintilla2.spec
@@ -7,6 +7,8 @@
 %bcond_without python3 # CPython 3.x module
 %bcond_without qt4     # Qt4 library and modules
 %bcond_without qt5     # Qt5 library and modules
+%bcond_with    pyqt4   # PyQt4 modules
+%bcond_without pyqt5   # PyQt5 modules
 
 %define                scintilla_ver   3.3.6
 %define                sip_ver         4.19
@@ -15,19 +17,19 @@
 Summary:       QScintilla2 - a port to Qt of the Scintilla editing component
 Summary(pl.UTF-8):     QScintilla2 - port komponentu edytora Scintilla dla biblioteki Qt
 Name:          qscintilla2
-Version:       2.9.1
-Release:       7
+Version:       2.11.2
+Release:       0.1
 License:       GPL v3
 Group:         X11/Libraries
-Source0:       http://downloads.sourceforge.net/pyqt/QScintilla-gpl-%{version}.tar.gz
-# Source0-md5: 38e6248cb970adf6d05aea7d94f1288e
+Source0:       https://www.riverbankcomputing.com/static/Downloads/QScintilla/%{version}/QScintilla_gpl-%{version}.tar.gz
+# Source0-md5: 2ec4833e790e44698c50ec703f274bab
 Patch0:                %{name}-internal_build.patch
-Patch1:                %{name}-multiqt.patch
-Patch2:                %{name}-make.patch
 Patch3:                %{name}-outoftree.patch
 Patch4:                %{name}-qt5.patch
 Patch5:                %{name}-link.patch
 Patch6:                python-install.patch
+Patch7:                sip-check.patch
+Patch8:                missing-header.patch
 URL:           http://www.riverbankcomputing.co.uk/software/qscintilla/
 %if %{with python2}
 BuildRequires: python-sip-devel >= 2:%{sip_ver}
@@ -40,6 +42,7 @@ BuildRequires:        rpmbuild(macros) >= 1.558
 %if %{with qt4}
 BuildRequires: QtDesigner-devel >= 4.8
 BuildRequires: QtGui-devel >= 4.8
+BuildRequires: QtNetwork-devel >= 4.8
 BuildRequires: qt4-build >= 4.8
 BuildRequires: qt4-qmake >= 4.8
 BuildRequires: sip-PyQt4 >= %{pyqt4_ver}
@@ -288,75 +291,140 @@ Python 3 bindings for the QScintilla2 (PyQt5 version).
 Wiązania Pythona 3 dla komponentu QScintilla2 (wersja dla PyQt5).
 
 %prep
-%setup -q -n QScintilla-gpl-%{version}
+%setup -q -n QScintilla_gpl-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
-for qt in %{?with_qt4:qt4} %{?with_qt5:qt5} ; do
-install -d build-${qt}/{Qt4Qt5,designer-Qt4Qt5,Python2,Python3}
-cd build-${qt}/Qt4Qt5
-qmake-${qt} ../../Qt4Qt5/qscintilla.pro \
-       $(test "$qt" = "qt4" || echo QMAKE_MKSPECS=%{_libdir}/$qt/mkspecs)
+%if %{with qt4}
+install -d build-qt4/{Qt4Qt5,designer-Qt4Qt5,Python2,Python3}
+cd build-qt4/Qt4Qt5
+qmake-qt4 ../../Qt4Qt5/qscintilla.pro
 %{__make}
 cd ../designer-Qt4Qt5
-qmake-${qt} ../../designer-Qt4Qt5/designer.pro
+qmake-qt4 ../../designer-Qt4Qt5/designer.pro
 %{__make}
 cd ..
 
+%if %{with pyqt4}
 %if %{with python2}
 cd Python2
 # setup PATH to get proper qmake
 # pass --apidir because configure.py default is inconsistent with sources (no /qsci subdir)
-PATH=%{_libdir}/${qt}/bin:$PATH \
+PATH=%{_libdir}/qt4/bin:$PATH \
 %{__python} ../../Python/configure.py \
        --verbose \
        -c -j 3 \
        -n ../../Qt4Qt5 \
        -o ../Qt4Qt5 \
-       --apidir=%{_datadir}/${qt}/qsci \
-       --pyqt=PyQt${qt#qt}
+       --apidir=%{_datadir}/qt4/qsci \
+       --pyqt=PyQt4
 %{__make}
 cd ..
 %endif
 %if %{with python3}
 cd Python3
-PATH=%{_libdir}/${qt}/bin:$PATH \
+PATH=%{_libdir}/qt4/bin:$PATH \
 %{__python3} ../../Python/configure.py \
        --verbose \
        -c -j 3 \
        -n ../../Qt4Qt5 \
        -o ../Qt4Qt5 \
-       --apidir=%{_datadir}/${qt}/qsci \
-       --pyqt=PyQt${qt#qt}
+       --apidir=%{_datadir}/qt4/qsci \
+       --pyqt=PyQt4
 %{__make}
 cd ..
 %endif
+%endif
 cd ..
-done
+%endif
+
+# Qt5
+%if %{with qt5}
+install -d build-qt5/{Qt4Qt5,designer-Qt4Qt5,Python2,Python3}
+cd build-qt5/Qt4Qt5
+qmake-qt5 ../../Qt4Qt5/qscintilla.pro \
+       QMAKE_MKSPECS=%{_libdir}/qt5/mkspecs
+%{__make}
+cd ../designer-Qt4Qt5
+qmake-qt5 ../../designer-Qt4Qt5/designer.pro
+%{__make}
+cd ..
+
+%if %{with pyqt5}
+%if %{with python2}
+cd Python2
+# setup PATH to get proper qmake
+# pass --apidir because configure.py default is inconsistent with sources (no /qsci subdir)
+PATH=%{_libdir}/qt5/bin:$PATH \
+%{__python} ../../Python/configure.py \
+       --verbose \
+       -c -j 3 \
+       -n ../../Qt4Qt5 \
+       -o ../Qt4Qt5 \
+       --apidir=%{_datadir}/qt5/qsci \
+       --pyqt=PyQt5
+%{__make}
+cd ..
+%endif
+%if %{with python3}
+cd Python3
+PATH=%{_libdir}/qt5/bin:$PATH \
+%{__python3} ../../Python/configure.py \
+       --verbose \
+       -c -j 3 \
+       -n ../../Qt4Qt5 \
+       -o ../Qt4Qt5 \
+       --apidir=%{_datadir}/qt5/qsci \
+       --pyqt=PyQt5
+%{__make}
+cd ..
+%endif
+%endif
+cd ..
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-for qt in %{?with_qt4:qt4} %{?with_qt5:qt5} ; do
-%{__make} -C build-${qt}/Qt4Qt5 install \
+%if %{with qt4}
+%{__make} -C build-qt4/Qt4Qt5 install \
        INSTALL_ROOT=$RPM_BUILD_ROOT
-%{__make} -C build-${qt}/designer-Qt4Qt5 install \
+%{__make} -C build-qt4/designer-Qt4Qt5 install \
        INSTALL_ROOT=$RPM_BUILD_ROOT
+%if %{with pyqt4}
 %if %{with python3}
-%{__make} -C build-${qt}/Python3 install \
+%{__make} -C build-${qt4/Python3 install \
        INSTALL_ROOT=$RPM_BUILD_ROOT
 %endif
 %if %{with python2}
-%{__make} -C build-${qt}/Python2 install \
+%{__make} -C build-${qt4/Python2 install \
        INSTALL_ROOT=$RPM_BUILD_ROOT
 %endif
-done
+%endif
+%endif
+
+%if %{with qt5}
+%{__make} -C build-qt5/Qt4Qt5 install \
+       INSTALL_ROOT=$RPM_BUILD_ROOT
+%{__make} -C build-qt5/designer-Qt4Qt5 install \
+       INSTALL_ROOT=$RPM_BUILD_ROOT
+%if %{with pyqt5}
+%if %{with python3}
+%{__make} -C build-qt5/Python3 install \
+       INSTALL_ROOT=$RPM_BUILD_ROOT
+%endif
+%if %{with python2}
+%{__make} -C build-qt5/Python2 install \
+       INSTALL_ROOT=$RPM_BUILD_ROOT
+%endif
+%endif
+%endif
 
 # unnecessary symlink
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libqscintilla2*.so.12.0

diff --git a/sip-check.patch b/sip-check.patch
new file mode 100644 (file)
index 0000000..48fa763
--- /dev/null
+++ b/sip-check.patch
@@ -0,0 +1,20 @@
+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:
+             try:
+                 from PyQt5 import QtCore
+             except ImportError:
+-                error(
++                inform(
+                         "Unable to import PyQt5.QtCore. Make sure PyQt5 is "
+                         "installed.")
+         else:
+             try:
+                 from PyQt4 import QtCore
+             except ImportError:
+-                error(
++                inform(
+                         "Unable to import PyQt4.QtCore. Make sure PyQt4 is "
+                         "installed.")
+