From e9f69639a6a4eec8bc264048d1afdede2e27b97f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Oct 01 2019 16:52:08 +0000 Subject: Update to 5.13.1 --- diff --git a/.gitignore b/.gitignore index c3a5abb..ceea20c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /PyQt5_gpl-5.12.2.tar.gz /PyQt5_gpl-5.12.3.tar.gz /PyQt5_gpl-5.13.0.tar.gz +/PyQt5_gpl-5.13.1.tar.gz diff --git a/PyQt5_configure.patch b/PyQt5_configure.patch index 1fcfec1..80ec894 100644 --- a/PyQt5_configure.patch +++ b/PyQt5_configure.patch @@ -1,6 +1,6 @@ -diff -rupN PyQt5_gpl-5.13.0/configure.py PyQt5_gpl-5.13.0-new/configure.py ---- PyQt5_gpl-5.13.0/configure.py 2019-08-05 13:58:10.224733521 +0200 -+++ PyQt5_gpl-5.13.0-new/configure.py 2019-08-05 13:58:10.226733413 +0200 +diff -rupN --no-dereference PyQt5_gpl-5.13.1/configure.py PyQt5_gpl-5.13.1-new/configure.py +--- PyQt5_gpl-5.13.1/configure.py 2019-10-01 17:44:20.542210586 +0200 ++++ PyQt5_gpl-5.13.1-new/configure.py 2019-10-01 17:44:20.545210586 +0200 @@ -506,7 +506,7 @@ class TargetConfiguration: self.py_inc_dir = py_config.inc_dir self.py_venv_inc_dir = py_config.venv_inc_dir @@ -18,8 +18,8 @@ diff -rupN PyQt5_gpl-5.13.0/configure.py PyQt5_gpl-5.13.0-new/configure.py + ' LIBS += ' + self.get_pylib_link_arguments(name=True), '}']) - @staticmethod -@@ -1389,8 +1389,8 @@ def check_5_1_modules(target_config, dis + def using_sip5(self): +@@ -1398,8 +1398,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.13.0/configure.py PyQt5_gpl-5.13.0-new/configure.py def check_5_2_modules(target_config, disabled_modules, verbose): -@@ -1886,7 +1886,7 @@ def pro_sources(src_dir, other_headers=N +@@ -1908,7 +1908,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.13.0/configure.py PyQt5_gpl-5.13.0-new/configure.py fs = '{}.lib' if target_config.static else '{}.pyd' else: fs = 'lib{}.a' if target_config.static else '{}.so' -@@ -2102,11 +2102,11 @@ def run_make(target_config, verbose, exe +@@ -2124,11 +2124,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.13.0/configure.py PyQt5_gpl-5.13.0-new/configure.py if target_config.debug: makefile_target = 'debug' -@@ -2379,6 +2379,19 @@ def compile_test_program(target_config, +@@ -2401,6 +2401,19 @@ def compile_test_program(target_config, metadata = MODULE_METADATA[mname] diff --git a/PyQt5_sipargs.patch b/PyQt5_sipargs.patch deleted file mode 100644 index 7c74dec..0000000 --- a/PyQt5_sipargs.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rupN PyQt5_gpl-5.13.0/configure.py PyQt5_gpl-5.13.0-new/configure.py ---- PyQt5_gpl-5.13.0/configure.py 2019-07-04 18:44:01.000000000 +0200 -+++ PyQt5_gpl-5.13.0-new/configure.py 2019-09-28 01:16:37.793751671 +0200 -@@ -2567,10 +2567,6 @@ def generate_sip_module_code(target_conf - if fatal_warnings: - argv.append('-f') - -- # Make sure any unknown Qt version gets treated as the latest Qt v5. -- argv.append('-B') -- argv.append('Qt_6_0_0') -- - if target_config.prot_is_public: - argv.append('-P'); - diff --git a/PyQt5_wswin.patch b/PyQt5_wswin.patch index d2c5230..6365df6 100644 --- a/PyQt5_wswin.patch +++ b/PyQt5_wswin.patch @@ -1,7 +1,7 @@ -diff -rupN PyQt5_gpl-5.13.0/configure.py PyQt5_gpl-5.13.0-new/configure.py ---- PyQt5_gpl-5.13.0/configure.py 2019-07-04 18:44:01.000000000 +0200 -+++ PyQt5_gpl-5.13.0-new/configure.py 2019-08-05 13:58:10.150737513 +0200 -@@ -2636,7 +2636,7 @@ def generate_sip_module_code(target_conf +diff -rupN --no-dereference PyQt5_gpl-5.13.1/configure.py PyQt5_gpl-5.13.1-new/configure.py +--- PyQt5_gpl-5.13.1/configure.py 2019-09-07 21:37:09.000000000 +0200 ++++ PyQt5_gpl-5.13.1-new/configure.py 2019-10-01 17:44:20.457210590 +0200 +@@ -2654,7 +2654,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 eb974ee..99debb4 100644 --- a/mingw-python-qt5.spec +++ b/mingw-python-qt5.spec @@ -24,19 +24,17 @@ Name: mingw-%{pkgname} Summary: MinGW Windows PyQt5 -Version: 5.13.0 -Release: 3%{?pre:.%pre}%{?dist} +Version: 5.13.1 +Release: 1%{?pre:.%pre}%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: (GPLv3 or GPLv2 with exceptions) and BSD Url: http://www.riverbankcomputing.com/software/pyqt/ Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/%{version}/PyQt5_gpl-%{version}%{?pre:.%pre}.tar.gz -# Drop deprecated -B from sip args -Patch0: PyQt5_sipargs.patch # Hack in WS_WIN instead of WS_X11 in sip-flags -Patch1: PyQt5_wswin.patch +Patch0: PyQt5_wswin.patch # Tweak configure for cross build -Patch2: PyQt5_configure.patch +Patch1: PyQt5_configure.patch BuildRequires: gcc-c++ @@ -119,13 +117,12 @@ MinGW Windows Python3-Qt5 %prep %setup -q -n PyQt5_gpl-%{version}%{?pre:.%pre} -%patch0 -p1 for dir in %{host_py3_dir}; do rm -rf $dir cp -a . $dir pushd $dir -%patch1 -p1 +%patch0 -p1 popd done @@ -133,7 +130,7 @@ for dir in %{win32_py3_dir} %{win64_py3_dir}; do rm -rf $dir cp -a . $dir pushd $dir -%patch2 -p1 +%patch1 -p1 popd done @@ -221,6 +218,9 @@ find %{buildroot}%{mingw64_prefix} | grep -E '.(exe|dll|pyd)$' | sed 's|^%{build %changelog +* Tue Oct 01 2019 Sandro Mani - 5.13.1-1 +- Update to 5.13.1 + * Fri Sep 27 2019 Sandro Mani - 5.13.0-3 - Rebuild (python 3.8, qt 5.12.5) diff --git a/sources b/sources index 000b2a6..90b616a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyQt5_gpl-5.13.0.tar.gz) = 72cdd700956f8a5791fd38cac6a348f189eec9e69f3fd79a0c711ff49c770d4982fe62ec9057830d26abc4c12133922df915be0844449212f0bdf338fe1e4cb0 +SHA512 (PyQt5_gpl-5.13.1.tar.gz) = 7b7001b16a8c730d7ff2d340fa1dd118868b53519e8f75e8c2ce00b44e3637ac6a31b41a7456fc610df11ff3928b924cb54c0c3712f22ed4df5058fd8bc77281