diff --git a/.gitignore b/.gitignore index 3467edf..820a72e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /PyQt5_gpl-5.13.1.tar.gz /PyQt5-5.13.2.tar.gz /PyQt5-5.14.2.tar.gz +/PyQt5-5.15.0.tar.gz diff --git a/PyQt5_configure.patch b/PyQt5_configure.patch index 61b5452..cc8e45e 100644 --- a/PyQt5_configure.patch +++ b/PyQt5_configure.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference PyQt5-5.14.2/configure.py PyQt5-5.14.2-new/configure.py ---- PyQt5-5.14.2/configure.py 2020-04-11 01:16:30.168522295 +0200 -+++ PyQt5-5.14.2-new/configure.py 2020-04-11 01:16:30.170522299 +0200 -@@ -506,7 +506,7 @@ class TargetConfiguration: +diff -rupN --no-dereference PyQt5-5.15.0/configure.py PyQt5-5.15.0-new/configure.py +--- PyQt5-5.15.0/configure.py 2020-08-18 15:47:11.583131429 +0200 ++++ PyQt5-5.15.0-new/configure.py 2020-08-18 15:47:11.585131435 +0200 +@@ -507,7 +507,7 @@ class TargetConfiguration: self.py_inc_dir = py_config.inc_dir self.py_venv_inc_dir = py_config.venv_inc_dir self.py_lib_dir = py_config.lib_dir @@ -10,7 +10,7 @@ diff -rupN --no-dereference PyQt5-5.14.2/configure.py PyQt5-5.14.2-new/configure self.py_version = py_config.version self.pyqt_bin_dir = py_config.bin_dir self.pyqt_module_dir = py_config.module_dir -@@ -996,7 +996,7 @@ class TargetConfiguration: +@@ -997,7 +997,7 @@ class TargetConfiguration: # it where it is. if not self.static: pro_lines.extend(['win32 {', @@ -19,7 +19,7 @@ diff -rupN --no-dereference PyQt5-5.14.2/configure.py PyQt5-5.14.2-new/configure '}']) def using_sip5(self): -@@ -1398,8 +1398,8 @@ def check_5_1_modules(target_config, dis +@@ -1402,8 +1402,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 --no-dereference PyQt5-5.14.2/configure.py PyQt5-5.14.2-new/configure def check_5_2_modules(target_config, disabled_modules, verbose): -@@ -1905,7 +1905,7 @@ def pro_sources(src_dir, other_headers=N +@@ -1920,7 +1920,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 --no-dereference PyQt5-5.14.2/configure.py PyQt5-5.14.2-new/configure fs = '{}.lib' if target_config.static else '{}.pyd' else: fs = 'lib{}.a' if target_config.static else '{}.so' -@@ -2121,11 +2121,11 @@ def run_make(target_config, verbose, exe +@@ -2136,11 +2136,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 --no-dereference PyQt5-5.14.2/configure.py PyQt5-5.14.2-new/configure if target_config.debug: makefile_target = 'debug' -@@ -2398,6 +2398,19 @@ def compile_test_program(target_config, +@@ -2413,6 +2413,19 @@ def compile_test_program(target_config, metadata = MODULE_METADATA[mname] diff --git a/PyQt5_qgsgeometry.patch b/PyQt5_qgsgeometry.patch deleted file mode 100644 index 89399dc..0000000 --- a/PyQt5_qgsgeometry.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN PyQt5-5.14.2/sip/QtQuick/qsggeometry.sip PyQt5-5.15.0/sip/QtQuick/qsggeometry.sip ---- PyQt5-5.14.2/sip/QtQuick/qsggeometry.sip 2020-04-02 16:58:17.244202000 +0200 -+++ PyQt5-5.15.0/sip/QtQuick/qsggeometry.sip 2020-05-31 14:11:05.285835000 +0200 -@@ -401,4 +401,7 @@ enum /NoScope/ - %If (Qt_5_8_0 -) - static void updateColoredRectGeometry(QSGGeometry *g, const QRectF &rect); - %End -+ -+private: -+ QSGGeometry(const QSGGeometry &); - }; - diff --git a/PyQt5_wswin.patch b/PyQt5_wswin.patch index 83c1181..6bcb9dd 100644 --- a/PyQt5_wswin.patch +++ b/PyQt5_wswin.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference PyQt5-5.14.2/configure.py PyQt5-5.14.2-new/configure.py ---- PyQt5-5.14.2/configure.py 2020-04-02 16:58:06.029642000 +0200 -+++ PyQt5-5.14.2-new/configure.py 2020-04-11 01:16:30.105522157 +0200 -@@ -2651,7 +2651,7 @@ def generate_sip_module_code(target_conf +diff -rupN --no-dereference PyQt5-5.15.0/configure.py PyQt5-5.15.0-new/configure.py +--- PyQt5-5.15.0/configure.py 2020-05-31 14:10:54.334553000 +0200 ++++ PyQt5-5.15.0-new/configure.py 2020-08-18 15:47:11.505131208 +0200 +@@ -2666,7 +2666,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 bc3f7e2..0f26012 100644 --- a/mingw-python-qt5.spec +++ b/mingw-python-qt5.spec @@ -25,8 +25,8 @@ Name: mingw-%{pkgname} Summary: MinGW Windows PyQt5 -Version: 5.14.2 -Release: 3%{?pre:.%pre}%{?dist} +Version: 5.15.0 +Release: 1%{?pre:.%pre}%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: (GPLv3 or GPLv2 with exceptions) and BSD @@ -36,8 +36,6 @@ Source0: https://files.pythonhosted.org/packages/source/P/PyQt5/PyQt5-%{v Patch0: PyQt5_wswin.patch # Tweak configure for cross build Patch1: PyQt5_configure.patch -# Backport: Fix QsgGeometry build with recent sip -Patch2: PyQt5_qgsgeometry.patch BuildRequires: gcc-c++ @@ -120,7 +118,6 @@ MinGW Windows Python3-Qt5 %prep %setup -q -n PyQt5-%{version}%{?pre:.%pre} -%patch2 -p1 for dir in %{host_py3_dir}; do rm -rf $dir @@ -222,6 +219,9 @@ find %{buildroot}%{mingw64_prefix} | grep -E '.(exe|dll|pyd)$' | sed 's|^%{build %changelog +* Tue Aug 18 2020 Sandro Mani - 5.15.0-1 +- Update to 5.15.0 + * Tue Jul 28 2020 Fedora Release Engineering - 5.14.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index c960e6d..27ca7a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyQt5-5.14.2.tar.gz) = 56d9b2970ff50f2af0bfd889ad1226bf64087a6210cc545c5a0188352d1651343fcda9d53f04b041273f61bf31baf43af4a1854c1b580d50c28cff82f59c24ec +SHA512 (PyQt5-5.15.0.tar.gz) = 35bcfef4d7ccfee04c1c4409d2af3d862f1e8e46d6ce743bfcfbaf43d2046bc58317824b0840f3db460ad280d1b7e896812268b36225198e916a1d9ea86823a9