[neon/qt/pyside2/Neon/release] debian/patches: Add update-sip-import.patch (Closes: #966041)

Kurt Kremitzki null at kde.org
Wed Oct 19 14:56:29 BST 2022


Git commit c7d173ebe801a59b69677dbe49913ff34ad5ac3f by Kurt Kremitzki.
Committed on 20/12/2020 at 17:17.
Pushed by jriddell into branch 'Neon/release'.

Add update-sip-import.patch (Closes: #966041)

M  +1    -0    debian/patches/series
A  +25   -0    debian/patches/update-sip-import.patch

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

diff --git a/debian/patches/series b/debian/patches/series
index 5f60b2bc..7c8d5a85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+update-sip-import.patch
 fix-spelling-errors.patch
 blacklist-failing-tests.patch
 fix-reuse-build.patch
diff --git a/debian/patches/update-sip-import.patch b/debian/patches/update-sip-import.patch
new file mode 100644
index 00000000..2f4958ba
--- /dev/null
+++ b/debian/patches/update-sip-import.patch
@@ -0,0 +1,25 @@
+Description: Update import of PyQt5 private sip module and remove Python 2/PyQt4 setapi calls
+Author: Kurt Kremitzki <kkremitzki at debian.org>
+Last-Updated: 2020-12-20
+
+--- a/sources/pyside2/tests/tools/list-class-hierarchy.py
++++ b/sources/pyside2/tests/tools/list-class-hierarchy.py
+@@ -96,14 +96,10 @@
+     for l in libraries:
+         dictionary = []
+         if l =="PyQt5":
+-            import sip
+-            sip.setapi('QDate',2)
+-            sip.setapi('QDateTime',2)
+-            sip.setapi('QString',2)
+-            sip.setapi('QTextStream',2)
+-            sip.setapi('QTime',2)
+-            sip.setapi('QUrl',2)
+-            sip.setapi('QVariant',2)
++            try:
++                from PyQt5 import sip
++            except ModuleNotFoundError:
++                import sip
+ 
+         for m in modules:
+             exec("from %s import %s" % (l,m), globals(), locals())



More information about the Neon-commits mailing list