From dfee241f192906ba3e0c763a373a36b642ea9679 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 15 Sep 2021 18:12:20 +0200 Subject: [PATCH] Update to 5.15.4 --- .gitignore | 1 + PyQt5-Timeline.patch | 6 +++--- python-qt5.spec | 7 +++++-- python-qt5_sipdir.patch | 20 -------------------- sources | 2 +- 5 files changed, 10 insertions(+), 26 deletions(-) delete mode 100644 python-qt5_sipdir.patch diff --git a/.gitignore b/.gitignore index 2d1b76e..a2c7ba4 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /PyQt5-5.13.2.tar.gz /PyQt5-5.14.2.tar.gz /PyQt5-5.15.0.tar.gz +/PyQt5-5.15.4.tar.gz diff --git a/PyQt5-Timeline.patch b/PyQt5-Timeline.patch index b1f40dc..2ae3a1e 100644 --- a/PyQt5-Timeline.patch +++ b/PyQt5-Timeline.patch @@ -1,6 +1,6 @@ -diff -up PyQt5-5.15.0/sip/QtCore/QtCoremod.sip.Timeline PyQt5-5.15.0/sip/QtCore/QtCoremod.sip ---- PyQt5-5.15.0/sip/QtCore/QtCoremod.sip.Timeline 2020-08-17 17:37:35.734819568 -0500 -+++ PyQt5-5.15.0/sip/QtCore/QtCoremod.sip 2020-08-17 17:39:54.179090085 -0500 +diff -rupN --no-dereference PyQt5-5.15.4/sip/QtCore/QtCoremod.sip PyQt5-5.15.4-new/sip/QtCore/QtCoremod.sip +--- PyQt5-5.15.4/sip/QtCore/QtCoremod.sip 2021-03-05 10:57:34.648012000 +0100 ++++ PyQt5-5.15.4-new/sip/QtCore/QtCoremod.sip 2021-09-15 17:38:42.857935594 +0200 @@ -22,7 +22,7 @@ %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True) diff --git a/python-qt5.spec b/python-qt5.spec index a5d8af4..438813c 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -23,8 +23,8 @@ Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 -Version: 5.15.0 -Release: 13%{?dist} +Version: 5.15.4 +Release: 1%{?dist} License: GPLv3 Url: http://www.riverbankcomputing.com/software/pyqt/ @@ -349,6 +349,9 @@ sed -i \ %changelog +* Wed Sep 15 2021 Sandro Mani - 5.15.4-1 +- Update to 5.15.4 + * Fri Jul 23 2021 Fedora Release Engineering - 5.15.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/python-qt5_sipdir.patch b/python-qt5_sipdir.patch deleted file mode 100644 index 6b3414c..0000000 --- a/python-qt5_sipdir.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up PyQt5-5.14.2/configure.py.qt5_sipdir PyQt5-5.14.2/configure.py ---- PyQt5-5.14.2/configure.py.qt5_sipdir 2020-04-02 09:58:06.029642000 -0500 -+++ PyQt5-5.14.2/configure.py 2020-04-04 14:50:00.549639237 -0500 -@@ -25,6 +25,7 @@ import os - import shutil - import stat - import sys -+import sipconfig - - - # Initialise the constants. -@@ -511,7 +512,7 @@ class TargetConfiguration: - self.pyqt_bin_dir = py_config.bin_dir - self.pyqt_module_dir = py_config.module_dir - self.pyqt_stubs_dir = os.path.join(py_config.module_dir, 'PyQt5') -- self.pyqt_sip_dir = os.path.join(py_config.data_dir, 'sip', 'PyQt5') -+ self.pyqt_sip_dir = os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt5') - self.pyuic_interpreter = py_config.pyuic_interpreter - - # Remaining values. diff --git a/sources b/sources index 27ca7a6..f33231b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyQt5-5.15.0.tar.gz) = 35bcfef4d7ccfee04c1c4409d2af3d862f1e8e46d6ce743bfcfbaf43d2046bc58317824b0840f3db460ad280d1b7e896812268b36225198e916a1d9ea86823a9 +SHA512 (PyQt5-5.15.4.tar.gz) = 6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7