From 2db2d2ab6eb051a963c59fe6a9cb8023de5c97c2489ec5f93bf22590b065719c Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Mon, 3 Oct 2022 21:06:50 +0000 Subject: [PATCH 1/8] Accepting request 1007757 from home:bnavigator:branches:KDE:Qt:PyQt - Update to version 1.14.0 * Added support for QtPdf, QtPdfWidgets and QtTextToSpeech for PyQt6. * SIP v6.7 is now required. OBS-URL: https://build.opensuse.org/request/show/1007757 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-pyqt-builder?expand=0&rev=7 --- PyQt-builder-1.13.0.tar.gz | 3 --- PyQt-builder-1.14.0.tar.gz | 3 +++ python-pyqt-builder.changes | 8 ++++++++ python-pyqt-builder.spec | 6 +++--- 4 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 PyQt-builder-1.13.0.tar.gz create mode 100644 PyQt-builder-1.14.0.tar.gz diff --git a/PyQt-builder-1.13.0.tar.gz b/PyQt-builder-1.13.0.tar.gz deleted file mode 100644 index 9078a97..0000000 --- a/PyQt-builder-1.13.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4877580c38ceb5320e129b381d083b0a8601c68166d8b99707f08fa0a1689eef -size 3906564 diff --git a/PyQt-builder-1.14.0.tar.gz b/PyQt-builder-1.14.0.tar.gz new file mode 100644 index 0000000..d7c0f77 --- /dev/null +++ b/PyQt-builder-1.14.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6755931c6d2f8940553e0334d10c933ce5cc18b64425e94fda1accf4ff774f59 +size 3907829 diff --git a/python-pyqt-builder.changes b/python-pyqt-builder.changes index 02e8dc4..0f062f5 100644 --- a/python-pyqt-builder.changes +++ b/python-pyqt-builder.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 3 17:16:00 UTC 2022 - Ben Greiner + +- Update to version 1.14.0 + * Added support for QtPdf, QtPdfWidgets and QtTextToSpeech for + PyQt6. + * SIP v6.7 is now required. + ------------------------------------------------------------------- Mon Jun 20 21:19:02 UTC 2022 - Ben Greiner diff --git a/python-pyqt-builder.spec b/python-pyqt-builder.spec index 54dd1be..6baf5a6 100644 --- a/python-pyqt-builder.spec +++ b/python-pyqt-builder.spec @@ -18,7 +18,7 @@ %define mname pyqt-builder Name: python-%{mname} -Version: 1.13.0 +Version: 1.14.0 Release: 0 Summary: The PEP 517 compliant PyQt build system License: GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP @@ -28,14 +28,14 @@ BuildRequires: %{python_module setuptools} BuildRequires: %{python_module base >= 3.7} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-sip-devel >= 6.3 +Requires: python-sip-devel >= 6.7 Requires: python-packaging Requires(post): update-alternatives Requires(postun):update-alternatives Provides: python-PyQt-builder = %{version}-%{release} BuildArch: noarch # SECTION Test Requirements -BuildRequires: %{python_module sip-devel >= 6.3} +BuildRequires: %{python_module sip-devel >= 6.7} BuildRequires: %{python_module packaging} # /SECTION %python_subpackages From bcc074d2f4493201e7f2ee116328064e0fcc9707ba3338c1afc7a269f97162ca Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Thu, 12 Jan 2023 18:28:38 +0000 Subject: [PATCH 2/8] Accepting request 1058060 from home:alarrosa:branches:KDE:Qt:PyQt - Add patch to support python 3.6 needed by SLE: * support-python3.6.patch OBS-URL: https://build.opensuse.org/request/show/1058060 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-pyqt-builder?expand=0&rev=8 --- python-pyqt-builder.changes | 6 ++++++ python-pyqt-builder.spec | 5 +++-- support-python3.6.patch | 39 +++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 support-python3.6.patch diff --git a/python-pyqt-builder.changes b/python-pyqt-builder.changes index 0f062f5..5227ba2 100644 --- a/python-pyqt-builder.changes +++ b/python-pyqt-builder.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 12 11:22:21 UTC 2023 - Antonio Larrosa + +- Add patch to support python 3.6 needed by SLE: + * support-python3.6.patch + ------------------------------------------------------------------- Mon Oct 3 17:16:00 UTC 2022 - Ben Greiner diff --git a/python-pyqt-builder.spec b/python-pyqt-builder.spec index 6baf5a6..aae8836 100644 --- a/python-pyqt-builder.spec +++ b/python-pyqt-builder.spec @@ -24,8 +24,9 @@ Summary: The PEP 517 compliant PyQt build system License: GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP URL: https://www.riverbankcomputing.com/software/pyqt-builder Source0: https://files.pythonhosted.org/packages/source/P/PyQt-builder/PyQt-builder-%{version}.tar.gz +Patch0: support-python3.6.patch BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module base >= 3.6} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-sip-devel >= 6.7 @@ -50,7 +51,7 @@ optional project.py script. Any PEP 517 compliant frontend, for example sip-install or pip can then be used to build and install the project. %prep -%setup -q -n PyQt-builder-%{version} +%autosetup -p1 -n PyQt-builder-%{version} %build %python_build diff --git a/support-python3.6.patch b/support-python3.6.patch new file mode 100644 index 0000000..49b8236 --- /dev/null +++ b/support-python3.6.patch @@ -0,0 +1,39 @@ +Index: PyQt-builder-1.14.0/PKG-INFO +=================================================================== +--- PyQt-builder-1.14.0.orig/PKG-INFO ++++ PyQt-builder-1.14.0/PKG-INFO +@@ -9,7 +9,7 @@ License: SIP + Platform: X11 + Platform: macOS + Platform: Windows +-Requires-Python: >=3.7 ++Requires-Python: >=3.6 + License-File: LICENSE + License-File: LICENSE-GPL3 + License-File: LICENSE-GPL2 +Index: PyQt-builder-1.14.0/PyQt_builder.egg-info/PKG-INFO +=================================================================== +--- PyQt-builder-1.14.0.orig/PyQt_builder.egg-info/PKG-INFO ++++ PyQt-builder-1.14.0/PyQt_builder.egg-info/PKG-INFO +@@ -9,7 +9,7 @@ License: SIP + Platform: X11 + Platform: macOS + Platform: Windows +-Requires-Python: >=3.7 ++Requires-Python: >=3.6 + License-File: LICENSE + License-File: LICENSE-GPL3 + License-File: LICENSE-GPL2 +Index: PyQt-builder-1.14.0/setup.py +=================================================================== +--- PyQt-builder-1.14.0.orig/setup.py ++++ PyQt-builder-1.14.0/setup.py +@@ -48,7 +48,7 @@ setup( + name='PyQt-builder', + version=version, + license='SIP', +- python_requires='>=3.7', ++ python_requires='>=3.6', + install_requires=['packaging', 'sip >=6.7, <7'], + packages=find_packages(), + package_data={ From d8b25126ca3b9b9e9cb8d15c619685040274ec8b087a99e218dc99f7b8ee5045 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Thu, 12 Jan 2023 21:17:01 +0000 Subject: [PATCH 3/8] - Add pyqt-builder-add-timeline5.15.patch for Qt3D 5.15.8 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-pyqt-builder?expand=0&rev=9 --- python-pyqt-builder.changes | 5 +++++ python-pyqt-builder.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/python-pyqt-builder.changes b/python-pyqt-builder.changes index 5227ba2..da0a575 100644 --- a/python-pyqt-builder.changes +++ b/python-pyqt-builder.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 12 21:14:30 UTC 2023 - Ben Greiner + +- Add pyqt-builder-add-timeline5.15.patch for Qt3D 5.15.8 + ------------------------------------------------------------------- Thu Jan 12 11:22:21 UTC 2023 - Antonio Larrosa diff --git a/python-pyqt-builder.spec b/python-pyqt-builder.spec index aae8836..10c3634 100644 --- a/python-pyqt-builder.spec +++ b/python-pyqt-builder.spec @@ -24,8 +24,14 @@ Summary: The PEP 517 compliant PyQt build system License: GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP URL: https://www.riverbankcomputing.com/software/pyqt-builder Source0: https://files.pythonhosted.org/packages/source/P/PyQt-builder/PyQt-builder-%{version}.tar.gz +# PATCH-FEATURE-SUSE support-python3.6.patch alarrosa@suse.com Patch0: support-python3.6.patch +# PATCH-FEATURE-SUSE pyqt-builder-add-timeline5.15.patch code@bnavigator.de +Patch1: pyqt-builder-add-timeline5.15.patch BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module wheel} +BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module base >= 3.6} BuildRequires: fdupes BuildRequires: python-rpm-macros From 2a0eec17371979f10f21e660615cd83d4dfbf8aa001e3a91a85e7eb53ee3a759 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Thu, 12 Jan 2023 21:17:41 +0000 Subject: [PATCH 4/8] . OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-pyqt-builder?expand=0&rev=10 --- pyqt-builder-add-timeline5.15.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 pyqt-builder-add-timeline5.15.patch diff --git a/pyqt-builder-add-timeline5.15.patch b/pyqt-builder-add-timeline5.15.patch new file mode 100644 index 0000000..61e1c61 --- /dev/null +++ b/pyqt-builder-add-timeline5.15.patch @@ -0,0 +1,14 @@ +Index: PyQt-builder-1.14.0/pyqtbuild/builder.py +=================================================================== +--- PyQt-builder-1.14.0.orig/pyqtbuild/builder.py ++++ PyQt-builder-1.14.0/pyqtbuild/builder.py +@@ -530,7 +530,8 @@ macx { + patch = self.qt_version & 0xff + + # Qt v5.12.4 was the last release where we updated for a patch version. +- if (major, minor) >= (5, 13): ++ # And SUSE started to use it in 5.15.8 again for qt3d-qt5 ++ if (major, minor) >= (5, 13) and (major, minor, patch) < (5, 15, 8): + patch = 0 + elif (major, minor) == (5, 12): + if patch > 4: From d4330ffa0144cb17ff6e5dcff2e6449a979edff1ef5c7bf8fe123119e4a39b1a Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Thu, 12 Jan 2023 21:18:19 +0000 Subject: [PATCH 5/8] . OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-pyqt-builder?expand=0&rev=11 --- python-pyqt-builder.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/python-pyqt-builder.spec b/python-pyqt-builder.spec index 10c3634..821d8dc 100644 --- a/python-pyqt-builder.spec +++ b/python-pyqt-builder.spec @@ -32,7 +32,6 @@ BuildRequires: %{python_module setuptools} BuildRequires: %{python_module pip} BuildRequires: %{python_module wheel} BuildRequires: %{python_module base >= 3.7} -BuildRequires: %{python_module base >= 3.6} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-sip-devel >= 6.7 @@ -60,10 +59,10 @@ sip-install or pip can then be used to build and install the project. %autosetup -p1 -n PyQt-builder-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/pyqt-bundle %python_clone -a %{buildroot}%{_bindir}/pyqt-qt-wheel %python_expand %fdupes %{buildroot}%{$python_sitelib} From 5ba80e3b7c2fd8d12b2a174af0ae2e9e14189dc766524ab9e36cca034c7ded10 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Thu, 12 Jan 2023 21:18:45 +0000 Subject: [PATCH 6/8] . OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-pyqt-builder?expand=0&rev=12 --- python-pyqt-builder.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-pyqt-builder.spec b/python-pyqt-builder.spec index 821d8dc..6525fe8 100644 --- a/python-pyqt-builder.spec +++ b/python-pyqt-builder.spec @@ -28,10 +28,10 @@ Source0: https://files.pythonhosted.org/packages/source/P/PyQt-builder/Py Patch0: support-python3.6.patch # PATCH-FEATURE-SUSE pyqt-builder-add-timeline5.15.patch code@bnavigator.de Patch1: pyqt-builder-add-timeline5.15.patch +BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module pip} BuildRequires: %{python_module wheel} -BuildRequires: %{python_module base >= 3.7} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-sip-devel >= 6.7 From c1ba4cd249848ced9639f769dd203705fc84e71ab05c9ae9bcf83d113ad04e43 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Thu, 12 Jan 2023 21:20:11 +0000 Subject: [PATCH 7/8] oops OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-pyqt-builder?expand=0&rev=13 --- python-pyqt-builder.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-pyqt-builder.spec b/python-pyqt-builder.spec index 6525fe8..aa1c522 100644 --- a/python-pyqt-builder.spec +++ b/python-pyqt-builder.spec @@ -28,7 +28,7 @@ Source0: https://files.pythonhosted.org/packages/source/P/PyQt-builder/Py Patch0: support-python3.6.patch # PATCH-FEATURE-SUSE pyqt-builder-add-timeline5.15.patch code@bnavigator.de Patch1: pyqt-builder-add-timeline5.15.patch -BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module base >= 3.6} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module pip} BuildRequires: %{python_module wheel} From 56c0c1fa40bbaea3396dc66804f07ca38fb4e5bd26621f2b089c50474631f096 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Thu, 12 Jan 2023 21:25:11 +0000 Subject: [PATCH 8/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-pyqt-builder?expand=0&rev=14 --- python-pyqt-builder.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/python-pyqt-builder.spec b/python-pyqt-builder.spec index aa1c522..dc5f606 100644 --- a/python-pyqt-builder.spec +++ b/python-pyqt-builder.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package python-pyqt-builder # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,20 +29,20 @@ Patch0: support-python3.6.patch # PATCH-FEATURE-SUSE pyqt-builder-add-timeline5.15.patch code@bnavigator.de Patch1: pyqt-builder-add-timeline5.15.patch BuildRequires: %{python_module base >= 3.6} -BuildRequires: %{python_module setuptools} BuildRequires: %{python_module pip} +BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-sip-devel >= 6.7 Requires: python-packaging +Requires: python-sip-devel >= 6.7 Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives Provides: python-PyQt-builder = %{version}-%{release} BuildArch: noarch # SECTION Test Requirements -BuildRequires: %{python_module sip-devel >= 6.7} BuildRequires: %{python_module packaging} +BuildRequires: %{python_module sip-devel >= 6.7} # /SECTION %python_subpackages @@ -81,7 +81,7 @@ $python -c 'import pyqtbuild' %postun %python_uninstall_alternative pyqt-bundle -%files %python_files +%files %{python_files} %license LICENSE* %doc README NEWS ChangeLog %python_alternative %{_bindir}/pyqt-bundle