[neon/qt/pyside2/Neon/release] debian: Refresh other patches.

[Dmitry Shachnev]

Git commit c0029b849dfeaec312b1f03cc00c43c1b1b512b7 by Dmitry Shachnev.
Committed on 06/10/2023 at 23:14.
Pushed by jriddell into branch 'Neon/release'.

Refresh other patches.

M  +1    -0    debian/changelog
M  +2    -2    debian/patches/Fix-tests-sample_privatector-sample_privatedtor-failing-w.patch
M  +1    -14   debian/patches/PyEnum-make-forgiving-duplicates-work-with-Python-3.11.patch
M  +2    -2    debian/patches/Shiboken-Fix-the-oldest-shiboken-bug-ever.patch
M  +2    -2    debian/patches/fix-spelling-errors.patch

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

diff --git a/debian/changelog b/debian/changelog
index f9ac67a2..d534b105 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ pyside2 (5.15.11-1) UNRELEASED; urgency=medium
     - libshiboken-Fix-crashes-with-static-strings-in-Python-3.11.patch
     - Fix-Property-GC-tracking-for-Python-3.11.patch
     - Fix-GLES-builds.patch
+  * Refresh other patches.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 07 Oct 2023 00:05:00 +0300
 
diff --git a/debian/patches/Fix-tests-sample_privatector-sample_privatedtor-failing-w.patch b/debian/patches/Fix-tests-sample_privatector-sample_privatedtor-failing-w.patch
index 7946f03b..8a597897 100644
--- a/debian/patches/Fix-tests-sample_privatector-sample_privatedtor-failing-w.patch
+++ b/debian/patches/Fix-tests-sample_privatector-sample_privatedtor-failing-w.patch
@@ -16,10 +16,10 @@ Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh at qt.io>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp
-index 0832037..cb810f1 100644
+index 1919f28..f908f22 100644
 --- a/sources/shiboken2/libshiboken/basewrapper.cpp
 +++ b/sources/shiboken2/libshiboken/basewrapper.cpp
-@@ -832,9 +832,9 @@ PyObject *SbkQAppTpNew(PyTypeObject *subtype, PyObject *, PyObject *)
+@@ -841,9 +841,9 @@ PyObject *SbkQAppTpNew(PyTypeObject *subtype, PyObject *, PyObject *)
  PyObject *SbkDummyNew(PyTypeObject *type, PyObject *, PyObject *)
  {
      // PYSIDE-595: Give the same error as type_call does when tp_new is NULL.
diff --git a/debian/patches/PyEnum-make-forgiving-duplicates-work-with-Python-3.11.patch b/debian/patches/PyEnum-make-forgiving-duplicates-work-with-Python-3.11.patch
index 34aefe03..27677d03 100644
--- a/debian/patches/PyEnum-make-forgiving-duplicates-work-with-Python-3.11.patch
+++ b/debian/patches/PyEnum-make-forgiving-duplicates-work-with-Python-3.11.patch
@@ -20,24 +20,11 @@ Reviewed-by: Qt CI Bot <qt_ci_bot at qt-project.org>
 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes at qt.io>
 (cherry picked from commit da2cf031521815a9559ca784beadb70c7a2852d9)
 ---
- build_scripts/config.py                                             | 1 +
  sources/pyside2/tests/QtCore/qenum_test.py                          | 6 ++++--
  sources/shiboken2/libshiboken/pep384impl.h                          | 2 +-
  .../files.dir/shibokensupport/signature/lib/enum_sig.py             | 3 ++-
- 4 files changed, 8 insertions(+), 4 deletions(-)
+ 3 files changed, 7 insertions(+), 4 deletions(-)
 
-diff --git a/build_scripts/config.py b/build_scripts/config.py
-index 00cbd3f..63e52a2 100644
---- a/build_scripts/config.py
-+++ b/build_scripts/config.py
-@@ -94,6 +94,7 @@ class Config(object):
-             'Programming Language :: Python :: 3.8',
-             'Programming Language :: Python :: 3.9',
-             'Programming Language :: Python :: 3.10',
-+            'Programming Language :: Python :: 3.11',
-         ]
- 
-         self.setup_script_dir = None
 diff --git a/sources/pyside2/tests/QtCore/qenum_test.py b/sources/pyside2/tests/QtCore/qenum_test.py
 index f99a893..0981c26 100644
 --- a/sources/pyside2/tests/QtCore/qenum_test.py
diff --git a/debian/patches/Shiboken-Fix-the-oldest-shiboken-bug-ever.patch b/debian/patches/Shiboken-Fix-the-oldest-shiboken-bug-ever.patch
index 90aa9dd6..98315dd3 100644
--- a/debian/patches/Shiboken-Fix-the-oldest-shiboken-bug-ever.patch
+++ b/debian/patches/Shiboken-Fix-the-oldest-shiboken-bug-ever.patch
@@ -30,10 +30,10 @@ Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh at qt.io>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sources/pyside2/libpyside/pysidesignal.cpp b/sources/pyside2/libpyside/pysidesignal.cpp
-index ce89a9d..71fc0e3 100644
+index 607ce16..6824a71 100644
 --- a/sources/pyside2/libpyside/pysidesignal.cpp
 +++ b/sources/pyside2/libpyside/pysidesignal.cpp
-@@ -725,7 +725,7 @@ static QByteArray buildSignature(const QByteArray &name, const QByteArray &signa
+@@ -726,7 +726,7 @@ static QByteArray buildSignature(const QByteArray &name, const QByteArray &signa
  
  static QByteArray parseSignature(PyObject *args)
  {
diff --git a/debian/patches/fix-spelling-errors.patch b/debian/patches/fix-spelling-errors.patch
index 6e88b5f4..941e661b 100644
--- a/debian/patches/fix-spelling-errors.patch
+++ b/debian/patches/fix-spelling-errors.patch
@@ -8,10 +8,10 @@ Last-Update: 2018-07-12
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sources/pyside2/libpyside/pysideproperty.cpp b/sources/pyside2/libpyside/pysideproperty.cpp
-index 97729d2..3303ec0 100644
+index 0d0957f..86909d3 100644
 --- a/sources/pyside2/libpyside/pysideproperty.cpp
 +++ b/sources/pyside2/libpyside/pysideproperty.cpp
-@@ -517,7 +517,7 @@ int setValue(PySideProperty *self, PyObject *source, PyObject *value)
+@@ -519,7 +519,7 @@ int setValue(PySideProperty *self, PyObject *source, PyObject *value)
          Shiboken::AutoDecRef result(PyObject_CallObject(fdel, args));
          return (result.isNull() ? -1 : 0);
      }