Accepting request 834778 from KDE:Qt5

OBS-URL: https://build.opensuse.org/request/show/834778
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python3-pyside2?expand=0&rev=12

0001-cmake-Don-t-assume-qhelpgenerator-is-in-PATH.patch

@@ -0,0 +1,58 @@
+From cb7de1027430cdf0ecbe4e75134239a8987199a2 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Tue, 15 Sep 2020 08:44:52 +0200
+Subject: [PATCH] [cmake] Don't assume qhelpgenerator is in PATH
+
+There is no guarantee the qhelpgenerator executable is in PATH.
+The build system will use the the Qt5::qhelpgenerator target
+to get the exact location.
+---
+ sources/pyside2/doc/CMakeLists.txt   | 6 +++++-
+ sources/shiboken2/doc/CMakeLists.txt | 8 ++++++--
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt
+index ffbb3c1..e578aad 100644
+--- a/sources/pyside2/doc/CMakeLists.txt
++++ b/sources/pyside2/doc/CMakeLists.txt
+@@ -132,10 +132,14 @@ if(DOC_OUTPUT_FORMAT STREQUAL "html")
+             COMMENT "Copying Shiboken docs..."
+             VERBATIM)
+ else()
++    # Use the Qt5::helpgenerator variable to get the executable location
++    find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Help)
++    get_target_property(QHELPGENERATOR_EXECUTABLE Qt5::qhelpgenerator IMPORTED_LOCATION)
++
+     file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/html/PySide.qhp QHP_FILE)
+     add_custom_command(TARGET apidoc POST_BUILD
+             COMMAND ${PYTHON_EXECUTABLE} py_script.py
+-            COMMAND qhelpgenerator ${QHP_FILE}
++            COMMAND ${QHELPGENERATOR_EXECUTABLE} ${QHP_FILE}
+             COMMENT "Generating QCH from a QHP file..."
+             VERBATIM)
+ endif()
+diff --git a/sources/shiboken2/doc/CMakeLists.txt b/sources/shiboken2/doc/CMakeLists.txt
+index 9fee962..dee13f3 100644
+--- a/sources/shiboken2/doc/CMakeLists.txt
++++ b/sources/shiboken2/doc/CMakeLists.txt
+@@ -33,11 +33,15 @@ except:
+ 
+     # create a custom command to generate QCH
+     if(DOC_OUTPUT_FORMAT STREQUAL "qthelp")
++        # Use the Qt5::helpgenerator variable to get the executable location
++        find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Help)
++        get_target_property(QHELPGENERATOR_EXECUTABLE Qt5::qhelpgenerator IMPORTED_LOCATION)
++
+         file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/html/Shiboken.qhp QHP_FILE)
+         add_custom_command(TARGET doc POST_BUILD
+             COMMAND ${PYTHON_EXECUTABLE} py_script.py # ${CMAKE_CURRENT_BINARY_DIR}/html/Shiboken.qhp
+-            COMMAND qhelpgenerator ${QHP_FILE}
+-            COMMENT "Genereting QCH based on the QHP..."
++            COMMAND ${QHELPGENERATOR_EXECUTABLE} ${QHP_FILE}
++            COMMENT "Generating QCH based on the QHP..."
+             VERBATIM)
+     endif()
+ else()
+-- 
+2.28.0
+

pyside-setup-opensource-src-5.15.0.tar.xz

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

pyside-setup-opensource-src-5.15.1.tar.xz

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

python3-pyside2.changes

