Accepting request 1282550 from KDE:Qt6

Qt 6.9.1 (forwarded request 1282452 from krop)

OBS-URL: https://build.opensuse.org/request/show/1282550
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python3-pyside6?expand=0&rev=44

0001-Lazy-Init-Support-Lazy-Subtypes-amended.patch

@@ -1,54 +0,0 @@
-From e67404e0715d9d6a27e52dbd0be9c34643a89a03 Mon Sep 17 00:00:00 2001
-From: Christian Tismer <tismer@stackless.com>
-Date: Sun, 13 Oct 2024 23:29:47 +0200
-Subject: [PATCH] Lazy Init: Support Lazy Subtypes, amended
-
-The addition of nested types made it necessary to filter
-subtypes out of resolveLazyClasses because incarnateType
-should be called for toplevel types, only.
-
-Task-number: PYSIDE-2404
-Change-Id: I4b95c0f65c055376defb6a8e9ea888285c82a8e2
-Fixes: PYSIDE-2888
-Pick-to: 6.8
----
- sources/shiboken6/libshiboken/sbkmodule.cpp | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/sources/shiboken6/libshiboken/sbkmodule.cpp b/sources/shiboken6/libshiboken/sbkmodule.cpp
-index acadc60..bca7383 100644
---- a/sources/shiboken6/libshiboken/sbkmodule.cpp
-+++ b/sources/shiboken6/libshiboken/sbkmodule.cpp
-@@ -93,8 +93,10 @@ static void incarnateHelper(PyObject *module, const std::string_view names,
-         startPos = dotPos + 1;
-         dotPos = names.find('.', startPos);
-     }
--    // now we have the type to create.
-+    // now we have the type to create. (May be done already)
-     auto funcIter = nameToFunc.find(std::string(names));
-+    if (funcIter == nameToFunc.end())
-+        return;
-     // - call this function that returns a PyTypeObject
-     auto tcStruct = funcIter->second;
-     auto initFunc = tcStruct.func;
-@@ -174,11 +176,15 @@ void resolveLazyClasses(PyObject *module)
-     // - see if there are still unloaded elements
-     auto &nameToFunc = tableIter->second;
- 
--    // - incarnate all types.
-+    // - incarnate all toplevel types. Subtypes will be handled there.
-     while (!nameToFunc.empty()) {
-         auto it = nameToFunc.begin();
-         auto attrNameStr = it->first;
--        incarnateType(module, attrNameStr.c_str(), nameToFunc);
-+        if (attrNameStr.find('.') == std::string::npos) {
-+            incarnateType(module, attrNameStr.c_str(), nameToFunc);
-+        } else {
-+            nameToFunc.erase(it);
-+        }
-     }
- }
- 
--- 
-2.47.0
-

0001-PySide6-Documentation-Name-the-.rst-doc-files-accord.patch

