Sync from SUSE:SLFO:1.1 python-PyQt6 revision 46a968f4467f5fc6630ad68b9e78650c

0001-Fix-build-with-Qt-6.8.2.patch

@@ -1,30 +0,0 @@
-From ee6c2c30eca67004e2b05f55ee1d82c3ab44b966 Mon Sep 17 00:00:00 2001
-From: Christophe Marin <christophe@krop.fr>
-Date: Sun, 2 Feb 2025 12:59:19 +0100
-Subject: [PATCH] Fix build with Qt 6.8.2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-/home/abuild/rpmbuild/BUILD/python-PyQt6-6.8.0-build/PyQt6-6.8.0/build/QtCore/sipQtCoreQStringConverterBase.cpp:58:52: error: use of deleted function ‘constexpr QStringConverterBase::QStringConverterBase(const QStringConverterBase&)’
----
- sip/QtCore/qstringconverter_base.sip | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sip/QtCore/qstringconverter_base.sip b/sip/QtCore/qstringconverter_base.sip
-index d0c790f..6f7c301 100644
---- a/sip/QtCore/qstringconverter_base.sip
-+++ b/sip/QtCore/qstringconverter_base.sip
-@@ -22,7 +22,7 @@
- 
- %If (Qt_6_4_0 -)
- 
--class QStringConverterBase
-+class QStringConverterBase /NoDefaultCtors/
- {
- %TypeHeaderCode
- #include <qstringconverter_base.h>
--- 
-2.48.1
-

python-PyQt6.changes

@@ -1,50 +1,3 @@
--------------------------------------------------------------------
-Sun Feb  2 12:00:43 UTC 2025 - Christophe Marin <christophe@krop.fr>
-
-- Add build fix:
-  * 0001-Fix-build-with-Qt-6.8.2.patch
-
--------------------------------------------------------------------
-Wed Jan  8 15:33:06 UTC 2025 - Ben Greiner <code@bnavigator.de>
-
-- Update to 6.8.0
-  * Added support for Qt v6.8 (excluding any technical previews).
-  * Python enums are now handled correctly by Qt Designer (requires
-    Qt v6.8.1 or later).
-  * Implemented QtAudio as a synonym for QAudio.
-  * Added QWindow.setVulkanInstance(), QWindow.vulkanInstance(),
-    QVulkanExtension, QVulkanInstance and QVulkanLayer.
-  * Bug fixes.
-- Should fix boo#1234295
-
--------------------------------------------------------------------
-Fri Nov  8 08:57:02 UTC 2024 - Ben Greiner <code@bnavigator.de>
-
-- Fix requires_eq replacement gh#openSUSE/python-rpm-macros#185
-
--------------------------------------------------------------------
-Tue Nov  5 08:20:32 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Avoid using requires_eq, which after the last modifications
-  conflicts with python singlespec (order of expansion).
-
--------------------------------------------------------------------
-Wed Oct 16 15:48:52 UTC 2024 - Ben Greiner <code@bnavigator.de>
-
-- Change version to 6.8.0~dev2410061818
-  * Mark development version for correct order before release
-- Changes from 6.7.1
-  * SIP v6.8.6 and PyQt6-sip v13.8 are now required for Python
-    v3.13 support and for Linux on ARM.
-
--------------------------------------------------------------------
-Wed Oct 16 08:11:34 UTC 2024 - Fabian Vogt <fvogt@suse.com>
-
-- Update to 6.8.0.dev2410061818:
-  * Added support for Qt v6.8 (excluding any technical previews).
-  * Implemented QtAudio as a synonym for QAudio.
-  * Bug fixes.
-
 -------------------------------------------------------------------
 Tue Sep 10 14:40:49 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
 

python-PyQt6.spec

@@ -21,7 +21,7 @@
 %define pyqt_build_for_qt6 1
 %{?sle15_python_module_pythons}
 Name:           python-%{mname}
-Version:        6.8.0
+Version:        6.7.0
 Release:        0
 Summary:        Python bindings for Qt 6
 License:        GPL-3.0-only OR SUSE-GPL-2.0-with-FLOSS-exception OR NonFree
@@ -32,13 +32,11 @@ Source:         https://files.pythonhosted.org/packages/source/P/PyQt6/PyQt6-%{v
 Patch0:         disable-rpaths.diff
 # PATCH-FIX-OPENSUSE - install binary dbus mainloop integration in arch dependent directory
 Patch1:         0001-Use-a-noarch-wrapper-for-dbus-mainloop-integration.patch
-# PATCH-FIX-UPSTREAM - fix build failure with Qt 6.8.2
+BuildRequires:  %{python_module PyQt6-sip >= 13.6}
-Patch2:         0001-Fix-build-with-Qt-6.8.2.patch
-BuildRequires:  %{python_module PyQt6-sip >= 13.8}
 BuildRequires:  %{python_module dbus-python-devel >= 0.8}
-BuildRequires:  %{python_module devel >= 3.9}
+BuildRequires:  %{python_module devel >= 3.6.1}
-BuildRequires:  %{python_module pyqt-builder >= 1.17}
+BuildRequires:  %{python_module pyqt-builder >= 1.15}
-BuildRequires:  %{python_module sip-devel >= 6.9}
+BuildRequires:  %{python_module sip-devel >= 6.5}
 BuildRequires:  dbus-1-devel
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
@@ -91,8 +89,8 @@ BuildRequires:  cmake(Qt6WebChannel)
 BuildRequires:  cmake(Qt6WebSockets)
 BuildRequires:  cmake(Qt6Widgets)
 BuildRequires:  cmake(Qt6Xml)
-Requires:       python-PyQt6-sip >= %(rpm -q --whatprovides python-PyQt6-sip --qf "%%{version}")
+%requires_ge    python-PyQt6-sip
-Requires:       python-dbus-python >= %(rpm -q --whatprovides python-dbus-python --qf "%%{version}")
+%requires_ge    python-dbus-python
 Provides:       python-qt6 = %{version}-%{release}
 %python_subpackages