[neon/qt/pyside2/Neon/release] debian: Drop patches that are included in the new release.

[Dmitry Shachnev]

Git commit 0f727709b40aeefc6fabd9b15e8b2f6c27097598 by Dmitry Shachnev.
Committed on 06/06/2024 at 16:37.
Pushed by carlosdem into branch 'Neon/release'.

Drop patches that are included in the new release.

- shiboken2-Fix-build-with-clang-16.patch
- shiboken2-Fail-template-test-instead-of-crashing.patch

M  +3    -0    debian/changelog
M  +0    -2    debian/patches/series
D  +0    -26   debian/patches/shiboken2-Fail-template-test-instead-of-crashing.patch
D  +0    -29   debian/patches/shiboken2-Fix-build-with-clang-16.patch

https://invent.kde.org/neon/qt/pyside2/-/commit/0f727709b40aeefc6fabd9b15e8b2f6c27097598

diff --git a/debian/changelog b/debian/changelog
index 28a8c18c..fca23a8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 pyside2 (5.15.14-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop patches, included in the new release:
+    - shiboken2-Fix-build-with-clang-16.patch
+    - shiboken2-Fail-template-test-instead-of-crashing.patch
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 06 Jun 2024 19:35:15 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 8f6e3f18..02edb58c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,8 +10,6 @@ Support-running-PySide-on-Python-3.12.patch
 Final-details-to-enable-3.12-wheel-compatibility.patch
 Stop-using-imp-module.patch
 Do-not-change-RPATH.patch
-shiboken2-Fix-build-with-clang-16.patch
-shiboken2-Fail-template-test-instead-of-crashing.patch
 shiboken2-clang-Fix-clashes-between-type-name-and-enumera.patch
 shiboken2-clang-Fix-and-simplify-resolveType-helper.patch
 shiboken2-clang-Remove-typedef-expansion.patch
diff --git a/debian/patches/shiboken2-Fail-template-test-instead-of-crashing.patch b/debian/patches/shiboken2-Fail-template-test-instead-of-crashing.patch
deleted file mode 100644
index f7887f0f..00000000
--- a/debian/patches/shiboken2-Fail-template-test-instead-of-crashing.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Friedemann Kleint <Friedemann.Kleint at qt.io>
-Date: Tue, 11 Apr 2023 14:57:49 +0200
-Subject: shiboken2: Fail template test instead of crashing
-
-The class is not found by Clang 16.
-
-Pick-to: 6.5 6.2 5.15
-Task-number: PYSIDE-2288
-Change-Id: If7c7a29417d083645ddf2e9fd206a09e47401833
-Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes at qt.io>
----
- sources/shiboken2/ApiExtractor/tests/testtemplates.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp b/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp
-index f6c70a6..9f929c4 100644
---- a/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp
-+++ b/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp
-@@ -641,6 +641,7 @@ public:
-     auto derived = AbstractMetaClass::findClass(classes, QLatin1String("Derived"));
-     QVERIFY(derived);
-     auto base = derived->templateBaseClass();
-+    QVERIFY(base);
-     QCOMPARE(base->name(), QLatin1String("Container1"));
- }
- 
diff --git a/debian/patches/shiboken2-Fix-build-with-clang-16.patch b/debian/patches/shiboken2-Fix-build-with-clang-16.patch
deleted file mode 100644
index 3c09a3ac..00000000
--- a/debian/patches/shiboken2-Fix-build-with-clang-16.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Friedemann Kleint <Friedemann.Kleint at qt.io>
-Date: Tue, 11 Apr 2023 14:38:01 +0200
-Subject: shiboken2: Fix build with clang 16
-
-getCursorSpelling() reports a name for unnamed enums.
-
-Pick-to: 6.5 6.2 5.15
-Task-number: PYSIDE-2288
-Change-Id: Iaeb6409c8825dc0fb2720b450fb14e64bbf5d303
-Reviewed-by: Adrian Herrmann <adrian.herrmann at qt.io>
-Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh at qt.io>
-(cherry picked from commit e20e1ea0f5f9f9a0fe1c309a60cb5297f1276efc)
----
- sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
-index ebe3b99..e8e5bcf 100644
---- a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
-+++ b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
-@@ -895,6 +895,8 @@ static NamespaceType namespaceType(const CXCursor &cursor)
- static QString enumType(const CXCursor &cursor)
- {
-     QString name = getCursorSpelling(cursor); // "enum Foo { v1, v2 };"
-+    if (name.contains(u"unnamed enum")) // Clang 16.0
-+        return {};
-     if (name.isEmpty()) {
-         // PYSIDE-1228: For "typedef enum { v1, v2 } Foo;", type will return
-         // "Foo" as expected. Care must be taken to exclude real anonymous enums.