[neon/forks/pyqt5/Neon/release] debian: Fix PyQt5.Qt module being empty.

[Dmitry Shachnev]

Git commit 3bf1331983ddd87d4af46cc1d1e499fe5e77a873 by Dmitry Shachnev.
Committed on 02/02/2023 at 09:59.
Pushed by carlosdem into branch 'Neon/release'.

Fix PyQt5.Qt module being empty.

- Bump sip build-dependencies to 6.7.6+dfsg-2.
- Backport upstream patch to fix the order in which modules are built.

Closes: #1030188.

M  +8    -0    debian/changelog
M  +2    -2    debian/control
A  +61   -0    debian/patches/composite_qt_module.patch
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/forks/pyqt5/commit/3bf1331983ddd87d4af46cc1d1e499fe5e77a873

diff --git a/debian/changelog b/debian/changelog
index d86a9e12..afb1b643 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pyqt5 (5.15.8+dfsg-2) UNRELEASED; urgency=medium
+
+  * Fix PyQt5.Qt module being empty (closes: #1030188).
+    - Bump sip build-dependencies to 6.7.6+dfsg-2.
+    - Backport upstream patch to fix the order in which modules are built.
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 02 Feb 2023 13:57:27 +0400
+
 pyqt5 (5.15.8+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 5e676171..21d8c8f8 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: debhelper-compat (= 13),
                python3-all-dev (>= 3.3.2-5~),
                python3-dbus,
                python3-pyqtbuild (>= 1.14.1),
-               python3-sipbuild (>= 6.6.2),
+               python3-sipbuild (>= 6.7.6+dfsg-2~),
                qtbase5-dev (>= 5.15),
                qtconnectivity5-dev [linux-any],
                qtdeclarative5-dev,
@@ -33,7 +33,7 @@ Build-Depends: debhelper-compat (= 13),
                qtmultimedia5-dev,
                qtpositioning5-dev,
                qttools5-dev,
-               sip-tools (>= 6.6.2)
+               sip-tools (>= 6.7.6+dfsg-2~)
 Build-Depends-Indep: fdupes, python3-pyqt5.sip (>= 12.11)
 Standards-Version: 4.6.2
 Homepage: https://riverbankcomputing.com/software/pyqt/intro
diff --git a/debian/patches/composite_qt_module.patch b/debian/patches/composite_qt_module.patch
new file mode 100644
index 00000000..3a235814
--- /dev/null
+++ b/debian/patches/composite_qt_module.patch
@@ -0,0 +1,61 @@
+From: Phil Thompson <phil at riverbankcomputing.com>
+Date: Thu, 2 Feb 2023 13:54:29 +0400
+Subject: Fixed the order in which modules are built
+
+So that the composite Qt module is built after everything it depends on.
+
+Origin: upstream, changeset c8aba8cdb7c0
+---
+ project.py | 25 ++++++++++++-------------
+ 1 file changed, 12 insertions(+), 13 deletions(-)
+
+diff --git a/project.py b/project.py
+index 93ab739..d46a2e7 100644
+--- a/project.py
++++ b/project.py
+@@ -46,17 +46,16 @@ class PyQt(PyQtProject):
+                     'pyuic5 = PyQt5.uic.pyuic:main'])
+ 
+         # Each set of bindings must appear after any set they depend on.
+-        self.bindings_factories = [Qt, QtCore, QtNetwork, QtGui, QtWidgets,
+-            QtQml, QAxContainer, QtAndroidExtras, QtBluetooth, QtDBus,
+-            QtDesigner, Enginio, QtHelp, QtMacExtras, QtMultimedia,
+-            QtMultimediaWidgets, QtNfc, QtOpenGL, QtPositioning, QtLocation,
+-            QtPrintSupport, QtQuick, QtQuick3D, QtQuickWidgets,
+-            QtRemoteObjects, QtSensors, QtSerialPort, QtSql, QtSvg, QtTest,
+-            QtTextToSpeech, QtWebChannel, QtWebKit, QtWebKitWidgets,
+-            QtWebSockets, QtWinExtras, QtX11Extras, QtXml, QtXmlPatterns,
+-            _QOpenGLFunctions_2_0, _QOpenGLFunctions_2_1,
+-            _QOpenGLFunctions_4_1_Core, _QOpenGLFunctions_ES2, pylupdate,
+-            pyrcc]
++        self.bindings_factories = [QtCore, QtNetwork, QtGui, QtWidgets, QtQml,
++            QAxContainer, QtAndroidExtras, QtBluetooth, QtDBus, QtDesigner,
++            Enginio, QtHelp, QtMacExtras, QtMultimedia, QtMultimediaWidgets,
++            QtNfc, QtOpenGL, QtPositioning, QtLocation, QtPrintSupport,
++            QtQuick, QtQuick3D, QtQuickWidgets, QtRemoteObjects, QtSensors,
++            QtSerialPort, QtSql, QtSvg, QtTest, QtTextToSpeech, QtWebChannel,
++            QtWebKit, QtWebKitWidgets, QtWebSockets, QtWinExtras, QtX11Extras,
++            QtXml, QtXmlPatterns, Qt, _QOpenGLFunctions_2_0,
++            _QOpenGLFunctions_2_1, _QOpenGLFunctions_4_1_Core,
++            _QOpenGLFunctions_ES2, pylupdate, pyrcc]
+ 
+     def apply_user_defaults(self, tool):
+         """ Set default values where needed. """
+@@ -195,7 +194,7 @@ del find_qt
+ 
+         # Add the composite module.
+         if 'Qt' in self.bindings:
+-            self._add_composite_module(tool)
++            self._add_composite_module()
+ 
+         # Always install the uic module.
+         installable = Installable('uic', target_subdir='PyQt5')
+@@ -226,7 +225,7 @@ del find_qt
+         if self.dbus_python:
+             self._add_dbus(others_debug)
+ 
+-    def _add_composite_module(self, tool):
++    def _add_composite_module(self):
+         """ Add the bindings for the composite module. """
+ 
+         sip_file = os.path.join(self.build_dir, 'Qt.sip')
diff --git a/debian/patches/series b/debian/patches/series
index 5aefe304..418af680 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 getdefaultlocale.patch
+composite_qt_module.patch