diff --git a/.gitignore b/.gitignore index 60a9a15..31b885e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /PyQt5_gpl-5.9.zip /PyQt5_gpl-5.9.1.zip /PyQt5_gpl-5.9.2.zip +/PyQt5_gpl-5.10.zip diff --git a/PyQt5_configure.patch b/PyQt5_configure.patch index 0b03503..f3464d4 100644 --- a/PyQt5_configure.patch +++ b/PyQt5_configure.patch @@ -1,7 +1,7 @@ -diff -rupN PyQt5_gpl-5.9.1/configure.py PyQt5_gpl-5.9.1-new/configure.py ---- PyQt5_gpl-5.9.1/configure.py 2017-11-02 10:53:48.000000000 +0100 -+++ PyQt5_gpl-5.9.1-new/configure.py 2017-11-05 16:43:21.643543488 +0100 -@@ -473,19 +473,20 @@ class TargetConfiguration: +diff -rupN PyQt5_gpl-5.10/configure.py PyQt5_gpl-5.10-new/configure.py +--- PyQt5_gpl-5.10/configure.py 2018-01-23 10:20:56.000000000 +0100 ++++ PyQt5_gpl-5.10-new/configure.py 2018-01-24 10:41:50.364860370 +0100 +@@ -499,19 +499,20 @@ class TargetConfiguration: def __init__(self): """ Initialise the configuration with default values. """ @@ -30,7 +30,7 @@ diff -rupN PyQt5_gpl-5.9.1/configure.py PyQt5_gpl-5.9.1-new/configure.py self.pyuic_interpreter = py_config.pyuic_interpreter # Remaining values. -@@ -612,7 +613,7 @@ class TargetConfiguration: +@@ -638,7 +639,7 @@ class TargetConfiguration: py_major = self.py_version >> 16 py_minor = (self.py_version >> 8) & 0x0ff @@ -39,7 +39,7 @@ diff -rupN PyQt5_gpl-5.9.1/configure.py PyQt5_gpl-5.9.1-new/configure.py debug_suffix = self.get_win32_debug_suffix() # See if we are using the limited API. -@@ -623,7 +624,7 @@ class TargetConfiguration: +@@ -649,7 +650,7 @@ class TargetConfiguration: if limited: pylib_lib = 'python%d%s' % (py_major, debug_suffix) else: @@ -48,7 +48,7 @@ diff -rupN PyQt5_gpl-5.9.1/configure.py PyQt5_gpl-5.9.1-new/configure.py pylib_dir = self.py_lib_dir -@@ -963,7 +964,7 @@ class TargetConfiguration: +@@ -989,7 +990,7 @@ class TargetConfiguration: # it where it is. if not self.static: pro_lines.extend(['win32 {', @@ -57,7 +57,7 @@ diff -rupN PyQt5_gpl-5.9.1/configure.py PyQt5_gpl-5.9.1-new/configure.py '}']) @staticmethod -@@ -1348,8 +1349,8 @@ def check_5_1_modules(target_config, dis +@@ -1377,8 +1378,8 @@ def check_5_1_modules(target_config, dis 'qsensor.h', 'new QSensor(QByteArray())') check_module(target_config, disabled_modules, verbose, 'QtSerialPort', 'qserialport.h', 'new QSerialPort()') @@ -68,7 +68,7 @@ diff -rupN PyQt5_gpl-5.9.1/configure.py PyQt5_gpl-5.9.1-new/configure.py def check_5_2_modules(target_config, disabled_modules, verbose): -@@ -1952,11 +1953,11 @@ def run_make(target_config, verbose, exe +@@ -1993,11 +1994,11 @@ def run_make(target_config, verbose, exe # Guess the name of make and set the default target and platform specific # name of the executable. @@ -84,7 +84,7 @@ diff -rupN PyQt5_gpl-5.9.1/configure.py PyQt5_gpl-5.9.1-new/configure.py if target_config.debug: makefile_target = 'debug' -@@ -2220,6 +2221,15 @@ def compile_test_program(target_config, +@@ -2261,6 +2262,15 @@ def compile_test_program(target_config, configuration. uses_sip_h is set if the test program uses sip.h. """ @@ -100,7 +100,7 @@ diff -rupN PyQt5_gpl-5.9.1/configure.py PyQt5_gpl-5.9.1-new/configure.py metadata = MODULE_METADATA[mname] # The derived file names. -@@ -2238,11 +2248,11 @@ def compile_test_program(target_config, +@@ -2279,11 +2289,11 @@ def compile_test_program(target_config, # Create the .pro file. pro_lines = [] @@ -114,7 +114,7 @@ diff -rupN PyQt5_gpl-5.9.1/configure.py PyQt5_gpl-5.9.1-new/configure.py pro_lines.append('SOURCES = %s' % name_source) -@@ -2250,10 +2260,10 @@ def compile_test_program(target_config, +@@ -2291,10 +2301,10 @@ def compile_test_program(target_config, f.write('\n'.join(pro_lines)) f.close() @@ -127,7 +127,7 @@ diff -rupN PyQt5_gpl-5.9.1/configure.py PyQt5_gpl-5.9.1-new/configure.py def run_test_program(mname, test, verbose): -@@ -2331,7 +2341,7 @@ def get_sip_flags(target_config): +@@ -2372,7 +2382,7 @@ def get_sip_flags(target_config): sip_flags.append('-D') # Handle the platform tag. diff --git a/PyQt5_wswin.patch b/PyQt5_wswin.patch index 90dd98a..02014c1 100644 --- a/PyQt5_wswin.patch +++ b/PyQt5_wswin.patch @@ -1,7 +1,7 @@ -diff -rupN PyQt5_gpl-5.9.1/configure.py PyQt5_gpl-5.9.1-new/configure.py ---- PyQt5_gpl-5.9.1/configure.py 2017-11-05 16:43:21.698543408 +0100 -+++ PyQt5_gpl-5.9.1-new/configure.py 2017-11-05 16:43:21.700543405 +0100 -@@ -2486,7 +2486,7 @@ def generate_sip_module_code(target_conf +diff -rupN PyQt5_gpl-5.10/configure.py PyQt5_gpl-5.10-new/configure.py +--- PyQt5_gpl-5.10/configure.py 2018-01-24 10:41:50.421860366 +0100 ++++ PyQt5_gpl-5.10-new/configure.py 2018-01-24 10:41:50.423860366 +0100 +@@ -2527,7 +2527,7 @@ def generate_sip_module_code(target_conf os.path.join('QtCore', 'qpycore_post_init.cpp')) for line in in_f: diff --git a/mingw-python-qt5.spec b/mingw-python-qt5.spec index 20920b5..6579647 100644 --- a/mingw-python-qt5.spec +++ b/mingw-python-qt5.spec @@ -17,8 +17,8 @@ Name: mingw-%{pkgname} Summary: MinGW Windows PyQt5 -Version: 5.9.2 -Release: 3%{?dist} +Version: 5.10 +Release: 1%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: (GPLv3 or GPLv2 with exceptions) and BSD @@ -28,8 +28,6 @@ Source0: http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-%{versi Patch0: PyQt5_configure.patch # Hack in WS_WIN instead of WS_X11 in sip-flags Patch1: PyQt5_wswin.patch -# Support newer Qt5 releases than just 5.9.3 -Patch2: PyQt5-Timeline.patch BuildRequires: python2-devel BuildRequires: sip-devel @@ -198,6 +196,9 @@ find %{buildroot}%{mingw64_prefix} | grep -E '.(exe|dll|pyd)$' | sed 's|^%{build %changelog +* Wed Jan 24 2018 Sandro mani - 5.10-1 +- Update to 5.10 + * Mon Jan 08 2018 Sandro Mani - 5.9.2-3 - Support Qt5 newer than just 5.9.3 (+5.9.4,5.10.0,5.10.1) diff --git a/sources b/sources index 5d283ce..d2d4e08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyQt5_gpl-5.9.2.zip) = 26144c1223997dfa7eed70cbf408d454bcafd3e71c9b479172a943537c4e8aaf2a1a0853da80dff615defd5eb6e8297e6fdd3021bb2ae7669142ac3b60c742fe +SHA512 (PyQt5_gpl-5.10.zip) = 32897291717df734ac6e0992f23e3ab2104708c10240cc824586f9622c1d0bdc0fb240569826ffa38ed2f3357dec216e6a0b9d6241b64e97cc3226807378ac91