From c9d1044dc8b2502dbefed7db91d0e296e7834c666802ee56b43d33b37d2deddf Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 7 Dec 2019 08:54:36 +0000 Subject: [PATCH 1/4] 5.13.2 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=33 --- pyside-setup-everywhere-src-5.13.1.tar.xz | 3 --- pyside-setup-opensource-src-5.13.2.tar.xz | 3 +++ python3-pyside2.changes | 15 +++++++++++++++ python3-pyside2.spec | 6 +++--- 4 files changed, 21 insertions(+), 6 deletions(-) delete mode 100644 pyside-setup-everywhere-src-5.13.1.tar.xz create mode 100644 pyside-setup-opensource-src-5.13.2.tar.xz diff --git a/pyside-setup-everywhere-src-5.13.1.tar.xz b/pyside-setup-everywhere-src-5.13.1.tar.xz deleted file mode 100644 index 17cd59d..0000000 --- a/pyside-setup-everywhere-src-5.13.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c57c71ddece90b29d0934cf5fac1e1634719484637b56dcbe49eb277c1c01536 -size 2936204 diff --git a/pyside-setup-opensource-src-5.13.2.tar.xz b/pyside-setup-opensource-src-5.13.2.tar.xz new file mode 100644 index 0000000..46750ff --- /dev/null +++ b/pyside-setup-opensource-src-5.13.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e255d64df08880d0281ebe86009d5ea45f24332b308954d967c33995f75e543 +size 3123964 diff --git a/python3-pyside2.changes b/python3-pyside2.changes index f879344..0de3f2b 100644 --- a/python3-pyside2.changes +++ b/python3-pyside2.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Dec 7 08:51:07 UTC 2019 - Christophe Giboudeaux + +- Update to 5.13.2 + * [PYSIDE-785] Release ownership in QAbstractVideoFilterWrapper::createFilterRunnable + * [PYSIDE-820] Fix booleans and empty list cases in QSettings + * [PYSIDE-849] Add inject-code for QVideoFrame::bits() + * [PYSIDE-1007] Remove extra ref on QDataStream::setDevice + * [PYSIDE-1019] libpyside: Fix compiler warning + * [PYSIDE-1049] Split build instructions to build and packaging + * [PYSIDE-1051] Fix heaptype conflict with QtCore.QObject.__new__in Python 2.7 + * [PYSIDE-1089] Fix formatting of the deployment documentation + * [PYSIDE-1093] Fix bad shutdown effect on QApplication.instance() + * [PYSIDE-1095] shiboken: Fix handling of modified default expressions + ------------------------------------------------------------------- Sun Sep 8 13:59:35 UTC 2019 - Christophe Giboudeaux diff --git a/python3-pyside2.spec b/python3-pyside2.spec index 38c934d..c2b39a8 100644 --- a/python3-pyside2.spec +++ b/python3-pyside2.spec @@ -1,7 +1,7 @@ # # spec file for package python3-pyside2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,14 +22,14 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools Name: python3-pyside2 -Version: 5.13.1 +Version: 5.13.2 Release: 0 Summary: Python bindings for Qt # shiboken2 is licensed under GPL-3.0-with-Qt-Company-Qt-exception-1.1 License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-3.0-with-Qt-Company-Qt-exception-1.1 Group: Development/Languages/Python URL: http://wiki.qt.io/Qt_for_Python -Source0: https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-%{version}-src/pyside-setup-everywhere-src-%{version}.tar.xz +Source0: https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-%{version}-src/pyside-setup-opensource-src-%{version}.tar.xz Patch0: lib64.patch # PATCH-FIX-UPSTREAM - PYSIDE-881 Patch1: 0001-Remove-unnecessary-she-bang-from-icon-cache.py.patch From 73b93ac78cfef8f8fcdd52d9b207e7c1e890a234f1072fadd642d16f45a71594 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 7 Dec 2019 08:59:09 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=34 --- python3-pyside2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python3-pyside2.spec b/python3-pyside2.spec index c2b39a8..0ededff 100644 --- a/python3-pyside2.spec +++ b/python3-pyside2.spec @@ -114,7 +114,7 @@ Requires: %{name} = %{version} Examples and Tutorials for the PySide2 bindings for Qt. %prep -%setup -q -n pyside-setup-everywhere-src-%{version} +%setup -q -n pyside-setup-opensource-src-%{version} %if "%{_lib}" == "lib64" %patch0 -p1 %endif From c64e3321d1c21202c941ad9cfc9d0ed2d7ac58f5921707215399eef7c1fdf86a Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 19 Dec 2019 09:05:13 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=35 --- python3-pyside2.changes | 10 ++++++++++ python3-pyside2.spec | 13 ++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/python3-pyside2.changes b/python3-pyside2.changes index 0de3f2b..4bc1562 100644 --- a/python3-pyside2.changes +++ b/python3-pyside2.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Dec 19 08:54:08 UTC 2019 - Christophe Giboudeaux + +- Update the license tags. + +------------------------------------------------------------------- +Thu Dec 12 09:02:04 UTC 2019 - Christophe Giboudeaux + +- Update the minimum Qt version to 5.14 + ------------------------------------------------------------------- Sat Dec 7 08:51:07 UTC 2019 - Christophe Giboudeaux diff --git a/python3-pyside2.spec b/python3-pyside2.spec index 0ededff..6df47b4 100644 --- a/python3-pyside2.spec +++ b/python3-pyside2.spec @@ -25,8 +25,11 @@ Name: python3-pyside2 Version: 5.13.2 Release: 0 Summary: Python bindings for Qt -# shiboken2 is licensed under GPL-3.0-with-Qt-Company-Qt-exception-1.1 -License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-3.0-with-Qt-Company-Qt-exception-1.1 +# Legal: +# Most files are LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) +# pyside2-tools is GPL-2.0-only +# shiboken2 contains files under GPL-3.0-only WITH Qt-GPL-exception-1.0 +License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-2.0-only AND GPL-3.0-only WITH Qt-GPL-exception-1.0 Group: Development/Languages/Python URL: http://wiki.qt.io/Qt_for_Python Source0: https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-%{version}-src/pyside-setup-opensource-src-%{version}.tar.xz @@ -41,8 +44,8 @@ BuildRequires: libqt5-qtdeclarative-private-headers-devel ##### essential modules BuildRequires: cmake(Qt5Concurrent) -BuildConflicts: cmake(Qt5Core) >= 5.14 -BuildRequires: cmake(Qt5Core) >= 5.13 +BuildConflicts: cmake(Qt5Core) >= 5.15 +BuildRequires: cmake(Qt5Core) >= 5.14 BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Sql) @@ -96,7 +99,7 @@ application and UI framework. %package devel Summary: Header Files for PySide2 -License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-3.0-with-Qt-Company-Qt-exception-1.1 +License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-2.0-only AND GPL-3.0-only WITH Qt-GPL-exception-1.0 Group: Development/Languages/Python Requires: %{name} = %{version} From 500e84dc523e910d283072eaa803ccd4190936b74e99a3ab7a8774ed488e94af Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 30 Dec 2019 15:48:41 +0000 Subject: [PATCH 4/4] Accepting request 760053 from home:cgiboudeaux:branches:KDE:Qt5 Update to 5.14.0 OBS-URL: https://build.opensuse.org/request/show/760053 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=36 --- ...stall-or-use-uic-rcc-designer-copies.patch | 114 ++++++++++++++++++ ...ecessary-she-bang-from-icon-cache.py.patch | 21 ---- 0002-Fix-the-openSUSE-executable-names.patch | 52 ++++++++ pyside-setup-opensource-src-5.13.2.tar.xz | 3 - pyside-setup-opensource-src-5.14.0.tar.xz | 3 + python3-pyside2.changes | 48 ++++++++ python3-pyside2.spec | 14 +-- 7 files changed, 224 insertions(+), 31 deletions(-) create mode 100644 0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch delete mode 100644 0001-Remove-unnecessary-she-bang-from-icon-cache.py.patch create mode 100644 0002-Fix-the-openSUSE-executable-names.patch delete mode 100644 pyside-setup-opensource-src-5.13.2.tar.xz create mode 100644 pyside-setup-opensource-src-5.14.0.tar.xz diff --git a/0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch b/0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch new file mode 100644 index 0000000..fa8c9a3 --- /dev/null +++ b/0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch @@ -0,0 +1,114 @@ +From 69d6c32805c57e9b1c2428567ee968bff33781be Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Mon, 30 Dec 2019 11:24:23 +0100 +Subject: [PATCH 1/2] Don't try to install or use uic/rcc/designer copies. + +These executables are installed by qtbase and qttools. Making copies +is not needed. + +pyside2-tools wrongly assumed the executables were in /usr/bin on Linux. +--- + build_scripts/platforms/unix.py | 17 +--------- + sources/pyside2-tools/CMakeLists.txt | 48 ---------------------------- + 2 files changed, 1 insertion(+), 64 deletions(-) + +diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py +index abca942..f5b2760 100644 +--- a/build_scripts/platforms/unix.py ++++ b/build_scripts/platforms/unix.py +@@ -134,24 +134,9 @@ def prepare_packages_posix(self, vars): + "{st_build_dir}/{st_package_name}", + filter=[ + "pyside2-lupdate", +- "uic", +- "rcc", + ], + recursive=False, vars=vars)) + +- # Copying designer +- if sys.platform == "darwin": +- executables.extend(copydir( +- "{install_dir}/bin/Designer.app", +- "{st_build_dir}/{st_package_name}/Designer.app", +- filter=None, +- recursive=True, vars=vars)) +- else: +- copyfile( +- "{install_dir}/bin/designer", +- "{st_build_dir}/{st_package_name}/designer", +- force=False, vars=vars) +- + # /lib/lib* -> {st_package_name}/ + copydir( + "{install_dir}/lib/", +@@ -204,7 +189,7 @@ def prepare_packages_posix(self, vars): + # compatibility + if sys.version_info[0] == 3: + examples_path = "{st_build_dir}/{st_package_name}/examples".format(**vars) +- pyside_rcc_path = "{install_dir}/bin/rcc".format(**vars) ++ pyside_rcc_path = "/usr/bin/rcc" + pyside_rcc_options = ['-g', 'python'] + regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) + +diff --git a/sources/pyside2-tools/CMakeLists.txt b/sources/pyside2-tools/CMakeLists.txt +index ce65750..ed7fb09 100644 +--- a/sources/pyside2-tools/CMakeLists.txt ++++ b/sources/pyside2-tools/CMakeLists.txt +@@ -39,54 +39,6 @@ if (NOT PYTHON_SITE_PACKAGES) + endif() + endif() + +-# Handling .exe extension for Window and the uic/rcc executables +-if (WIN32) +- set(EXE_EXT ".exe") +-else() +- set(EXE_EXT "") +-endif() +- +-set(TOOLS_PATH "${_qt5Core_install_prefix}/bin") +-set(UIC_PATH "${TOOLS_PATH}/uic${EXE_EXT}") +-set(RCC_PATH "${TOOLS_PATH}/rcc${EXE_EXT}") +-if (APPLE) +- set(DESIGNER_PATH "${TOOLS_PATH}/Designer.app") +-else() +- set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}") +-endif() +- +-install(FILES "${UIC_PATH}" +- DESTINATION bin +- PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ +- WORLD_EXECUTE WORLD_READ) +- +-install(FILES "${RCC_PATH}" +- DESTINATION bin +- PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ +- WORLD_EXECUTE WORLD_READ) +- +-if (EXISTS ${DESIGNER_PATH}) +- if (APPLE) +- install(DIRECTORY "${DESIGNER_PATH}" +- DESTINATION bin +- FILE_PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ +- WORLD_EXECUTE WORLD_READ) +- else() +- install(FILES "${DESIGNER_PATH}" +- DESTINATION bin +- PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ +- WORLD_EXECUTE WORLD_READ) +- endif() +-endif() +- + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY) +-- +2.24.1 + diff --git a/0001-Remove-unnecessary-she-bang-from-icon-cache.py.patch b/0001-Remove-unnecessary-she-bang-from-icon-cache.py.patch deleted file mode 100644 index 624756e..0000000 --- a/0001-Remove-unnecessary-she-bang-from-icon-cache.py.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 08afc74f3c040569bf7e41483358bec968de7d06 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -Date: Fri, 21 Dec 2018 16:20:45 +0100 -Subject: [PATCH] Remove unnecessary she-bang from icon-cache.py - ---- - sources/pyside2-tools/pyside2uic/icon_cache.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/sources/pyside2-tools/pyside2uic/icon_cache.py b/sources/pyside2-tools/pyside2uic/icon_cache.py -index 523d207..9d0dfe2 100644 ---- a/sources/pyside2-tools/pyside2uic/icon_cache.py -+++ b/sources/pyside2-tools/pyside2uic/icon_cache.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # This file is part of the PySide project. - # - # Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). --- -2.19.2 - diff --git a/0002-Fix-the-openSUSE-executable-names.patch b/0002-Fix-the-openSUSE-executable-names.patch new file mode 100644 index 0000000..2552e48 --- /dev/null +++ b/0002-Fix-the-openSUSE-executable-names.patch @@ -0,0 +1,52 @@ +From 81ad0e88644af358c30ea036c26b6f2afc457b98 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Mon, 30 Dec 2019 12:16:25 +0100 +Subject: [PATCH 2/2] Fix the openSUSE executable names. + +--- + build_scripts/platforms/unix.py | 2 +- + sources/pyside2-tools/pyside_tool.py | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py +index f5b2760..a0109c6 100644 +--- a/build_scripts/platforms/unix.py ++++ b/build_scripts/platforms/unix.py +@@ -189,7 +189,7 @@ def prepare_packages_posix(self, vars): + # compatibility + if sys.version_info[0] == 3: + examples_path = "{st_build_dir}/{st_package_name}/examples".format(**vars) +- pyside_rcc_path = "/usr/bin/rcc" ++ pyside_rcc_path = "/usr/bin/rcc-qt5" + pyside_rcc_options = ['-g', 'python'] + regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) + +diff --git a/sources/pyside2-tools/pyside_tool.py b/sources/pyside2-tools/pyside_tool.py +index da2d741..be32e2f 100755 +--- a/sources/pyside2-tools/pyside_tool.py ++++ b/sources/pyside2-tools/pyside_tool.py +@@ -71,18 +71,18 @@ def qt_tool_wrapper(qt_tool, args): + + + def uic(): +- qt_tool_wrapper("uic", ['-g', 'python'] + sys.argv[1:]) ++ qt_tool_wrapper("uic-qt5", ['-g', 'python'] + sys.argv[1:]) + + + def rcc(): +- qt_tool_wrapper("rcc", ['-g', 'python'] + sys.argv[1:]) ++ qt_tool_wrapper("rcc-qt5", ['-g', 'python'] + sys.argv[1:]) + + + def designer(): + if sys.platform == "darwin": + qt_tool_wrapper("Designer.app/Contents/MacOS/Designer", sys.argv[1:]) + else: +- qt_tool_wrapper("designer", sys.argv[1:]) ++ qt_tool_wrapper("designer-qt5", sys.argv[1:]) + + + if __name__ == "__main__": +-- +2.24.1 + diff --git a/pyside-setup-opensource-src-5.13.2.tar.xz b/pyside-setup-opensource-src-5.13.2.tar.xz deleted file mode 100644 index 46750ff..0000000 --- a/pyside-setup-opensource-src-5.13.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e255d64df08880d0281ebe86009d5ea45f24332b308954d967c33995f75e543 -size 3123964 diff --git a/pyside-setup-opensource-src-5.14.0.tar.xz b/pyside-setup-opensource-src-5.14.0.tar.xz new file mode 100644 index 0000000..809fe11 --- /dev/null +++ b/pyside-setup-opensource-src-5.14.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c2ad1901a99165ed7bac8f522ee351ae3ebadd580024248f5a1db52e4a94b30 +size 3203908 diff --git a/python3-pyside2.changes b/python3-pyside2.changes index 4bc1562..face6b2 100644 --- a/python3-pyside2.changes +++ b/python3-pyside2.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Mon Dec 30 09:12:02 UTC 2019 - Christophe Giboudeaux + +- Update to 5.14.0: + * + * [PYSIDE-990] It is no longer possible to nest types in typesystem files by + by qualifying the namespace components with "::". The elements need to be + properly nested. + * [PYSIDE-487] Add bindings for Qt 5.14 + * [PYSIDE-785] Release ownership in QAbstractVideoFilterWrapper::createFilterRunnable + * [PYSIDE-795] Create a framework for deprecated functions + * [PYSIDE-795] Make the function registry more usable in Python modules + * [PYSIDE-795] Improve the NumPy Support by iterables + * [PYSIDE-820] Fix booleans and empty list cases in QSettings + * [PYSIDE-849] Add inject-code for QVideoFrame::bits() + * [PYSIDE-939] Add support for Python 3.8 + * [PYSIDE-939] Fix refcount issues with QSettings glue code + * [PYSIDE-939] Finalize the Python 3.8 refcount fix + * [PYSIDE-951] Support Pointer Primitive Types by Arrays or Result Tuples + * [PYSIDE-1007] Remove extra ref on QDataStream::setDevice + * [PYSIDE-1033] CMake modularization: macros creation + * [PYSIDE-1041] Enable multimedia classes after API fixup + * [PYSIDE-1047] QtWinExtras: Add QtWin namespace + * [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-1067] New documentation structure + * [PYSIDE-1068] Add designer to the pyside tools + * [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-1089] Fix formatting of the deployment documentation + * [PYSIDE-1093] Fix bad shutdown effect on QApplication.instance() + * [PYSIDE-1098] Replace pyside2-uic/pyside2-rcc by uic/rcc which now have an + option to generate Python + * [PYSIDE-1101] Remove QGraphicsItem::scroll from QtChart + * [PYSIDE-1140] Add python_requires to the python setup + * [QTBUG-66304] Blacklist failing QtPositioning test + * [PYSIDE-454] Fix crash when smartptr template class cannot be found + * [PYSIDE-1037] Allow for "auto" as target of type for CONVERTTOCPP in injected code + * [PYSIDE-1095] Fix handling of modified default expressions +- Drop 0001-Remove-unnecessary-she-bang-from-icon-cache.py.patch. pyside2uic is gone +- Add patches: + * 0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch to prevent file conflicts + * 0002-Fix-the-openSUSE-executable-names.patch to use the -qt5 suffix + ------------------------------------------------------------------- Thu Dec 19 08:54:08 UTC 2019 - Christophe Giboudeaux diff --git a/python3-pyside2.spec b/python3-pyside2.spec index 6df47b4..544b3b9 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.2 +Version: 5.14.0 Release: 0 Summary: Python bindings for Qt # Legal: @@ -34,8 +34,10 @@ Group: Development/Languages/Python URL: http://wiki.qt.io/Qt_for_Python Source0: https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-%{version}-src/pyside-setup-opensource-src-%{version}.tar.xz Patch0: lib64.patch -# PATCH-FIX-UPSTREAM - PYSIDE-881 -Patch1: 0001-Remove-unnecessary-she-bang-from-icon-cache.py.patch +# PATCH-FIX-UPSTREAM +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 BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -118,10 +120,11 @@ Examples and Tutorials for the PySide2 bindings for Qt. %prep %setup -q -n pyside-setup-opensource-src-%{version} +%patch1 -p1 +%patch2 -p1 %if "%{_lib}" == "lib64" %patch0 -p1 %endif -%patch1 -p1 %build export LLVM_INSTALL_DIR=%{_prefix} @@ -164,10 +167,7 @@ sed -i 's,"[^"]*/share/PySide2/typesystems","%{_datadir}/PySide2/typesystems",' sed -i 's,"[^"]*/share/PySide2/glue","%{_datadir}/PySide2/glue",' %{buildroot}/%{_libdir}/cmake/PySide2*/*.cmake sed -i 's,^include("[^"]*-release/%{_lib}/,include("%{_libdir}/,' %{buildroot}/%{_libdir}/cmake/PySide2*/*.cmake -sed -i 's,env python,python,' %{buildroot}/%{_bindir}/pyside2-uic - rm %{buildroot}%{_bindir}/*_tool.py -rm -Rf %{buildroot}%{python_sitearch}/pyside2uic/port_v2/ rm -Rf %{buildroot}%{_datadir}/PySide2/typesystems/typesystem_*_win.xml %fdupes %{buildroot}%{_datadir}/PySide2/examples/