@@ -1,3 +1,51 @@
+-------------------------------------------------------------------
+Tue Sep 15 06:23:38 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 5.15.1
+  * [PYSIDE-74] Implement default __ne__ and __eq__ for all PySide types
+  * [PYSIDE-198] Add compatibility with Nuitka
+  * [PYSIDE-829] signature: Avoid non-existent attributes in compiled code (Nuitka)
+  * [PYSIDE-841] doc: Add widget styling tutorial
+  * [PYSIDE-841] add quick painteditem example
+  * [PYSIDE-904] Add QObject.findChildren(QRegularExpression)
+  * [PYSIDE-904] qp5_tool.py: Add an configuration key for the CMake generator
+  * [PYSIDE-904] Port some examples from QRegExp to QRegularExpression
+  * [PYSIDE-904] Fix libsample/photon test for Qt 6 / Windows
+  * [PYSIDE-904] Enable adding  operators ==, != as functions without code injection
+  * [PYSIDE-957] Implement the QEnum/QFlag decorator, V2
+  * [PYSIDE-981] Return QVariantList when using list as Signal argument
+  * [PYSIDE-1019] feature-select: Implement a selectable feature framework
+  * [PYSIDE-1019] feature-select: allow snake_case instead of camelCase for methods
+  * [PYSIDE-1019] feature-select: delay the feature switching
+  * [PYSIDE-1223] Use pyside2-uic instead of uic for the loadUiType
+  * [PYSIDE-1257] Potential fix for deploying with cx_freeze using zip_include_packages
+  * [PYSIDE-1282] pthreads: Try to abandon the GIL in case a thread was terminated
+  * [PYSIDE-1292] Doc: Enable doc builds using the offline template
+  * [PYSIDE-1313] basewrapper.cpp: add PyErr_Fetch/Restore in SbkDeallocWrapperCommon()
+  * [PYSIDE-1317] Add QSocketDescriptor class
+  * [PYSIDE-1321] Fix leaking reference in PySide2 property getter
+  * [PYSIDE-1321] Fix some leaks in enumeration creation
+  * [PYSIDE-1323] Add missing Win runtime dll into win wheels
+  * [PYSIDE-1323] Update vcredist binaries for MSVC 2019
+  * [PYSIDE-1332] Fix crashes in QThread::wait(), QWaitCondition::wait()
+  * [PYSIDE-1349] QQmlComponent: allow thread in constructors
+  * [PYSIDE-1353] doc: fix Property indentation
+  * [PYSIDE-1355] Add Qt3DExtras.QNormalDiffuseMapAlphaMaterial
+  * [PYSIDE-1368] __feature__: ignore if `__name__` does not exist in a module
+  * [PYSIDE-1372] QDomElement: remove unnecesary setAttribute overloads
+  * [PYSIDE-1374] Add the QWidget *-based overloads of the QtWinExtras functions
+  * shiboken now accepts multiple headers on the command line.
+  * A number of error and warning messages have been prefixed by file name
+    and line for better tooling.
+  * [PYSIDE-841] Add custom widget shiboken example
+  * [PYSIDE-904] shiboken2: Handle virtual methods returning a reference
+  * [PYSIDE-1019] shiboken2: Re-add support for parsing Q_PROPERTY
+  * [PYSIDE-1177] shiboken: Fix __doc__ setter for derived types
+  * [PYSIDE-1325] shiboken: Fix default-initialized function arguments
+  * [PYSIDE-1327] shiboken: Resolve typedef'ed base classes
+- Add patch to fix doc generation:
+  * 0001-cmake-Don-t-assume-qhelpgenerator-is-in-PATH.patch
+
 -------------------------------------------------------------------
 Wed May 27 12:03:15 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
 

python3-pyside2.spec

@@ -22,7 +22,7 @@
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 Name:           python3-pyside2
-Version:        5.15.0
+Version:        5.15.1
 Release:        0
 Summary:        Python bindings for Qt
 # Legal:
@@ -39,6 +39,8 @@ Patch0:         lib64.patch
 Patch1:         0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch
 # PATCH-FIX-OPENSUSE
 Patch2:         0002-Fix-the-openSUSE-executable-names.patch
+# PATCH-FIX-UPSTREAM
+Patch3:         0001-cmake-Don-t-assume-qhelpgenerator-is-in-PATH.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -124,6 +126,7 @@ Examples and Tutorials for the PySide2 bindings for Qt.
 %setup -q -n pyside-setup-opensource-src-%{version}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %if "%{_lib}" == "lib64"
 %patch0 -p1
 %endif