[neon/qt/pyside2/Neon/release] /: New upstream version 5.15.12
Dmitry Shachnev
null at kde.org
Thu Jul 25 03:06:03 BST 2024
Git commit 559fe36985a50b89171ae1da76a96686d52a4b71 by Dmitry Shachnev.
Committed on 24/12/2023 at 16:04.
Pushed by carlosdem into branch 'Neon/release'.
New upstream version 5.15.12
M +1 -1 build_scripts/config.py
M +1 -1 build_scripts/main.py
M +1 -1 coin/dependencies.yaml
M +9 -0 dist/changes-5.15.11
C +6 -8 dist/changes-5.15.12 [from: dist/changes-5.15.11 - 059% similarity]
M +2 -2 sources/pyside2/doc/modules.rst
M +1 -1 sources/pyside2/pyside_version.py
M +7 -11 sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
M +1 -1 sources/shiboken2/shiboken_version.py
https://invent.kde.org/neon/qt/pyside2/-/commit/559fe36985a50b89171ae1da76a96686d52a4b71
diff --git a/build_scripts/config.py b/build_scripts/config.py
index 9bb4c649..f2b4c40b 100644
--- a/build_scripts/config.py
+++ b/build_scripts/config.py
@@ -137,7 +137,7 @@ class Config(object):
setup_kwargs['zip_safe'] = False
setup_kwargs['cmdclass'] = cmd_class_dict
setup_kwargs['version'] = package_version
- setup_kwargs['python_requires'] = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <3.11"
+ setup_kwargs['python_requires'] = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <3.12"
if quiet:
# Tells distutils / setuptools to be quiet, and only print warnings or errors.
diff --git a/build_scripts/main.py b/build_scripts/main.py
index c7e67ac1..f7484550 100644
--- a/build_scripts/main.py
+++ b/build_scripts/main.py
@@ -1244,7 +1244,7 @@ class PysideRstDocs(Command, DistUtilsCommandMixin):
elif self.name == "shiboken2":
self.sphinx_src = self.out_dir
- sphinx_cmd = ["sphinx-build", "-b", "html", "-c", self.sphinx_src,
+ sphinx_cmd = ["sphinx-build", "-b", "html", "-j", "auto", "-c", self.sphinx_src,
self.doc_dir, self.out_dir]
if run_process(sphinx_cmd) != 0:
raise DistutilsSetupError("Error running CMake for {}".format(self.doc_dir))
diff --git a/coin/dependencies.yaml b/coin/dependencies.yaml
index 93d33c90..7e0fa64e 100644
--- a/coin/dependencies.yaml
+++ b/coin/dependencies.yaml
@@ -1,6 +1,6 @@
product_dependency:
../../qt/tqtc-qt5.git:
- ref: "5bbe0d09c5ec49df334b62ed1b3338bbba5d1981"
+ ref: "6f699275d508af0c5d61c91914ca1e45fec6b7ef"
dependency_source: supermodule
dependencies: [
"../../qt/qt3d",
diff --git a/dist/changes-5.15.11 b/dist/changes-5.15.11
index 172df845..95a0d452 100644
--- a/dist/changes-5.15.11
+++ b/dist/changes-5.15.11
@@ -24,3 +24,12 @@ information about a particular change.
- [PYSIDE-2019] Crashes when using QtDataVisualization's
QValue3DAxisFormatter have been fixed.
- [PYSIDE-2043] Errors when using VSCode's Intellisense have been fixed.
+ - [PYSIDE-2034] Blocking threads in static functions of QMessageBox
+ have been fixed.
+
+****************************************************************************
+* Shiboken2 *
+****************************************************************************
+
+ - [PYSIDE-1960] Crashes in libshiboken related to Python 3.11
+ have been fixed.
diff --git a/dist/changes-5.15.11 b/dist/changes-5.15.12
similarity index 59%
copy from dist/changes-5.15.11
copy to dist/changes-5.15.12
index 172df845..ce0fde9b 100644
--- a/dist/changes-5.15.11
+++ b/dist/changes-5.15.12
@@ -1,4 +1,4 @@
-Qt for Python 5.5.11 is a bug-fix release.
+Qt for Python 5.5.12 is a bug-fix release.
For more details, refer to the online documentation included in this
distribution. The documentation is also available online:
@@ -17,10 +17,8 @@ information about a particular change.
* PySide2 *
****************************************************************************
- - [PYSIDE-1956] Documentation regarding the clang environment variables has
- been fixed.
- - [PYSIDE-1960] Support for Python 3.11 has been added.
- - [PYSIDE-1980] The GLES build has been fixed.
- - [PYSIDE-2019] Crashes when using QtDataVisualization's
- QValue3DAxisFormatter have been fixed.
- - [PYSIDE-2043] Errors when using VSCode's Intellisense have been fixed.
+****************************************************************************
+* Shiboken2 *
+****************************************************************************
+
+ - [PYSIDE-1012] Missing includes for g++ 11.3 have been added.
diff --git a/sources/pyside2/doc/modules.rst b/sources/pyside2/doc/modules.rst
index bb4b112a..f9a5b282 100644
--- a/sources/pyside2/doc/modules.rst
+++ b/sources/pyside2/doc/modules.rst
@@ -1,5 +1,5 @@
-Qt Modules
-===========
+Qt Modules Supported by Qt for Python
+=====================================
.. toctree::
:hidden:
diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py
index 88792a38..290c1dc1 100644
--- a/sources/pyside2/pyside_version.py
+++ b/sources/pyside2/pyside_version.py
@@ -39,7 +39,7 @@
major_version = "5"
minor_version = "15"
-patch_version = "11"
+patch_version = "12"
# For example: "a", "b", "rc"
# (which means "alpha", "beta", "release candidate").
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
index 0b58cf5a..02b4614a 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
@@ -345,17 +345,13 @@ QByteArrayList emulatedCompilerOptions()
appendClangBuiltinIncludes(&headerPaths);
# endif // NEED_CLANG_BUILTIN_INCLUDES
- // Append the c++ include paths since Clang is unable to find <list> etc
- // on RHEL 7 with g++ 6.3 or CentOS 7.2.
- // A fix for this has been added to Clang 5.0, so, the code can be removed
- // once Clang 5.0 is the minimum version.
- if (needsGppInternalHeaders()) {
- const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("g++")));
- for (const HeaderPath &h : gppPaths) {
- if (h.path.contains("c++")
- || h.path.contains("sysroot")) { // centOS
- headerPaths.append(h);
- }
+ // Append the c++ include paths since Clang is unable to find
+ // <type_traits> etc (g++ 11.3).
+ const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("g++")));
+ for (const HeaderPath &h : gppPaths) {
+ if (h.path.contains("c++")
+ || h.path.contains("sysroot")) { // centOS
+ headerPaths.append(h);
}
}
#else
diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken2/shiboken_version.py
index 88792a38..290c1dc1 100644
--- a/sources/shiboken2/shiboken_version.py
+++ b/sources/shiboken2/shiboken_version.py
@@ -39,7 +39,7 @@
major_version = "5"
minor_version = "15"
-patch_version = "11"
+patch_version = "12"
# For example: "a", "b", "rc"
# (which means "alpha", "beta", "release candidate").
More information about the Neon-commits
mailing list