From dffb2bc6f660152932bd054bbd14c5d47560a7c725ea7f9b36b5ae98fb008e95 Mon Sep 17 00:00:00 2001
From: Benjamin Greiner <code@bnavigator.de>
Date: Wed, 18 Oct 2023 09:08:23 +0000
Subject: [PATCH] Accepting request 1118541 from
 home:llyyr:branches:KDE:Qt:PyQt

- Update to 6.5.3
  * Added support for Python 3.12 and the missing
    QAbstractItemModel.multiData() method, as well as the missing
    QModelRoleDataSpan class.
- Add patch pyqt6-fix-build-with-qt-6.6.0.patch to fix build with
  Qt 6.6.0.
- Set CXX flag "-DQT_NO_INT128" to fix buil with Qt 6.6.0.

OBS-URL: https://build.opensuse.org/request/show/1118541
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-PyQt6?expand=0&rev=25
---
 PyQt6-6.5.2.tar.gz                  |  3 ---
 PyQt6-6.5.3.tar.gz                  |  3 +++
 pyqt6-fix-build-with-qt-6.6.0.patch | 12 ++++++++++++
 python-PyQt6.changes                | 11 +++++++++++
 python-PyQt6.spec                   |  9 +++++++--
 5 files changed, 33 insertions(+), 5 deletions(-)
 delete mode 100644 PyQt6-6.5.2.tar.gz
 create mode 100644 PyQt6-6.5.3.tar.gz
 create mode 100644 pyqt6-fix-build-with-qt-6.6.0.patch

diff --git a/PyQt6-6.5.2.tar.gz b/PyQt6-6.5.2.tar.gz
deleted file mode 100644
index 72ef5db..0000000
--- a/PyQt6-6.5.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1487ee7350f9ffb66d60ab4176519252c2b371762cbe8f8340fd951f63801280
-size 1037215
diff --git a/PyQt6-6.5.3.tar.gz b/PyQt6-6.5.3.tar.gz
new file mode 100644
index 0000000..a467338
--- /dev/null
+++ b/PyQt6-6.5.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bcbbf9511b038b4924298ca10999aa36eb37a0a38d0638f895f9bba6025c0a77
+size 1039271
diff --git a/pyqt6-fix-build-with-qt-6.6.0.patch b/pyqt6-fix-build-with-qt-6.6.0.patch
new file mode 100644
index 0000000..4909be6
--- /dev/null
+++ b/pyqt6-fix-build-with-qt-6.6.0.patch
@@ -0,0 +1,12 @@
+diff -ru PyQt6-6.5.2.orig/sip/QtSql/qsqlresult.sip PyQt6-6.5.2/sip/QtSql/qsqlresult.sip
+--- PyQt6-6.5.2.orig/sip/QtSql/qsqlresult.sip	2023-10-11 16:46:02.317332289 +0200
++++ PyQt6-6.5.2/sip/QtSql/qsqlresult.sip	2023-10-11 17:26:17.722706788 +0200
+@@ -63,7 +63,7 @@
+     QSql::ParamType bindValueType(const QString &placeholder) const;
+     QSql::ParamType bindValueType(int pos) const;
+     int boundValueCount() const;
+-    QList<QVariant> &boundValues() const;
++    QVariantList boundValues() const;
+     QString executedQuery() const;
+     QString boundValueName(int pos) const;
+     void clear();
diff --git a/python-PyQt6.changes b/python-PyQt6.changes
index 8e5572c..2520422 100644
--- a/python-PyQt6.changes
+++ b/python-PyQt6.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Oct 18 00:34:21 UTC 2023 - llyyr <llyyr.public@gmail.com>
+
+- Update to 6.5.3
+  * Added support for Python 3.12 and the missing
+    QAbstractItemModel.multiData() method, as well as the missing
+    QModelRoleDataSpan class.
+- Add patch pyqt6-fix-build-with-qt-6.6.0.patch to fix build with
+  Qt 6.6.0.
+- Set CXX flag "-DQT_NO_INT128" to fix buil with Qt 6.6.0.
+
 -------------------------------------------------------------------
 Wed Sep 27 09:15:27 UTC 2023 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-PyQt6.spec b/python-PyQt6.spec
index cec26ec..5a2b261 100644
--- a/python-PyQt6.spec
+++ b/python-PyQt6.spec
@@ -21,7 +21,7 @@
 %define pyqt_build_for_qt6 1
 %{?sle15_python_module_pythons}
 Name:           python-%{mname}
-Version:        6.5.2
+Version:        6.5.3
 Release:        0
 Summary:        Python bindings for Qt 6
 License:        GPL-3.0-only OR SUSE-GPL-2.0-with-FLOSS-exception OR NonFree
@@ -32,6 +32,8 @@ 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-OPENSUSE - fix build with Qt 6.6.0
+Patch2:         pyqt6-fix-build-with-qt-6.6.0.patch
 BuildRequires:  %{python_module PyQt6-sip >= 13.4}
 BuildRequires:  %{python_module dbus-python-devel >= 0.8}
 BuildRequires:  %{python_module devel}
@@ -147,10 +149,13 @@ dos2unix examples/quick/models/*/view.qml
 dos2unix examples/multimedia*/*/*.ui
 
 %build
+
+# -DQT_NO_INT128 is required to build with Qt 6.6.0.
 %{pyqt_build -v \
     -s %{quote:--pep484-pyi \
                --confirm-license \
-               --qt-shared}}
+               --qt-shared \
+               --qmake-setting 'QMAKE_CXXFLAGS_RELEASE=%{optflags} -DQT_NO_INT128'}}
 
 %install
 %pyqt_install