[neon/forks/pyqt5/Neon/release] debian: Drop composite_qt_module.patch, included in the new release.

[Dmitry Shachnev]

Git commit a51fe2387c7105e3e49faf6667a3149f89ac0811 by Dmitry Shachnev.
Committed on 07/02/2023 at 18:01.
Pushed by carlosdem into branch 'Neon/release'.

Drop composite_qt_module.patch, included in the new release.

M  +1    -0    debian/changelog
D  +0    -61   debian/patches/composite_qt_module.patch
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/forks/pyqt5/commit/a51fe2387c7105e3e49faf6667a3149f89ac0811

diff --git a/debian/changelog b/debian/changelog
index dca24e4c..114eb022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pyqt5 (5.15.9+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop composite_qt_module.patch, included in the new release.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 07 Feb 2023 22:00:26 +0400
 
diff --git a/debian/patches/composite_qt_module.patch b/debian/patches/composite_qt_module.patch
deleted file mode 100644
index 3a235814..00000000
--- a/debian/patches/composite_qt_module.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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 418af680..5aefe304 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 getdefaultlocale.patch
-composite_qt_module.patch