[neon/qt/pyside2/Neon/release] debian: Rebase patches for the new release.

[Dmitry Shachnev]

Git commit fa31ae8ec525013bba2757e2ce78c59814381684 by Dmitry Shachnev.
Committed on 09/03/2024 at 10:36.
Pushed by carlosdem into branch 'Neon/release'.

Rebase patches for the new release.

M  +1    -0    debian/changelog
M  +1    -15   debian/patches/PyEnum-make-forgiving-duplicates-work-with-Python-3.11.patch
M  +4    -4    debian/patches/Support-running-PySide-on-Python-3.12.patch

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

diff --git a/debian/changelog b/debian/changelog
index eec57c68..1b27425a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ pyside2 (5.15.13-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Acknowledge NMU, thanks Steve Langasek!
   * New upstream release.
+  * Rebase patches for the new release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 09 Mar 2024 13:32:21 +0300
 
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 27677d03..d62b3391 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
@@ -21,9 +21,8 @@ Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes at qt.io>
 (cherry picked from commit da2cf031521815a9559ca784beadb70c7a2852d9)
 ---
  sources/pyside2/tests/QtCore/qenum_test.py                          | 6 ++++--
- sources/shiboken2/libshiboken/pep384impl.h                          | 2 +-
  .../files.dir/shibokensupport/signature/lib/enum_sig.py             | 3 ++-
- 3 files changed, 7 insertions(+), 4 deletions(-)
+ 2 files changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/sources/pyside2/tests/QtCore/qenum_test.py b/sources/pyside2/tests/QtCore/qenum_test.py
 index f99a893..0981c26 100644
@@ -48,19 +47,6 @@ index f99a893..0981c26 100644
          self.assertEqual(len(SomeClass.SomeEnum.__members__), 3)
          with self.assertRaises(TypeError):
              int(SomeClass.SomeEnum.C) == 6
-diff --git a/sources/shiboken2/libshiboken/pep384impl.h b/sources/shiboken2/libshiboken/pep384impl.h
-index eb65596..1ba8205 100644
---- a/sources/shiboken2/libshiboken/pep384impl.h
-+++ b/sources/shiboken2/libshiboken/pep384impl.h
-@@ -332,7 +332,7 @@ LIBSHIBOKEN_API PyObject *PyRun_String(const char *, int, PyObject *, PyObject *
- // But this is no problem as we check it's validity for every version.
- 
- #define PYTHON_BUFFER_VERSION_COMPATIBLE    (PY_VERSION_HEX >= 0x03030000 && \
--                                             PY_VERSION_HEX <  0x030AFFFF)
-+                                             PY_VERSION_HEX <  0x030C0000)
- #if !PYTHON_BUFFER_VERSION_COMPATIBLE
- # error Please check the buffer compatibility for this python version!
- #endif
 diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py
 index 088a93a..2f78718 100644
 --- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py
diff --git a/debian/patches/Support-running-PySide-on-Python-3.12.patch b/debian/patches/Support-running-PySide-on-Python-3.12.patch
index 5ced839b..ef4c3c99 100644
--- a/debian/patches/Support-running-PySide-on-Python-3.12.patch
+++ b/debian/patches/Support-running-PySide-on-Python-3.12.patch
@@ -166,10 +166,10 @@ index ca25fb3..b70c8c5 100644
              total = gettotalrefcount()
          for idx in range(1000):
 diff --git a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken2/libshiboken/pep384impl.cpp
-index fb28d88..cc85bb1 100644
+index d12dae3..fed2716 100644
 --- a/sources/shiboken2/libshiboken/pep384impl.cpp
 +++ b/sources/shiboken2/libshiboken/pep384impl.cpp
-@@ -811,6 +811,39 @@ init_PepRuntime()
+@@ -810,6 +810,39 @@ init_PepRuntime()
          PepRuntime_38_flag = 1;
  }
  
@@ -210,10 +210,10 @@ index fb28d88..cc85bb1 100644
   *
   * Module Initialization
 diff --git a/sources/shiboken2/libshiboken/pep384impl.h b/sources/shiboken2/libshiboken/pep384impl.h
-index 1ba8205..de06b6b 100644
+index b348943..40bd03b 100644
 --- a/sources/shiboken2/libshiboken/pep384impl.h
 +++ b/sources/shiboken2/libshiboken/pep384impl.h
-@@ -568,6 +568,14 @@ extern LIBSHIBOKEN_API PyObject *PepMapping_Items(PyObject *o);
+@@ -570,6 +570,14 @@ extern LIBSHIBOKEN_API PyObject *PepMapping_Items(PyObject *o);
  
  extern LIBSHIBOKEN_API int PepRuntime_38_flag;