From 31709c900c252f992c9aed24ce0f25f7fe07a270cc869fd1f454380ef3f02406 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 8 Sep 2019 19:31:52 +0000 Subject: [PATCH] Accepting request 729243 from home:cgiboudeaux:branches:KDE:Qt5 Update to 5.13.1 OBS-URL: https://build.opensuse.org/request/show/729243 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=31 --- ...-Fix-qApp-import-of-QCoreApplication.patch | 42 ----------------- ...emove-duplicated-type-entry-for-bool.patch | 28 ----------- lib64.patch | 46 +++++++++---------- pyside-setup-everywhere-src-5.13.0.tar.xz | 3 -- pyside-setup-everywhere-src-5.13.1.tar.xz | 3 ++ pyside-setup.obsinfo | 5 -- python3-pyside2.changes | 28 +++++++++++ python3-pyside2.spec | 6 +-- 8 files changed, 54 insertions(+), 107 deletions(-) delete mode 100644 0002-Fix-qApp-import-of-QCoreApplication.patch delete mode 100644 0003-PySide2-QtCore-Remove-duplicated-type-entry-for-bool.patch delete mode 100644 pyside-setup-everywhere-src-5.13.0.tar.xz create mode 100644 pyside-setup-everywhere-src-5.13.1.tar.xz delete mode 100644 pyside-setup.obsinfo diff --git a/0002-Fix-qApp-import-of-QCoreApplication.patch b/0002-Fix-qApp-import-of-QCoreApplication.patch deleted file mode 100644 index 95a35fe..0000000 --- a/0002-Fix-qApp-import-of-QCoreApplication.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5376a134f13124b9b228dd160f151a7c8eccd09a Mon Sep 17 00:00:00 2001 -From: Christian Tismer -Date: Thu, 27 Jun 2019 12:37:41 +0200 -Subject: [PATCH 1/7] Fix qApp import of QCoreApplication - -The qApp fix for embedding has a recursion bug when -QCoreApplication is imported. -This patch avoids imports altogether and uses the already -captured module, instead. - -Change-Id: I1af7293a31840f6b09f8611446f6f35952dedd21 -Reviewed-by: Milian Wolff ---- - sources/shiboken2/libshiboken/qapp_macro.cpp | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/sources/shiboken2/libshiboken/qapp_macro.cpp b/sources/shiboken2/libshiboken/qapp_macro.cpp -index df24a805..12af9613 100644 ---- a/sources/shiboken2/libshiboken/qapp_macro.cpp -+++ b/sources/shiboken2/libshiboken/qapp_macro.cpp -@@ -240,11 +240,13 @@ NotifyModuleForQApp(PyObject *module, void *qApp) - * Therefore, the implementation is very simple and just redirects the - * qApp_contents variable and assigns the instance, instead of vice-versa. - */ -- if (qApp != nullptr) { -- Shiboken::AutoDecRef pycore(PyImport_ImportModule("PySide2.QtCore")); -- Shiboken::AutoDecRef coreapp(PyObject_GetAttrString(pycore, "QCoreApplication")); -- qApp_content = PyObject_CallMethod(coreapp, "instance", ""); -- reset_qApp_var(); -+ PyObject *coreDict = qApp_moduledicts[1]; -+ if (qApp != nullptr && coreDict != nullptr) { -+ PyObject *coreApp = PyDict_GetItemString(coreDict, "QCoreApplication"); -+ if (coreApp != nullptr) { -+ qApp_content = PyObject_CallMethod(coreApp, "instance", ""); -+ reset_qApp_var(); -+ } - } - } - --- -2.22.0 - diff --git a/0003-PySide2-QtCore-Remove-duplicated-type-entry-for-bool.patch b/0003-PySide2-QtCore-Remove-duplicated-type-entry-for-bool.patch deleted file mode 100644 index f6fc30b..0000000 --- a/0003-PySide2-QtCore-Remove-duplicated-type-entry-for-bool.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8fa674375a3ea5609ffe8dadeb697915347a4072 Mon Sep 17 00:00:00 2001 -From: Friedemann Kleint -Date: Thu, 4 Jul 2019 15:57:00 +0200 -Subject: [PATCH 6/7] PySide2/QtCore: Remove duplicated type entry for "bool" - -Another entry with converters exists a few lines below. - -Change-Id: Id1de3835e42869a55e0bf865aa992f38748f2e88 -Reviewed-by: Christian Tismer ---- - sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml -index 4f800cc9..2173e747 100644 ---- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml -+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml -@@ -171,7 +171,6 @@ - - - -- - - - --- -2.22.0 - diff --git a/lib64.patch b/lib64.patch index 1ec8eae..646a6ce 100644 --- a/lib64.patch +++ b/lib64.patch @@ -5,12 +5,6 @@ Subject: [PATCH] Lookup clang library and install in arch specific library path --- - build_scripts/platforms/unix.py | 4 ++-- - sources/pyside2/CMakeLists.txt | 2 +- - .../shiboken2/ApiExtractor/clangparser/compilersupport.cpp | 2 +- - sources/shiboken2/CMakeLists.txt | 4 ++-- - 4 files changed, 6 insertions(+), 6 deletions(-) - diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 83de489..f6498c6 100644 --- a/build_scripts/platforms/unix.py @@ -33,12 +27,11 @@ index 83de489..f6498c6 100644 "{st_build_dir}/{st_package_name}", filter=[ adjusted_lib_name("libpyside*", - diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt -index 1e6f017..fdfb631 100644 +index 1603859..f8b1bf5 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt -@@ -94,7 +94,7 @@ endif() +@@ -96,7 +96,7 @@ endif() option(BUILD_TESTS "Build tests." TRUE) option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to generated files. This is used to allow multiples versions installed simultaneous." FALSE) @@ -48,7 +41,7 @@ index 1e6f017..fdfb631 100644 if(CMAKE_HOST_APPLE) set(ALTERNATIVE_QT_INCLUDE_DIR "" CACHE PATH "Deprecated. CMake now finds the proper include dir itself.") diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp -index d3d5c8d..acb1efd 100644 +index f301733..a421153 100644 --- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp +++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp @@ -243,7 +243,7 @@ static QString findClangLibDir() @@ -61,24 +54,29 @@ index d3d5c8d..acb1efd 100644 return path; } diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt -index 1e52c42..4cac3ae 100644 +index c1349ca..bdbc93d 100644 --- a/sources/shiboken2/CMakeLists.txt +++ b/sources/shiboken2/CMakeLists.txt -@@ -122,7 +122,8 @@ if(MSVC) - set(CLANG_LIB_NAMES libclang) - endif() - --find_library(CLANG_LIBRARY NAMES ${CLANG_LIB_NAMES} HINTS ${CLANG_DIR}/lib) -+set(LIB_SUFFIX "64" CACHE STRING "Define suffix of directory name (32/64)" ) -+find_library(CLANG_LIBRARY NAMES ${CLANG_LIB_NAMES} HINTS ${CLANG_DIR}/lib${LIB_SUFFIX}) - if (NOT EXISTS ${CLANG_LIBRARY}) - string(REPLACE ";" ", " CLANG_LIB_NAMES_STRING "${CLANG_LIB_NAMES}") - message(FATAL_ERROR "Unable to find the Clang library in ${CLANG_DIR}.\ -@@ -309,7 +310,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T +@@ -115,7 +115,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) - set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE) - set(BIN_INSTALL_DIR "bin" CACHE PATH "The subdirectory relative to the install prefix where dlls will be installed (default is /bin)" FORCE) ++set(LIB_SUFFIX "64" CACHE STRING "Define suffix of directory name (32/64)" ) + set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install \ + prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE) + set(BIN_INSTALL_DIR "bin" CACHE PATH "The subdirectory relative to the install prefix where \ +diff --git a/sources/shiboken2/data/shiboken_helpers.cmake b/sources/shiboken2/data/shiboken_helpers.cmake +index 8111fa6..d9f8c1e 100644 +--- a/sources/shiboken2/data/shiboken_helpers.cmake ++++ b/sources/shiboken2/data/shiboken_helpers.cmake +@@ -174,7 +174,8 @@ macro(setup_clang) + set(CLANG_LIB_NAMES libclang) + endif() +- find_library(CLANG_LIBRARY NAMES ${CLANG_LIB_NAMES} HINTS ${CLANG_DIR}/lib) ++ set(LIB_SUFFIX "64" CACHE STRING "Define suffix of directory name (32/64)") ++ find_library(CLANG_LIBRARY NAMES ${CLANG_LIB_NAMES} HINTS ${CLANG_DIR}/lib${LIB_SUFFIX}) + if (NOT EXISTS ${CLANG_LIBRARY}) + string(REPLACE ";" ", " CLANG_LIB_NAMES_STRING "${CLANG_LIB_NAMES}") + message(FATAL_ERROR "Unable to find the Clang library in ${CLANG_DIR}.\ diff --git a/pyside-setup-everywhere-src-5.13.0.tar.xz b/pyside-setup-everywhere-src-5.13.0.tar.xz deleted file mode 100644 index edfe419..0000000 --- a/pyside-setup-everywhere-src-5.13.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e47e778a6c8ee86e9bc7dbf56371cf607e9f3c1a03a7d6df9e34f8dba555782 -size 2979204 diff --git a/pyside-setup-everywhere-src-5.13.1.tar.xz b/pyside-setup-everywhere-src-5.13.1.tar.xz new file mode 100644 index 0000000..17cd59d --- /dev/null +++ b/pyside-setup-everywhere-src-5.13.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c57c71ddece90b29d0934cf5fac1e1634719484637b56dcbe49eb277c1c01536 +size 2936204 diff --git a/pyside-setup.obsinfo b/pyside-setup.obsinfo deleted file mode 100644 index 866adcb..0000000 --- a/pyside-setup.obsinfo +++ /dev/null @@ -1,5 +0,0 @@ -name: pyside-setup -version: 5.12.0 -mtime: 1545031727 -commit: 0997b2055007da282cd52087632a28645e3007d1 - diff --git a/python3-pyside2.changes b/python3-pyside2.changes index e6edf9f..f879344 100644 --- a/python3-pyside2.changes +++ b/python3-pyside2.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Sun Sep 8 13:59:35 UTC 2019 - Christophe Giboudeaux + +- Update to 5.13.1 + * [Fixes https://github.com/spyder-ide/qtpy/issues/195] Fix RuntimeError: dictionary changed size during iteration + * [PYSIDE-634] Add support for parameterNames in Signals + * [PYSIDE-951] Cleanup signature module before substantial change + * [PYSIDE-951] correct QtPrintSupport dependency + * [PYSIDE-1010] Add optional support for types in QSettings::value + * [PYSIDE-1020] Fix pyside2-uic to generate correct code for QWebview and QQuickWidget + * [PYSIDE-1028] Leave QVariantMap as a name, not a type + * [PYSIDE-1033] CMake modularization: macros creation + * [PYSIDE-1035] Fix pyside2-uic to generate correct code for QTableWidget + * [PYSIDE-1051] Fix heaptype conflict with QtCore.QObject.__new__in Python 2.7 + * [PYSIDE-1052] Add QtCore.Slot.__signature__ and much more manually + * [PYSIDE-1059] Documentation: update QInputDialog snippets + * [PYSIDE-1066] Fix Xcode sdk value embedded into PySide2 binaries + * [PYSIDE-1067] Update docs style + * [PYSIDE-1073] Fix a typing bug in Python 2.7 and update + * [PYSIDE-1077] Fix wrong Python init return codes + * [PYSIDE-1079] signature: Support typing.Optional[T] and refine a bit + * [PYSIDE-1024] shiboken: Generate code for smart pointers only within declaring package + * [PYSIDE-1037] shiboken: Allow for "auto" as target of type for CONVERTTOCPP in injected code +- Drop patches, now upstream: + * 0002-Fix-qApp-import-of-QCoreApplication.patch + * 0003-PySide2-QtCore-Remove-duplicated-type-entry-for-bool.patch +- Refresh lib64.patch + ------------------------------------------------------------------- Wed Jul 10 06:37:12 UTC 2019 - Tuukka Pasanen diff --git a/python3-pyside2.spec b/python3-pyside2.spec index 5b57ed9..38c934d 100644 --- a/python3-pyside2.spec +++ b/python3-pyside2.spec @@ -22,7 +22,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools Name: python3-pyside2 -Version: 5.13.0 +Version: 5.13.1 Release: 0 Summary: Python bindings for Qt # shiboken2 is licensed under GPL-3.0-with-Qt-Company-Qt-exception-1.1 @@ -33,8 +33,6 @@ Source0: https://download.qt.io/official_releases/QtForPython/pyside2/PyS Patch0: lib64.patch # PATCH-FIX-UPSTREAM - PYSIDE-881 Patch1: 0001-Remove-unnecessary-she-bang-from-icon-cache.py.patch -Patch2: 0002-Fix-qApp-import-of-QCoreApplication.patch -Patch3: 0003-PySide2-QtCore-Remove-duplicated-type-entry-for-bool.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -121,8 +119,6 @@ Examples and Tutorials for the PySide2 bindings for Qt. %patch0 -p1 %endif %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build export LLVM_INSTALL_DIR=%{_prefix}