From 63e23e4715556e8e0242a05b8e892fc007fb73745b22dae5820f35120d5a7a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 7 Feb 2025 11:05:57 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main python-PyQt6-WebEngine revision 636f11750d17a29a2bdde283f343d4e9 --- PyQt6_WebEngine-6.6.0.tar.gz | 3 --- PyQt6_WebEngine-6.8.0.tar.gz | 3 +++ python-PyQt6-WebEngine.changes | 27 ++++++++++++++++++++++ python-PyQt6-WebEngine.spec | 41 ++++++++++++++++++---------------- 4 files changed, 52 insertions(+), 22 deletions(-) delete mode 100644 PyQt6_WebEngine-6.6.0.tar.gz create mode 100644 PyQt6_WebEngine-6.8.0.tar.gz diff --git a/PyQt6_WebEngine-6.6.0.tar.gz b/PyQt6_WebEngine-6.6.0.tar.gz deleted file mode 100644 index b8463ac..0000000 --- a/PyQt6_WebEngine-6.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d50b984c3f85e409e692b156132721522d4e8cf9b6c25e0cf927eea2dfb39487 -size 31817 diff --git a/PyQt6_WebEngine-6.8.0.tar.gz b/PyQt6_WebEngine-6.8.0.tar.gz new file mode 100644 index 0000000..664f64b --- /dev/null +++ b/PyQt6_WebEngine-6.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64045ea622b6a41882c2b18f55ae9714b8660acff06a54e910eb72822c2f3ff2 +size 34203 diff --git a/python-PyQt6-WebEngine.changes b/python-PyQt6-WebEngine.changes index edc9320..0309b35 100644 --- a/python-PyQt6-WebEngine.changes +++ b/python-PyQt6-WebEngine.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Wed Jan 8 16:23:00 UTC 2025 - Ben Greiner + +- Update to 6.8.0 + * Added support for Qt v6.8. +- Use sip-build --concatenate 1 as a workaround for incomplete type + class error + https://www.riverbankcomputing.com/pipermail/pyqt/2024-December/046097.html + +------------------------------------------------------------------- +Fri Nov 8 08:52:09 UTC 2024 - Ben Greiner + +- Back to PyPI source +- Fix requires_eq replacement gh#openSUSE/python-rpm-macros#185 + +------------------------------------------------------------------- +Tue Nov 5 08:21:48 UTC 2024 - Dominique Leuenberger + +- Avoid using requires_eq, which after the last modifications + conflicts with python singlespec (order of expansion). + +------------------------------------------------------------------- +Sun Apr 21 13:58:16 UTC 2024 - Ben Greiner + +- Update to 6.7.0 + * Add support for Qt 6.7 + ------------------------------------------------------------------- Thu Jan 25 20:33:30 UTC 2024 - Ben Greiner diff --git a/python-PyQt6-WebEngine.spec b/python-PyQt6-WebEngine.spec index dd4966f..72fc30e 100644 --- a/python-PyQt6-WebEngine.spec +++ b/python-PyQt6-WebEngine.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package python-PyQt6-WebEngine # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,22 +16,22 @@ # -%define mname PyQt6-WebEngine -%define muname PyQt6_WebEngine +%define qtlib WebEngine %define pyqt_build_for_qt6 1 +%define plainpython python %{?sle15_python_module_pythons} -Name: python-%{mname} -Version: 6.6.0 +Name: python-PyQt6-%{qtlib} +Version: 6.8.0 Release: 0 Summary: Python bindings for the Qt WebEngine framework License: GPL-3.0-only Group: Development/Libraries/Python URL: https://www.riverbankcomputing.com/software/pyqt3d -Source: https://files.pythonhosted.org/packages/source/P/%{mname}/%{muname}-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/P/PyQt6-%{qtlib}/PyQt6_%{qtlib}-%{version}.tar.gz BuildRequires: %{python_module PyQt6-devel >= 6.2} -BuildRequires: %{python_module devel >= 3.7} -BuildRequires: %{python_module pyqt-builder >= 1.11} -BuildRequires: %{python_module sip-devel >= 6} +BuildRequires: %{python_module devel} +BuildRequires: %{python_module pyqt-builder >= 1.17 with %python-pyqt-builder < 2} +BuildRequires: %{python_module sip-devel >= 6.9 with %python-sip-devel < 7} BuildRequires: fdupes BuildRequires: python-pyqt-rpm-macros BuildRequires: python-rpm-macros @@ -40,14 +40,15 @@ BuildRequires: qt6-gui-private-devel BuildRequires: cmake(Qt6WebEngineCore) BuildRequires: cmake(Qt6WebEngineQuick) BuildRequires: cmake(Qt6WebEngineWidgets) -%requires_ge python-PyQt6 +Requires: python-PyQt6 >= %(rpm -q --whatprovides python-PyQt6 --qf "%%{version}") +Requires: python-PyQt6-sip >= %(rpm -q --whatprovides python-PyQt6-sip --qf "%%{version}") Provides: python-qtwebengine-qt6 = %{version}-%{release} # Mirror with qt6-webengine ExclusiveArch: aarch64 x86_64 riscv64 %python_subpackages %description -PyQt6-WebEngine is a set of Python bindings for The Qt Company’s Qt WebEngine +PyQt6-WebEngine is a set of Python bindings for The Qt Company's Qt WebEngine framework. The framework provides the ability to embed web content in applications and is based on the Chrome browser. The bindings sit on top of PyQt6 and are implemented as three separate modules corresponding to the different @@ -57,18 +58,20 @@ libraries that make up the framework. Summary: Devel files for %{name} Group: Development/Tools/IDE Requires: python-PyQt6-devel -Supplements: (eric and python-%{mname}) -Supplements: (python-PyQt6-devel and python-%{mname}) +Requires: %plainpython(abi) = %{python_version} +Supplements: (eric and python-PyQt6-%{qtlib}) +Supplements: (python-PyQt6-devel and python-PyQt6-%{qtlib}) %description devel This package provides Qt6 API files for the Eric IDE and the SIP files used to generate the Python bindings for %{name} %prep -%autosetup -p1 -n %{muname}-%{version} +%autosetup -p1 -n PyQt6_%{qtlib}-%{version} %build -%pyqt_build +# https://www.riverbankcomputing.com/pipermail/pyqt/2024-December/046097.html +%pyqt_build -v -s %{quote:--concatenate 1} %install %pyqt_install @@ -82,18 +85,18 @@ $python -c 'from PyQt6 import QtWebEngineCore, QtWebEngineQuick, QtWebEngineWidg %files %{python_files} %license LICENSE -%doc NEWS README +%doc NEWS README.md %dir %{python_sitearch}/PyQt6/ %{python_sitearch}/PyQt6/QtWebEngineCore.* %{python_sitearch}/PyQt6/QtWebEngineQuick.* %{python_sitearch}/PyQt6/QtWebEngineWidgets.* -%{python_sitearch}/%{muname}-%{version}*-info/ +%{python_sitearch}/PyQt6_%{qtlib}-%{version}.dist-info/ %exclude %{pyqt6_sipdir} %files %{python_files devel} %license LICENSE %dir %{_qt6_datadir}/qsci/api/python_%{python_bin_suffix}/ -%{_qt6_datadir}/qsci/api/python_%{python_bin_suffix}/%{mname}.api +%{_qt6_datadir}/qsci/api/python_%{python_bin_suffix}/PyQt6-%{qtlib}.api %dir %{pyqt6_sipdir} %{pyqt6_sipdir}/QtWebEngineCore %{pyqt6_sipdir}/QtWebEngineQuick