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

[Dmitry Shachnev]

Git commit 50fc06e1937c99b6b7fdf09c670dc9c801a6ab38 by Dmitry Shachnev.
Committed on 06/06/2024 at 16:40.
Pushed by carlosdem into branch 'Neon/release'.

Refresh and rebase other patches.

M  +1    -0    debian/changelog
M  +2    -2    debian/patches/Support-running-PySide-on-Python-3.12.patch
M  +10   -10   debian/patches/shiboken2-clang-Record-scope-resolution-of-arguments-func.patch

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

diff --git a/debian/changelog b/debian/changelog
index fca23a8c..c40df23d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ pyside2 (5.15.14-1) UNRELEASED; urgency=medium
   * Drop patches, included in the new release:
     - shiboken2-Fix-build-with-clang-16.patch
     - shiboken2-Fail-template-test-instead-of-crashing.patch
+  * Refresh and rebase other patches.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 06 Jun 2024 19:35:15 +0300
 
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 ef4c3c99..6f3fb3bb 100644
--- a/debian/patches/Support-running-PySide-on-Python-3.12.patch
+++ b/debian/patches/Support-running-PySide-on-Python-3.12.patch
@@ -210,10 +210,10 @@ index d12dae3..fed2716 100644
   *
   * Module Initialization
 diff --git a/sources/shiboken2/libshiboken/pep384impl.h b/sources/shiboken2/libshiboken/pep384impl.h
-index b348943..40bd03b 100644
+index a870d6b..440784e 100644
 --- a/sources/shiboken2/libshiboken/pep384impl.h
 +++ b/sources/shiboken2/libshiboken/pep384impl.h
-@@ -570,6 +570,14 @@ extern LIBSHIBOKEN_API PyObject *PepMapping_Items(PyObject *o);
+@@ -567,6 +567,14 @@ extern LIBSHIBOKEN_API PyObject *PepMapping_Items(PyObject *o);
  
  extern LIBSHIBOKEN_API int PepRuntime_38_flag;
  
diff --git a/debian/patches/shiboken2-clang-Record-scope-resolution-of-arguments-func.patch b/debian/patches/shiboken2-clang-Record-scope-resolution-of-arguments-func.patch
index fc65d2b4..f5b1fc0d 100644
--- a/debian/patches/shiboken2-clang-Record-scope-resolution-of-arguments-func.patch
+++ b/debian/patches/shiboken2-clang-Record-scope-resolution-of-arguments-func.patch
@@ -83,10 +83,10 @@ index aacaf63..33f362c 100644
  inline QString getCursorTypeName(const CXCursor &cursor)
      { return getTypeName(clang_getCursorType(cursor)); }
 diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
-index 9995fc7..34c1b79 100644
+index dea0812..ba07a01 100644
 --- a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
 +++ b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
-@@ -1083,11 +1083,23 @@ void _ArgumentModelItem::setDefaultValue(bool defaultValue)
+@@ -1121,11 +1121,23 @@ void _ArgumentModelItem::setDefaultValue(bool defaultValue)
      m_defaultValue = defaultValue;
  }
  
@@ -110,7 +110,7 @@ index 9995fc7..34c1b79 100644
      if (m_defaultValue)
          d << ", defaultValue=\"" << m_defaultValueExpression << '"';
  }
-@@ -1152,6 +1164,16 @@ void _FunctionModelItem::setVariadics(bool isVariadics)
+@@ -1200,6 +1212,16 @@ void _FunctionModelItem::setVariadics(bool isVariadics)
      m_isVariadics = isVariadics;
  }
  
@@ -127,7 +127,7 @@ index 9995fc7..34c1b79 100644
  bool _FunctionModelItem::isNoExcept() const
  {
      return m_exceptionSpecification == ExceptionSpecification::NoExcept;
-@@ -1295,6 +1317,8 @@ void _FunctionModelItem::formatDebug(QDebug &d) const
+@@ -1343,6 +1365,8 @@ void _FunctionModelItem::formatDebug(QDebug &d) const
          d << " [explicit]";
      if (m_isInvokable)
          d << " [invokable]";
@@ -137,10 +137,10 @@ index 9995fc7..34c1b79 100644
      if (m_isVariadics)
          d << ",...";
 diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.h b/sources/shiboken2/ApiExtractor/parser/codemodel.h
-index 13bc7cf..d9cd99d 100644
+index b990ad9..85f298c 100644
 --- a/sources/shiboken2/ApiExtractor/parser/codemodel.h
 +++ b/sources/shiboken2/ApiExtractor/parser/codemodel.h
-@@ -505,6 +505,10 @@ public:
+@@ -499,6 +499,10 @@ public:
      QString defaultValueExpression() const { return m_defaultValueExpression; }
      void setDefaultValueExpression(const QString &expr) { m_defaultValueExpression = expr; }
  
@@ -151,15 +151,15 @@ index 13bc7cf..d9cd99d 100644
  #ifndef QT_NO_DEBUG_STREAM
      void formatDebug(QDebug &d) const override;
  #endif
-@@ -513,6 +517,7 @@ private:
+@@ -507,6 +511,7 @@ private:
      TypeInfo m_type;
      QString m_defaultValueExpression;
-     bool m_defaultValue;
+     bool m_defaultValue = false;
 +    bool m_scopeResolution = false;
  };
  
  class _MemberModelItem: public _CodeModelItem
-@@ -631,6 +636,8 @@ public:
+@@ -623,6 +628,8 @@ public:
      bool isVariadics() const;
      void setVariadics(bool isVariadics);
  
@@ -168,7 +168,7 @@ index 13bc7cf..d9cd99d 100644
  
      bool isSimilar(const FunctionModelItem &other) const;
  
-@@ -660,6 +667,7 @@ private:
+@@ -652,6 +659,7 @@ private:
              uint m_isExplicit: 1;
              uint m_isVariadics: 1;
              uint m_isInvokable : 1; // Qt