@@ -1,99 +0,0 @@
-From 12aba6c4dfafe191a4640e3ab755a1c7e2ddfc44 Mon Sep 17 00:00:00 2001
-From: Friedemann Kleint <Friedemann.Kleint@qt.io>
-Date: Tue, 15 Oct 2024 08:49:09 +0200
-Subject: [PATCH] PySide6/Documentation: Name the .rst doc files according to
- the module name
-
-This makes installing them easier.
-Amends b55e221464c18053fa44f18132071ebdaee8f432.
-
-Task-number: PYSIDE-2893
-Task-number: PYSIDE-1106
-Change-Id: Ic93a1db34ca778ba1df8065c87e51e64e01c5900
-Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
-(cherry picked from commit 9214d569d1e0765435a0df6a81a3996b93b3d044)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- sources/pyside6/PySide6/QtQml/typesystem_qml.xml | 16 ++++++++--------
- .../doc/{qtqml_functions.rst => qtqml.rst}       |  0
- 2 files changed, 8 insertions(+), 8 deletions(-)
- rename sources/pyside6/PySide6/doc/{qtqml_functions.rst => qtqml.rst} (100%)
-
-diff --git a/sources/pyside6/PySide6/QtQml/typesystem_qml.xml b/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
-index f2e9707c3..11eb27134 100644
---- a/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
-+++ b/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
-@@ -58,42 +58,42 @@
- 
-     <add-function signature="qmlRegisterType(PyTypeObject@type_obj@,const char*@uri@,int@version_major@,int@version_minor@,const char*@qml_name@)" return-type="int">
-         <inject-code class="target" file="../glue/qtqml.cpp" snippet="qmlregistertype"/>
--        <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
-+        <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
-                               snippet="qmlregistertype"/>
-         <modify-argument index="2" pyi-type="str"/>
-     </add-function>
- 
-     <add-function signature="qmlRegisterSingletonType(PyTypeObject@type_obj@,const char*@uri@,int@version_major@,int@version_minor@,const char*@qml_name@,PyObject*@callback@)" return-type="int">
-       <inject-code class="target" file="../glue/qtqml.cpp" snippet="qmlregistersingletontype_qobject_callback"/>
--      <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
-+      <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
-                             snippet="qmlregistersingletontype_qobject_callback"/>
-       <modify-argument index="2" pyi-type="str"/>
-     </add-function>
- 
-     <add-function signature="qmlRegisterSingletonType(PyTypeObject@type_obj@,const char*@uri@,int@version_major@,int@version_minor@,const char*@qml_name@)" return-type="int">
-       <inject-code class="target" file="../glue/qtqml.cpp" snippet="qmlregistersingletontype_qobject_nocallback"/>
--      <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
-+      <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
-                             snippet="qmlregistersingletontype_qobject_nocallback"/>
-       <modify-argument index="2" pyi-type="str"/>
-     </add-function>
- 
-     <add-function signature="qmlRegisterSingletonType(const char*@uri@,int@version_major@,int@version_minor@,const char*@qml_name@,PyObject*@callback@)" return-type="int">
-       <inject-code class="target" file="../glue/qtqml.cpp" snippet="qmlregistersingletontype_qjsvalue"/>
--      <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
-+      <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
-                             snippet="qmlregistersingletontype_qjsvalue"/>
-       <modify-argument index="1" pyi-type="str"/>
-     </add-function>
- 
-     <add-function signature="qmlRegisterSingletonInstance(PyTypeObject@type_obj@,const char*@uri@,int@version_major@,int@version_minor@,const char*@qml_name@,PyObject*@callback@)" return-type="int">
-       <inject-code class="target" file="../glue/qtqml.cpp" snippet="qmlregistersingletoninstance"/>
--      <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
-+      <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
-                             snippet="qmlregistersingletoninstance"/>
-       <modify-argument index="2" pyi-type="str"/>
-     </add-function>
- 
-     <add-function signature="qmlRegisterUncreatableType(PyTypeObject@type_obj@,const char*@uri@,int@version_major@,int@version_minor@,const char*@qml_name@,const char*@message@)" return-type="int">
-         <inject-code class="target" file="../glue/qtqml.cpp" snippet="qmlregisteruncreatabletype"/>
--        <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
-+        <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
-                               snippet="qmlregisteruncreatabletype"/>
-         <modify-argument index="2" pyi-type="str"/>
-     </add-function>
-@@ -229,7 +229,7 @@
-             </modify-argument>
-             <inject-code class="target" file="../glue/qtqml.cpp"
-                          snippet="qqmlengine-singletoninstance-qmltypeid"/>
--            <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
-+            <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
-                                   snippet="qqmlengine-singletoninstance-qmltypeid"/>
-         </add-function>
-         <add-function signature="singletonInstance(QString@uri@,QString@typeName@)"
-@@ -241,7 +241,7 @@
-             </modify-argument>
-             <inject-code class="target" file="../glue/qtqml.cpp"
-                          snippet="qqmlengine-singletoninstance-typename"/>
--            <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
-+            <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
-                                   snippet="qqmlengine-singletoninstance-typename"/>
-         </add-function>
-     </object-type>
-diff --git a/sources/pyside6/PySide6/doc/qtqml_functions.rst b/sources/pyside6/PySide6/doc/qtqml.rst
-similarity index 100%
-rename from sources/pyside6/PySide6/doc/qtqml_functions.rst
-rename to sources/pyside6/PySide6/doc/qtqml.rst
--- 
-2.47.0
-

0001-build-Install-module-doc-snippet-files.patch

