diff --git a/.gitignore b/.gitignore index cca8cac..4190743 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /PyQt5-5.14.2.tar.gz /PyQt5-5.15.0.tar.gz /PyQt5-5.15.6.tar.gz +/PyQt5-5.15.9.tar.gz diff --git a/.python-qt5.metadata b/.python-qt5.metadata new file mode 100644 index 0000000..6b35f34 --- /dev/null +++ b/.python-qt5.metadata @@ -0,0 +1 @@ +1f68db8900204587a32eacac94e9fa5d2d204ec8 PyQt5-5.15.9.tar.gz diff --git a/PyQt5-Timeline.patch b/PyQt5-Timeline.patch index 447d2ee..2ae3a1e 100644 --- a/PyQt5-Timeline.patch +++ b/PyQt5-Timeline.patch @@ -1,10 +1,9 @@ -diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip -index b525bc5..5bd2470 100644 ---- a/sip/QtCore/QtCoremod.sip -+++ b/sip/QtCore/QtCoremod.sip +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, py_ssize_t_clean=True) + %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True) -%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2 Qt_5_12_3 Qt_5_12_4 Qt_5_13_0 Qt_5_14_0 Qt_5_15_0} +%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2 Qt_5_12_3 Qt_5_12_4 Qt_5_13_0 Qt_5_13_1 Qt_5_13_2 Qt_5_14_0 Qt_5_14_2 Qt_5_15_0 Qt_5_15_1 Qt_5_15_2} diff --git a/python-qt5.spec b/python-qt5.spec index 91563e3..c0b1424 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -22,7 +22,7 @@ Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 -Version: 5.15.6 +Version: 5.15.9 Release: 1%{?dist} License: GPLv3 @@ -35,8 +35,8 @@ Source1: macros.pyqt5 ## upstream patches ## upstreamable patches -# support newer Qt5 releases -Patch1: PyQt5-Timeline.patch +# support newer Qt5 releases, but may not be needed anymore? -- rdieter +# Patch0: PyQt5-Timeline.patch BuildRequires: make BuildRequires: chrpath @@ -164,7 +164,7 @@ Requires: python%{python3_pkgversion}-qt5%{?_isa} = %{version}-%{release} %prep %setup -q -n PyQt5-%{version}%{?snap:.%{snap}} -%patch1 -p1 +# patch0 -p1 %build @@ -310,6 +310,10 @@ sed -i \ %changelog +* Tue Apr 18 2023 Jan Grulich - 5.15.9-1 +- 5.15.9 + Resolves: bz#2175758 + * Tue May 03 2022 Jan Grulich - 5.15.6-1 - 5.15.6 + sync with Fedora Resolves: bz#2061728 diff --git a/sources b/sources index cd679de..bdfd7a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyQt5-5.15.6.tar.gz) = 65fd663cb70e8701e49bd4b39dc9384546cf2edd1b3bab259ca64b50908f48bdc02ca143f36cd6b429075f5616dcc7b291607dcb63afa176e828cded3b82f5c7 +SHA512 (PyQt5-5.15.9.tar.gz) = 1c07d93aefe1c24e80851eb4631b80a99e7ba06e823181325456edb90285d3d22417a9f7d4c3ff9c6195bd801e7dc2bbabf0587af844a5e4b0a410c4611d119e