diff --git a/.gitignore b/.gitignore index 91e2926..d678403 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /PyQt5_gpl-5.11.2.tar.gz /PyQt5_gpl-5.11.3.tar.gz /PyQt5_gpl-5.12.1.tar.gz +/PyQt5_gpl-5.12.2.tar.gz diff --git a/PyQt5_configure.patch b/PyQt5_configure.patch index be9c193..518c2c7 100644 --- a/PyQt5_configure.patch +++ b/PyQt5_configure.patch @@ -1,6 +1,6 @@ -diff -rupN PyQt5_gpl-5.12.1/configure.py PyQt5_gpl-5.12.1-new/configure.py ---- PyQt5_gpl-5.12.1/configure.py 2019-04-25 10:49:31.642361200 +0200 -+++ PyQt5_gpl-5.12.1-new/configure.py 2019-04-25 10:49:31.644361195 +0200 +diff -rupN PyQt5_gpl-5.12.2/configure.py PyQt5_gpl-5.12.2-new/configure.py +--- PyQt5_gpl-5.12.2/configure.py 2019-05-07 11:17:19.650775680 +0200 ++++ PyQt5_gpl-5.12.2-new/configure.py 2019-05-07 11:17:19.652775676 +0200 @@ -500,7 +500,7 @@ class TargetConfiguration: self.py_inc_dir = py_config.inc_dir self.py_venv_inc_dir = py_config.venv_inc_dir @@ -10,7 +10,7 @@ diff -rupN PyQt5_gpl-5.12.1/configure.py PyQt5_gpl-5.12.1-new/configure.py self.py_version = py_config.version self.pyqt_bin_dir = py_config.bin_dir self.pyqt_module_dir = py_config.module_dir -@@ -993,7 +993,7 @@ class TargetConfiguration: +@@ -987,7 +987,7 @@ class TargetConfiguration: # it where it is. if not self.static: pro_lines.extend(['win32 {', @@ -19,7 +19,7 @@ diff -rupN PyQt5_gpl-5.12.1/configure.py PyQt5_gpl-5.12.1-new/configure.py '}']) @staticmethod -@@ -1387,8 +1387,8 @@ def check_5_1_modules(target_config, dis +@@ -1381,8 +1381,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()') @@ -30,7 +30,7 @@ diff -rupN PyQt5_gpl-5.12.1/configure.py PyQt5_gpl-5.12.1-new/configure.py def check_5_2_modules(target_config, disabled_modules, verbose): -@@ -1844,7 +1844,7 @@ def pro_sources(src_dir, other_headers=N +@@ -1838,7 +1838,7 @@ def pro_sources(src_dir, other_headers=N def module_file_name(target_config, name): """ Return the name of a file implementing a module. """ @@ -39,7 +39,7 @@ diff -rupN PyQt5_gpl-5.12.1/configure.py PyQt5_gpl-5.12.1-new/configure.py fs = '{}.lib' if target_config.static else '{}.pyd' else: fs = 'lib{}.a' if target_config.static else '{}.so' -@@ -2060,11 +2060,11 @@ def run_make(target_config, verbose, exe +@@ -2054,11 +2054,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. @@ -55,7 +55,7 @@ diff -rupN PyQt5_gpl-5.12.1/configure.py PyQt5_gpl-5.12.1-new/configure.py if target_config.debug: makefile_target = 'debug' -@@ -2337,6 +2337,19 @@ def compile_test_program(target_config, +@@ -2331,6 +2331,19 @@ def compile_test_program(target_config, metadata = MODULE_METADATA[mname] diff --git a/PyQt5_wswin.patch b/PyQt5_wswin.patch index 7a13329..a357500 100644 --- a/PyQt5_wswin.patch +++ b/PyQt5_wswin.patch @@ -1,7 +1,7 @@ -diff -rupN PyQt5_gpl-5.12.1/configure.py PyQt5_gpl-5.12.1-new/configure.py ---- PyQt5_gpl-5.12.1/configure.py 2019-03-19 15:42:34.000000000 +0100 -+++ PyQt5_gpl-5.12.1-new/configure.py 2019-04-25 10:49:31.564361388 +0200 -@@ -2593,7 +2593,7 @@ def generate_sip_module_code(target_conf +diff -rupN PyQt5_gpl-5.12.2/configure.py PyQt5_gpl-5.12.2-new/configure.py +--- PyQt5_gpl-5.12.2/configure.py 2019-05-06 11:03:23.000000000 +0200 ++++ PyQt5_gpl-5.12.2-new/configure.py 2019-05-07 11:17:19.592775786 +0200 +@@ -2584,7 +2584,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 935014b..4a34b1e 100644 --- a/mingw-python-qt5.spec +++ b/mingw-python-qt5.spec @@ -23,7 +23,7 @@ Name: mingw-%{pkgname} Summary: MinGW Windows PyQt5 -Version: 5.12.1 +Version: 5.12.2 Release: 2%{?pre:.%pre}%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) @@ -310,6 +310,9 @@ find %{buildroot}%{mingw64_prefix} | grep -E '.(exe|dll|pyd)$' | sed 's|^%{build %changelog +* Tue May 07 2019 Sandro Mani - 5.12.2-1 +- Update to 5.12.2 + * Wed May 01 2019 Sandro Mani - 5.12.1-2 - Add python3 subpackages diff --git a/sources b/sources index 16d2e0e..0cfa811 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyQt5_gpl-5.12.1.tar.gz) = f8c440bd5e804b9f5fcabbdf1290cee3176f3d676d150c705b64136d2116ccd7b09233672674fe97a4aa521974c9355d44daf7a244b6cda7fa55757332c08e67 +SHA512 (PyQt5_gpl-5.12.2.tar.gz) = dc23bb7dacb305d4f9a630f2b5c3809d5d6734ba234c9941a3c44c770af8534dd737160dbe007a1f15d5c90e2e52419dd749b3ef942b4e71917c1cea2220a666