From 26d55e6830767fde3b493ac7eca50476ca0414247bfaa9b20b54cc8db51636ef Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe+obs@krop.fr>
Date: Sat, 22 Jun 2024 12:29:54 +0000
Subject: [PATCH] Qt 6.7.1 + pyside 6.7.1

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=75
---
 0001-shiboken-add-missing-include.patch  | 40 ------------------------
 pyside-setup-everywhere-src-6.7.1.tar.xz |  3 --
 pyside-setup-everywhere-src-6.7.2.tar.xz |  3 ++
 python3-pyside6.changes                  |  8 +++++
 python3-pyside6.spec                     |  6 ++--
 5 files changed, 13 insertions(+), 47 deletions(-)
 delete mode 100644 0001-shiboken-add-missing-include.patch
 delete mode 100644 pyside-setup-everywhere-src-6.7.1.tar.xz
 create mode 100644 pyside-setup-everywhere-src-6.7.2.tar.xz

diff --git a/0001-shiboken-add-missing-include.patch b/0001-shiboken-add-missing-include.patch
deleted file mode 100644
index ccd5717..0000000
--- a/0001-shiboken-add-missing-include.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6c3759e342efa8b9bcc46e1701eed3a12548db85 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Mon, 27 May 2024 04:59:20 +0000
-Subject: [PATCH] shiboken: add missing include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Amend b829abcc7b2e9fcdb027e653a6a52cdb0706de11 and add missing include
-to fix:
-
- | sbkmodule.cpp:459:15: error: ‘Shiboken::Conversions’ has not been declared
- |     Shiboken::Conversions::clearNegativeLazyCache();
- |               ^~~~~~~~~~~
-
-Pick-to: 6.7
-Fixes: PYSIDE-2765
-Task-number: PYSIDE-2749
-Task-number: PYSIDE-2404
-Change-Id: I13625848bff3b0e90a53649104d6e5d84553a984
-Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
----
- sources/shiboken6/libshiboken/sbkmodule.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sources/shiboken6/libshiboken/sbkmodule.cpp b/sources/shiboken6/libshiboken/sbkmodule.cpp
-index ccc7cc2cd..b7e6bf126 100644
---- a/sources/shiboken6/libshiboken/sbkmodule.cpp
-+++ b/sources/shiboken6/libshiboken/sbkmodule.cpp
-@@ -7,6 +7,7 @@
- #include "bindingmanager.h"
- #include "sbkstring.h"
- #include "sbkcppstring.h"
-+#include "sbkconverter_p.h"
- 
- #include <unordered_map>
- #include <unordered_set>
--- 
-2.45.1
-
diff --git a/pyside-setup-everywhere-src-6.7.1.tar.xz b/pyside-setup-everywhere-src-6.7.1.tar.xz
deleted file mode 100644
index 5042498..0000000
--- a/pyside-setup-everywhere-src-6.7.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f33de37f4121e547064023edb344b95e2ab454234fa8fce27ea73df96f933cd
-size 14400976
diff --git a/pyside-setup-everywhere-src-6.7.2.tar.xz b/pyside-setup-everywhere-src-6.7.2.tar.xz
new file mode 100644
index 0000000..0421790
--- /dev/null
+++ b/pyside-setup-everywhere-src-6.7.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a2b0d0d6e78c9aa5ddc7f06ca4b6f11a3fe14560baeb148eea53b5d98e368c7
+size 14402156
diff --git a/python3-pyside6.changes b/python3-pyside6.changes
index fdffe21..3eef0c2 100644
--- a/python3-pyside6.changes
+++ b/python3-pyside6.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jun 19 07:48:28 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.7.2. Check the installed changes-6.7.2 file for the
+  full list of changes
+- Drop patch, merged upstream:
+  * 0001-shiboken-add-missing-include.patch
+
 -------------------------------------------------------------------
 Wed May 29 07:28:11 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
 
diff --git a/python3-pyside6.spec b/python3-pyside6.spec
index 73abe5f..2be76de 100644
--- a/python3-pyside6.spec
+++ b/python3-pyside6.spec
@@ -43,7 +43,7 @@ ExclusiveArch:  donotbuild
 %endif
 
 Name:           %{mypython}-%{pyside_flavor}
-Version:        6.7.1
+Version:        6.7.2
 Release:        0
 Summary:        Python bindings for Qt 6
 License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-2.0-only AND GPL-3.0-only WITH Qt-GPL-exception-1.0
@@ -51,10 +51,8 @@ URL:            https://www.qt.io
 Source:         https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-%{version}-src/%{tar_name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE
 Patch0:         0001-Always-link-to-python-libraries.patch
-# PATCH-FIX-UPSTREAM
-Patch1:         0001-shiboken-add-missing-include.patch
 # PATCH-FIX-UPSTREAM https://codereview.qt-project.org/c/pyside/pyside-setup/+/567559
-Patch2:         fix-pytest-qt.patch
+Patch1:         fix-pytest-qt.patch
 # SECTION common_dependencies
 BuildRequires:  clang-devel
 BuildRequires:  %{mypython}-Sphinx