[neon/forks/pyqt5/Neon/release] /: New upstream version 5.15.9+dfsg

[Dmitry Shachnev]

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

New upstream version 5.15.9+dfsg

M  +11   -0    ChangeLog
M  +3    -0    NEWS
M  +1    -1    PKG-INFO
M  +1    -1    configure.py
M  +12   -13   project.py
M  +1    -1    pyproject.toml
M  +2    -2    sip/QtCore/qglobal.sip

https://invent.kde.org/neon/forks/pyqt5/commit/0904ce4844e463c08e6680b309996b55acc75b78

diff --git a/ChangeLog b/ChangeLog
index 939a2235..a5c3fa2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
+2023-01-31  Phil Thompson  <phil at riverbankcomputing.com>
+
+	* NEWS, lib/project.py:
+	Fix the order in which modules are built so that the composite Qt
+	module is built after everything it depends on.
+	[c8aba8cdb7c0] [5.15.9] <5.15-maint>
+
 2023-01-22  Phil Thompson  <phil at riverbankcomputing.com>
 
+	* .hgtags:
+	Added tag 5.15.8 for changeset f3d5a635ec21
+	[255d4467683f] <5.15-maint>
+
 	* lib/pyproject.toml, rb-product.toml:
 	Ensure the PyQt-Qt5 dependency is correct.
 	[f3d5a635ec21] [5.15.8] <5.15-maint>
diff --git a/NEWS b/NEWS
index d0b38848..82cd2708 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+v5.15.9 31st January 2023
+  - Bug fixes.
+
 v5.15.8 22nd January 2023
   - Added the missing QLocale.Language.NigerianPidgin member (Qt v5.15.2 and
     later).
diff --git a/PKG-INFO b/PKG-INFO
index 7fae6cab..bc18abf8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyQt5
-Version: 5.15.8
+Version: 5.15.9
 Requires-Python: >=3.7
 Summary: Python bindings for the Qt cross platform application toolkit
 Home-Page: https://www.riverbankcomputing.com/software/pyqt/
diff --git a/configure.py b/configure.py
index 7cd8e46f..db57056a 100644
--- a/configure.py
+++ b/configure.py
@@ -28,7 +28,7 @@ import sys
 
 
 # Initialise the constants.
-PYQT_VERSION_STR = "5.15.8"
+PYQT_VERSION_STR = "5.15.9"
 SIP_MIN_VERSION = '@MinimumSipVersion@'
 
 
diff --git a/project.py b/project.py
index 93ab739b..d46a2e71 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/pyproject.toml b/pyproject.toml
index c8909449..6f03dd9d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "sipbuild.api"
 # Specify the PEP 566 metadata for the project.
 [tool.sip.metadata]
 name = "PyQt5"
-version = "5.15.8"
+version = "5.15.9"
 summary = "Python bindings for the Qt cross platform application toolkit"
 home-page = "https://www.riverbankcomputing.com/software/pyqt/"
 author = "Riverbank Computing Limited"
diff --git a/sip/QtCore/qglobal.sip b/sip/QtCore/qglobal.sip
index 5c7c0870..599c50c2 100644
--- a/sip/QtCore/qglobal.sip
+++ b/sip/QtCore/qglobal.sip
@@ -29,8 +29,8 @@ int PYQT_VERSION;
 const char *PYQT_VERSION_STR;
 
 %ModuleCode
-static int PYQT_VERSION = 0x050f08;
-static const char *PYQT_VERSION_STR = "5.15.8";
+static int PYQT_VERSION = 0x050f09;
+static const char *PYQT_VERSION_STR = "5.15.9";
 %End
 const int QT_VERSION;
 const char *QT_VERSION_STR;