[neon/forks/pyqt-builder/Neon/release] /: New upstream version 1.14.1+dfsg

[Dmitry Shachnev]

Git commit d12a8ae5d39e72980e00420b4b379e52e5596d07 by Dmitry Shachnev.
Committed on 28/01/2023 at 18:06.
Pushed by carlosdem into branch 'Neon/release'.

New upstream version 1.14.1+dfsg

M  +12   -0    ChangeLog
M  +3    -0    NEWS
M  +1    -1    PKG-INFO
M  +1    -1    PyQt_builder.egg-info/PKG-INFO
M  +3    -1    PyQt_builder.egg-info/SOURCES.txt
M  +8    -4    pyqtbuild/builder.py
M  +2    -2    pyqtbuild/version.py

https://invent.kde.org/neon/forks/pyqt-builder/commit/d12a8ae5d39e72980e00420b4b379e52e5596d07

diff --git a/ChangeLog b/ChangeLog
index bde0032..fe11d48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2023-01-22  Phil Thompson  <phil at riverbankcomputing.com>
+
+	* NEWS, pyqtbuild/builder.py:
+	The patch version of Qt is now significant for Qt v5.15.
+	[f89520ece864] [1.14.1] <1.14-maint>
+
+2022-09-30  Phil Thompson  <phil at riverbankcomputing.com>
+
+	* .hgtags:
+	Added tag 1.14.0 for changeset 274306a008c8
+	[8b41b07420e2]
+
 2022-09-21  Phil Thompson  <phil at riverbankcomputing.com>
 
 	* NEWS, pyqtbuild/bundle/packages/pyqt6.py:
diff --git a/NEWS b/NEWS
index df69d06..6762cfb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+v1.14.1 22nd January 2023
+  - Support different patch versions for Qt v5.15.
+
 v1.14.0 21st September 2022
   - Added support for QtPdf, QtPdfWidgets and QtTextToSpeech for PyQt6.
   - SIP v6.7 is now required.
diff --git a/PKG-INFO b/PKG-INFO
index 7f627af..d3fee2b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyQt-builder
-Version: 1.14.0
+Version: 1.14.1
 Summary: The PEP 517 compliant PyQt build system
 Home-page: https://www.riverbankcomputing.com/software/pyqt-builder/
 Author: Riverbank Computing Limited
diff --git a/PyQt_builder.egg-info/PKG-INFO b/PyQt_builder.egg-info/PKG-INFO
index 7f627af..d3fee2b 100644
--- a/PyQt_builder.egg-info/PKG-INFO
+++ b/PyQt_builder.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyQt-builder
-Version: 1.14.0
+Version: 1.14.1
 Summary: The PEP 517 compliant PyQt build system
 Home-page: https://www.riverbankcomputing.com/software/pyqt-builder/
 Author: Riverbank Computing Limited
diff --git a/PyQt_builder.egg-info/SOURCES.txt b/PyQt_builder.egg-info/SOURCES.txt
index 5164b36..5e22163 100644
--- a/PyQt_builder.egg-info/SOURCES.txt
+++ b/PyQt_builder.egg-info/SOURCES.txt
@@ -43,12 +43,13 @@ doc/html/_sources/introduction.rst.txt
 doc/html/_sources/pyproject_toml.rst.txt
 doc/html/_sources/pyqtbuild_api.rst.txt
 doc/html/_sources/pyqtbundle.rst.txt
+doc/html/_static/_sphinx_javascript_frameworks_compat.js
 doc/html/_static/basic.css
 doc/html/_static/classic.css
 doc/html/_static/doctools.js
 doc/html/_static/documentation_options.js
 doc/html/_static/file.png
-doc/html/_static/jquery-3.5.1.js
+doc/html/_static/jquery-3.6.0.js
 doc/html/_static/jquery.js
 doc/html/_static/language_data.js
 doc/html/_static/logo.png
@@ -59,6 +60,7 @@ doc/html/_static/pygments.css
 doc/html/_static/riverbank.css
 doc/html/_static/searchtools.js
 doc/html/_static/sidebar.js
+doc/html/_static/sphinx_highlight.js
 doc/html/_static/underscore-1.13.1.js
 doc/html/_static/underscore.js
 doc/riverbank/layout.html
diff --git a/pyqtbuild/builder.py b/pyqtbuild/builder.py
index 5650932..270343c 100644
--- a/pyqtbuild/builder.py
+++ b/pyqtbuild/builder.py
@@ -530,11 +530,15 @@ macx {
         patch = self.qt_version & 0xff
 
         # Qt v5.12.4 was the last release where we updated for a patch version.
-        if (major, minor) >= (5, 13):
+        # This should be safe to do (given Qt's supposed use of semantic
+        # versioning) and removes the need to add new patch versions for old
+        # (ie. LTS) versions.  However Qt v5.15 breaks semantic versioning so
+        # we need the patch version, but as it is the very last minor version
+        # of Qt5 we don't need to worry about old versions.
+        if (5, 13) <= (major, minor) < (5, 15) or major >= 6:
             patch = 0
-        elif (major, minor) == (5, 12):
-            if patch > 4:
-                patch = 4
+        elif (5, 12, 4) <= (major, minor, patch) < (5, 13, 0):
+            patch = 4
 
         self.qt_version_tag = '{}_{}_{}'.format(major, minor, patch)
 
diff --git a/pyqtbuild/version.py b/pyqtbuild/version.py
index 845a05d..8f45aaa 100644
--- a/pyqtbuild/version.py
+++ b/pyqtbuild/version.py
@@ -1,2 +1,2 @@
-PYQTBUILD_VERSION = 0x010e00
-PYQTBUILD_VERSION_STR = '1.14.0'
+PYQTBUILD_VERSION = 0x010e01
+PYQTBUILD_VERSION_STR = '1.14.1'