@@ -1,112 +0,0 @@
-From cacc9c5803a6dec820dd46211a836453183c8dab Mon Sep 17 00:00:00 2001
-From: Friedemann Kleint <Friedemann.Kleint@qt.io>
-Date: Tue, 15 Oct 2024 08:11:46 +0200
-Subject: [PATCH] build: Install module doc snippet files
-
-Amends b55e221464c18053fa44f18132071ebdaee8f432.
-
-Task-number: PYSIDE-1106
-Fixes: PYSIDE-2893
-Change-Id: I4a2688bfb5fcdddc5c6baea49d2fdc9c0f2381f1
-Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
-(cherry picked from commit ad155e67a208d4ac4c20d7033701d6ddb3d2593e)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- build_scripts/platforms/unix.py                  | 8 ++++----
- build_scripts/platforms/windows_desktop.py       | 7 +++----
- build_scripts/wheel_files.py                     | 3 +++
- sources/pyside6/cmake/Macros/PySideModules.cmake | 9 +++++++++
- 4 files changed, 19 insertions(+), 8 deletions(-)
-
-Index: pyside-setup-everywhere-src-6.8.0/build_scripts/platforms/unix.py
-===================================================================
---- pyside-setup-everywhere-src-6.8.0.orig/build_scripts/platforms/unix.py
-+++ pyside-setup-everywhere-src-6.8.0/build_scripts/platforms/unix.py
-@@ -199,10 +199,10 @@ def prepare_packages_posix(pyside_build,
- 
-             # <install>/share/{st_package_name}/glue/* ->
-             #   <setup>/{st_package_name}/glue
--            copydir(
--                "{install_dir}/share/{st_package_name}/glue",
--                "{st_build_dir}/{st_package_name}/glue",
--                _vars=_vars)
-+            for glue in ['glue', 'doc']:
-+                source = "{install_dir}/share/{st_package_name}/" + glue
-+                target = "{st_build_dir}/{st_package_name}/" + glue
-+                copydir(source, target, _vars=_vars)
- 
-         if not is_android:
-             # <source>/pyside6/{st_package_name}/support/* ->
-Index: pyside-setup-everywhere-src-6.8.0/build_scripts/platforms/windows_desktop.py
-===================================================================
---- pyside-setup-everywhere-src-6.8.0.orig/build_scripts/platforms/windows_desktop.py
-+++ pyside-setup-everywhere-src-6.8.0/build_scripts/platforms/windows_desktop.py
-@@ -153,10 +153,9 @@ def prepare_packages_win32(pyside_build,
- 
-         # <install>/share/{st_package_name}/glue/* ->
-         #   <setup>/{st_package_name}/glue
--        copydir(
--            "{install_dir}/share/{st_package_name}/glue",
--            destination_dir / "glue",
--            _vars=_vars)
-+        for glue in ['glue', 'doc']:
-+            source = "{install_dir}/share/{st_package_name}/" + glue
-+            copydir(source, destination_dir / glue, _vars=_vars)
- 
-         # <source>/pyside6/{st_package_name}/support/* ->
-         #   <setup>/{st_package_name}/support/*
-Index: pyside-setup-everywhere-src-6.8.0/build_scripts/wheel_files.py
-===================================================================
---- pyside-setup-everywhere-src-6.8.0.orig/build_scripts/wheel_files.py
-+++ pyside-setup-everywhere-src-6.8.0/build_scripts/wheel_files.py
-@@ -59,6 +59,7 @@ class ModuleData:
-     typesystems: list[str] = field(default_factory=list)
-     include: list[str] = field(default_factory=list)
-     glue: list[str] = field(default_factory=list)
-+    doc_glue: list[str] = field(default_factory=list)
-     metatypes: list[str] = field(default_factory=list)
-     plugins: list[str] = field(default_factory=list)
- 
-@@ -87,6 +88,7 @@ class ModuleData:
-         self.typesystems.append(f"typesystem_{_lo}.xml")
-         self.include.append(f"Qt{self.name}/*.h")
-         self.glue.append(f"qt{_lo}.cpp")
-+        self.doc_glue.append(f"qt{_lo}.rst")
-         if not len(self.metatypes):
-             self.metatypes.append(f"qt6{_lo}_relwithdebinfo_metatypes.json")
- 
-@@ -122,6 +124,7 @@ class ModuleData:
-         self.typesystems = [f"typesystems/{i}" for i in self.typesystems]
-         self.include = [f"include/{i}" for i in self.include]
-         self.glue = [f"glue/{i}" for i in self.glue]
-+        self.doc_glue = [f"doc/{i}" for i in self.doc_glue]
- 
-     def macos_pyside_wrappers_lib(self, s):
-         if s.startswith("Qt"):
-Index: pyside-setup-everywhere-src-6.8.0/sources/pyside6/cmake/Macros/PySideModules.cmake
-===================================================================
---- pyside-setup-everywhere-src-6.8.0.orig/sources/pyside6/cmake/Macros/PySideModules.cmake
-+++ pyside-setup-everywhere-src-6.8.0/sources/pyside6/cmake/Macros/PySideModules.cmake
-@@ -176,6 +176,14 @@ macro(create_pyside_module)
-         set(${module_NAME}_glue_dependency ${${module_NAME}_glue})
-     endif()
- 
-+    # Install module doc files.
-+    set(${module_NAME}_doc "${CMAKE_CURRENT_SOURCE_DIR}/../doc/${lower_module_name}.rst")
-+    set(${module_name}_doc_dependency "")
-+    if(EXISTS ${${module_NAME}_doc})
-+        install(FILES ${${module_NAME}_doc} DESTINATION share/PySide6${pyside6_SUFFIX}/doc)
-+        set(${module_NAME}_doc_dependency ${${module_NAME}_doc})
-+    endif()
-+
-     # Install standalone glue files into typesystems subfolder, so that the resolved relative
-     # paths remain correct.
-     if (module_GLUE_SOURCES)
-@@ -245,6 +253,7 @@ macro(create_pyside_module)
-                         DEPENDS ${total_type_system_files}
-                                 ${module_GLUE_SOURCES}
-                                 ${${module_NAME}_glue_dependency}
-+                                ${${module_NAME}_doc_dependency}
-                         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                         COMMENT "Running generator for ${module_NAME}...")
- 

0001-signature-Fix-pointers-to-signature-bytes-with-the-h.patch

@@ -1,32 +0,0 @@
-From 7911d19e7cd8479c3b3098848ba1627e7de91f29 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Mon, 14 Oct 2024 13:09:41 +0200
-Subject: [PATCH] signature: Fix pointers to signature bytes with the highest
- bit set
-
-If a pointer to signature bytes has the highest bit set (e.g. 0xf6dd2840 on
-32bit), it is interpreted as negative Py_ssize_t value by Py_BuildValue.
-PyLong_AsSize_t cannot convert this into size_t and returns -1, resulting
-in an invalid pointer.
-
-To avoid this, use PyLong_AsSsize_t and intptr_t instead.
----
- sources/shiboken6/libshiboken/signature/signature.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sources/shiboken6/libshiboken/signature/signature.cpp b/sources/shiboken6/libshiboken/signature/signature.cpp
-index e69de193f13b..09d4120bf002 100644
---- a/sources/shiboken6/libshiboken/signature/signature.cpp
-+++ b/sources/shiboken6/libshiboken/signature/signature.cpp
-@@ -435,7 +435,7 @@ PyObject *PySide_BuildSignatureProps(PyObject *type_key)
-     if (PyTuple_Check(numkey)) {
-         PyObject *obAddress = PyTuple_GetItem(numkey, 0);
-         PyObject *obSize = PyTuple_GetItem(numkey, 1);
--        const size_t addr = PyLong_AsSize_t(obAddress);
-+        const intptr_t addr = PyLong_AsSsize_t(obAddress);
-         const Py_ssize_t size = PyLong_AsSsize_t(obSize);
-         const char **cstrings = bytesToStrings(reinterpret_cast<const uint8_t *>(addr), size);
-         if (cstrings == nullptr)
--- 
-2.47.0
-

pyside-setup-everywhere-src-6.7.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4c414be013d5051a2d10a9a1151e686488a3172c08a57461ea04b0a0ab74e09
-size 14591496

pyside-setup-everywhere-src-6.8.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a1a219a8f327e340d258275fad3a9f261b8f04bc57041747e73dd6ad252b4e1
-size 14646216

pyside-setup-everywhere-src-6.8.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c05ad3ae7e7279d6db9dc94a46eb0a05fd093537309f7439c38671bd7255190
-size 14641856

pyside-setup-everywhere-src-6.9.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:315b73bb7570d5b9e6793a8d3fafd1d2dd7f43d35eebb01d2b554ea206aad88e
-size 16652756