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

[Dmitry Shachnev]

Git commit fad0f6e14796b7fae0c4e216fb24f27404d948c0 by Dmitry Shachnev.
Committed on 16/12/2020 at 17:23.
Pushed by jriddell into branch 'Neon/release'.

Rebase other patches.

M  +1    -0    debian/changelog
M  +8    -28   debian/patches/fix-spelling-errors.patch
M  +2    -2    debian/patches/update-patchelf.patch

https://invent.kde.org/neon/qt/pyside2/commit/fad0f6e14796b7fae0c4e216fb24f27404d948c0

diff --git a/debian/changelog b/debian/changelog
index e126e4a9..e8a1399a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ pyside2 (5.15.2-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Drop python3.9.patch, included in the new release.
+  * Rebase other patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 16 Dec 2020 20:21:03 +0300
 
diff --git a/debian/patches/fix-spelling-errors.patch b/debian/patches/fix-spelling-errors.patch
index 65a4b59b..6e88b5f4 100644
--- a/debian/patches/fix-spelling-errors.patch
+++ b/debian/patches/fix-spelling-errors.patch
@@ -2,41 +2,21 @@ From: Sophie Brun <sophie at freexian.com>
 Date: Tue, 5 Nov 2019 10:39:14 +0100
 Subject: Fix spelling errors
 
-Last-Update: 2018-07-12
-
 Last-Update: 2018-07-12
 ---
- sources/pyside2/libpyside/pysideproperty.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ sources/pyside2/libpyside/pysideproperty.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sources/pyside2/libpyside/pysideproperty.cpp b/sources/pyside2/libpyside/pysideproperty.cpp
-index 009a17a..4d3f450 100644
+index 97729d2..3303ec0 100644
 --- a/sources/pyside2/libpyside/pysideproperty.cpp
 +++ b/sources/pyside2/libpyside/pysideproperty.cpp
-@@ -253,7 +253,7 @@ PyObject *qPropertySetter(PyObject *self, PyObject *callback)
-         Py_INCREF(callback);
-         return callback;
-     }
--    PyErr_SetString(PyExc_TypeError, "Invalid property setter agument.");
-+    PyErr_SetString(PyExc_TypeError, "Invalid property setter argument.");
-     return nullptr;
- }
- 
-@@ -269,7 +269,7 @@ PyObject *qPropertyGetter(PyObject *self, PyObject *callback)
-         Py_INCREF(callback);
-         return callback;
-     }
--    PyErr_SetString(PyExc_TypeError, "Invalid property getter agument.");
-+    PyErr_SetString(PyExc_TypeError, "Invalid property getter argument.");
-     return nullptr;
- }
- 
-@@ -389,7 +389,7 @@ int setValue(PySideProperty *self, PyObject *source, PyObject *value)
-         Shiboken::AutoDecRef result(PyObject_CallObject(fset, args));
+@@ -517,7 +517,7 @@ int setValue(PySideProperty *self, PyObject *source, PyObject *value)
+         Shiboken::AutoDecRef result(PyObject_CallObject(fdel, args));
          return (result.isNull() ? -1 : 0);
-     } else {
--        PyErr_SetString(PyExc_AttributeError, "Attibute read only");
-+        PyErr_SetString(PyExc_AttributeError, "Attribute read only");
      }
+-    PyErr_SetString(PyExc_AttributeError, "Attibute read only");
++    PyErr_SetString(PyExc_AttributeError, "Attribute read only");
      return -1;
  }
+ 
diff --git a/debian/patches/update-patchelf.patch b/debian/patches/update-patchelf.patch
index b7798d24..a03027ae 100644
--- a/debian/patches/update-patchelf.patch
+++ b/debian/patches/update-patchelf.patch
@@ -31,10 +31,10 @@ Last-Update: 2018-07-09
  3 files changed, 1673 insertions(+), 505 deletions(-)
 
 diff --git a/build_scripts/main.py b/build_scripts/main.py
-index 674048e..e638724 100644
+index ea91ef7..0501955 100644
 --- a/build_scripts/main.py
 +++ b/build_scripts/main.py
-@@ -873,7 +873,18 @@ class PysideBuild(_build):
+@@ -715,7 +715,18 @@ class PysideBuild(_build, DistUtilsCommandMixin):
              return
          log.info("Building patchelf...")
          module_src_dir = os.path.join(self.sources_dir, "patchelf")