From 70f150ceadc92b034f09215f1a1b313ba09a8526eb0ae31d712c87436ecbebbd Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 21 Jun 2022 09:05:42 +0000 Subject: [PATCH 1/5] Update to 6.3.1 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=11 --- ...ork-around-build-issue-in-pyside-6.3.patch | 41 ------------------- pyside-setup-opensource-src-6.3.0.tar.xz | 3 -- pyside-setup-opensource-src-6.3.1.tar.xz | 3 ++ python3-pyside6.changes | 8 ++++ python3-pyside6.spec | 8 ++-- 5 files changed, 14 insertions(+), 49 deletions(-) delete mode 100644 0001-Work-around-build-issue-in-pyside-6.3.patch delete mode 100644 pyside-setup-opensource-src-6.3.0.tar.xz create mode 100644 pyside-setup-opensource-src-6.3.1.tar.xz diff --git a/0001-Work-around-build-issue-in-pyside-6.3.patch b/0001-Work-around-build-issue-in-pyside-6.3.patch deleted file mode 100644 index f956f70..0000000 --- a/0001-Work-around-build-issue-in-pyside-6.3.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c9a2328c8264b8cc9cc2dcf31d49bd8923c05bf7 Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux -Date: Sun, 17 Apr 2022 15:16:18 +0200 -Subject: [PATCH] Work around build issue in pyside 6.3 - -Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1890 - -Change-Id: I084b5d96b71b3b8468008cd415b3102d3a7918d7 ---- - sources/pyside6/PySide6/CMakeLists.txt | 1 + - sources/pyside6/PySide6/__init__.py.in | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/sources/pyside6/PySide6/CMakeLists.txt b/sources/pyside6/PySide6/CMakeLists.txt -index 95693ff67..8c53341b3 100644 ---- a/sources/pyside6/PySide6/CMakeLists.txt -+++ b/sources/pyside6/PySide6/CMakeLists.txt -@@ -4,6 +4,7 @@ project(pyside6) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/global.h.in" - "${CMAKE_CURRENT_BINARY_DIR}/pyside6_global.h" @ONLY) - -+get_filename_component(_build_dir_name ${CMAKE_BINARY_DIR} NAME) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in" - "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" @ONLY) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/_config.py.in" -diff --git a/sources/pyside6/PySide6/__init__.py.in b/sources/pyside6/PySide6/__init__.py.in -index d8439985d..ba748a91f 100644 ---- a/sources/pyside6/PySide6/__init__.py.in -+++ b/sources/pyside6/PySide6/__init__.py.in -@@ -123,7 +123,7 @@ def _find_all_qt_modules(): - location = Path(__file__).resolve().parent - - # Note: We should _not_ call this function while still building, but use the existing value! -- in_build = location.parents[1].name == "build" -+ in_build = location.parents[1].name == "@_build_dir_name@" - if in_build: - return __all__ - --- -2.35.1 - diff --git a/pyside-setup-opensource-src-6.3.0.tar.xz b/pyside-setup-opensource-src-6.3.0.tar.xz deleted file mode 100644 index 8f7760f..0000000 --- a/pyside-setup-opensource-src-6.3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d808d617c8daa2fe074f9a481478dc923a9799b5c89f6c5af38ece111ed57e2 -size 7648368 diff --git a/pyside-setup-opensource-src-6.3.1.tar.xz b/pyside-setup-opensource-src-6.3.1.tar.xz new file mode 100644 index 0000000..0b336bf --- /dev/null +++ b/pyside-setup-opensource-src-6.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5a85ed68834eb8324e3486283a9451b030d7221809e2a9533162e6b93899977 +size 7685896 diff --git a/python3-pyside6.changes b/python3-pyside6.changes index 6387baa..1f31d63 100644 --- a/python3-pyside6.changes +++ b/python3-pyside6.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Jun 19 19:11:09 UTC 2022 - Christophe Giboudeaux + +- Update to 6.3.1. Check the installed changes-6.3.0 file for the + complete list of changes. +- Drop patch, fixed upstream: + * 0001-Work-around-build-issue-in-pyside-6.3.patch + ------------------------------------------------------------------- Sun Apr 17 13:25:54 UTC 2022 - Christophe Giboudeaux diff --git a/python3-pyside6.spec b/python3-pyside6.spec index 2737e0d..01998e0 100644 --- a/python3-pyside6.spec +++ b/python3-pyside6.spec @@ -25,7 +25,7 @@ %endif # Name: python3-%{pyside_flavor} -Version: 6.3.0 +Version: 6.3.1 Release: 0 Summary: Python bindings for Qt 6 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 @@ -35,8 +35,6 @@ Source: https://download.qt.io/official_releases/QtForPython/pyside6/PyS Patch0: 0001-Don-t-install-CMake-files-into-versioned-directories.patch # PATCH-FIX-OPENSUSE Patch1: 0001-Always-link-to-python-libraries.patch -# PATCH-FIX-OPENSUSE -Patch2: 0001-Work-around-build-issue-in-pyside-6.3.patch # SECTION common_dependencies BuildRequires: clang-devel BuildRequires: fdupes @@ -188,10 +186,10 @@ export LD_LIBRARY_PATH=%{buildroot}%{_qt6_libdir}:$LD_LIBRARY_PATH # Excluded tests (last update: 2022-03-23) # registry_existence_test only works on the Qt CI -# QtWebEngineWidgets_pyside-474-qtwebengineview & QtWebEngineCore_web_engine_custom_scheme +# The QtWebEngineWidgets_pyside-474-qtwebengineview and QtWebEngineCore tests # pass locally but not on the build service (SIGTRAP) # QtGui_qpen_test times out -%define ctest_exclude_regex '(registry_existence_test|QtWebEngineWidgets_pyside-474-qtwebengineview|QtWebEngineCore_web_engine_custom_scheme|QtGui_qpen_test)' +%define ctest_exclude_regex '(registry_existence_test|QtWebEngineWidgets_pyside-474-qtwebengineview|QtWebEngineCore.*|QtGui_qpen_test)' %endif pushd sources/%{pyside_flavor} From 953b239eace8e94089b2394b1b951b18f87f2479e26a2fa6d4bc7be7e21ae9b0 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 21 Jun 2022 09:06:06 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=12 --- ...ork-around-build-issue-in-pyside-6.3.patch | 41 +++++++++++++++++++ pyside-setup-opensource-src-6.3.0.tar.xz | 3 ++ 2 files changed, 44 insertions(+) create mode 100644 0001-Work-around-build-issue-in-pyside-6.3.patch create mode 100644 pyside-setup-opensource-src-6.3.0.tar.xz diff --git a/0001-Work-around-build-issue-in-pyside-6.3.patch b/0001-Work-around-build-issue-in-pyside-6.3.patch new file mode 100644 index 0000000..f956f70 --- /dev/null +++ b/0001-Work-around-build-issue-in-pyside-6.3.patch @@ -0,0 +1,41 @@ +From c9a2328c8264b8cc9cc2dcf31d49bd8923c05bf7 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Sun, 17 Apr 2022 15:16:18 +0200 +Subject: [PATCH] Work around build issue in pyside 6.3 + +Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1890 + +Change-Id: I084b5d96b71b3b8468008cd415b3102d3a7918d7 +--- + sources/pyside6/PySide6/CMakeLists.txt | 1 + + sources/pyside6/PySide6/__init__.py.in | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sources/pyside6/PySide6/CMakeLists.txt b/sources/pyside6/PySide6/CMakeLists.txt +index 95693ff67..8c53341b3 100644 +--- a/sources/pyside6/PySide6/CMakeLists.txt ++++ b/sources/pyside6/PySide6/CMakeLists.txt +@@ -4,6 +4,7 @@ project(pyside6) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/global.h.in" + "${CMAKE_CURRENT_BINARY_DIR}/pyside6_global.h" @ONLY) + ++get_filename_component(_build_dir_name ${CMAKE_BINARY_DIR} NAME) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in" + "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" @ONLY) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/_config.py.in" +diff --git a/sources/pyside6/PySide6/__init__.py.in b/sources/pyside6/PySide6/__init__.py.in +index d8439985d..ba748a91f 100644 +--- a/sources/pyside6/PySide6/__init__.py.in ++++ b/sources/pyside6/PySide6/__init__.py.in +@@ -123,7 +123,7 @@ def _find_all_qt_modules(): + location = Path(__file__).resolve().parent + + # Note: We should _not_ call this function while still building, but use the existing value! +- in_build = location.parents[1].name == "build" ++ in_build = location.parents[1].name == "@_build_dir_name@" + if in_build: + return __all__ + +-- +2.35.1 + diff --git a/pyside-setup-opensource-src-6.3.0.tar.xz b/pyside-setup-opensource-src-6.3.0.tar.xz new file mode 100644 index 0000000..8f7760f --- /dev/null +++ b/pyside-setup-opensource-src-6.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d808d617c8daa2fe074f9a481478dc923a9799b5c89f6c5af38ece111ed57e2 +size 7648368 From ed317ff81c6d9bfbe9c45979eb84357f7c64ec3b7c0614eafd008f483dca759f Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 21 Jun 2022 09:08:26 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=14 --- ...ork-around-build-issue-in-pyside-6.3.patch | 41 ------------------- pyside-setup-opensource-src-6.3.0.tar.xz | 3 -- 2 files changed, 44 deletions(-) delete mode 100644 0001-Work-around-build-issue-in-pyside-6.3.patch delete mode 100644 pyside-setup-opensource-src-6.3.0.tar.xz diff --git a/0001-Work-around-build-issue-in-pyside-6.3.patch b/0001-Work-around-build-issue-in-pyside-6.3.patch deleted file mode 100644 index f956f70..0000000 --- a/0001-Work-around-build-issue-in-pyside-6.3.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c9a2328c8264b8cc9cc2dcf31d49bd8923c05bf7 Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux -Date: Sun, 17 Apr 2022 15:16:18 +0200 -Subject: [PATCH] Work around build issue in pyside 6.3 - -Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1890 - -Change-Id: I084b5d96b71b3b8468008cd415b3102d3a7918d7 ---- - sources/pyside6/PySide6/CMakeLists.txt | 1 + - sources/pyside6/PySide6/__init__.py.in | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/sources/pyside6/PySide6/CMakeLists.txt b/sources/pyside6/PySide6/CMakeLists.txt -index 95693ff67..8c53341b3 100644 ---- a/sources/pyside6/PySide6/CMakeLists.txt -+++ b/sources/pyside6/PySide6/CMakeLists.txt -@@ -4,6 +4,7 @@ project(pyside6) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/global.h.in" - "${CMAKE_CURRENT_BINARY_DIR}/pyside6_global.h" @ONLY) - -+get_filename_component(_build_dir_name ${CMAKE_BINARY_DIR} NAME) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in" - "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" @ONLY) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/_config.py.in" -diff --git a/sources/pyside6/PySide6/__init__.py.in b/sources/pyside6/PySide6/__init__.py.in -index d8439985d..ba748a91f 100644 ---- a/sources/pyside6/PySide6/__init__.py.in -+++ b/sources/pyside6/PySide6/__init__.py.in -@@ -123,7 +123,7 @@ def _find_all_qt_modules(): - location = Path(__file__).resolve().parent - - # Note: We should _not_ call this function while still building, but use the existing value! -- in_build = location.parents[1].name == "build" -+ in_build = location.parents[1].name == "@_build_dir_name@" - if in_build: - return __all__ - --- -2.35.1 - diff --git a/pyside-setup-opensource-src-6.3.0.tar.xz b/pyside-setup-opensource-src-6.3.0.tar.xz deleted file mode 100644 index 8f7760f..0000000 --- a/pyside-setup-opensource-src-6.3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d808d617c8daa2fe074f9a481478dc923a9799b5c89f6c5af38ece111ed57e2 -size 7648368 From 70be02a46803803ea18ce7a3040ef8f3b819b6ad7bf1f0273d099eef558cd220 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 22 Jun 2022 10:29:36 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=15 --- python3-pyside6.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/python3-pyside6.spec b/python3-pyside6.spec index 01998e0..4a5bdbc 100644 --- a/python3-pyside6.spec +++ b/python3-pyside6.spec @@ -184,12 +184,17 @@ export LD_LIBRARY_PATH=%{buildroot}%{_qt6_libdir}:$LD_LIBRARY_PATH %if "%{pyside_flavor}" == "pyside6" %define xvfb_command xvfb-run -s "-screen 0 1600x1200x16 -ac +extension GLX +render -noreset" \\ -# Excluded tests (last update: 2022-03-23) +%define excluded_tests 1 +# Excluded tests (last update: 2022-06-22) # registry_existence_test only works on the Qt CI # The QtWebEngineWidgets_pyside-474-qtwebengineview and QtWebEngineCore tests # pass locally but not on the build service (SIGTRAP) # QtGui_qpen_test times out -%define ctest_exclude_regex '(registry_existence_test|QtWebEngineWidgets_pyside-474-qtwebengineview|QtWebEngineCore.*|QtGui_qpen_test)' +ctest_exclude_regex="registry_existence_test|QtWebEngineWidgets_pyside-474-qtwebengineview|QtWebEngineCore.*|QtGui_qpen_test" +# Qt3DExtras_qt3dextras_test fails on aarch64 (exception) and s390x (timeout) +%ifarch aarch64 s390x +ctest_exclude_regex="$ctest_exclude_regex|Qt3DExtras_qt3dextras_test" +%endif %endif pushd sources/%{pyside_flavor} @@ -199,7 +204,7 @@ ctest \ --force-new-ctest-process \ --test-dir %{__qt6_builddir} \ --parallel %{_smp_build_ncpus} \ - %{?ctest_exclude_regex:--exclude-regex %{ctest_exclude_regex}} + %{?excluded_tests:--exclude-regex "($ctest_exclude_regex)"} popd %post -p /sbin/ldconfig From 967e95eca740a28e9b33c7d75aa7cba9297035ff446d9b2c9b156b8d9f0ce7ff Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 23 Jun 2022 07:56:09 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=16 --- python3-pyside6.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python3-pyside6.changes b/python3-pyside6.changes index 1f31d63..b69d2ef 100644 --- a/python3-pyside6.changes +++ b/python3-pyside6.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sun Jun 19 19:11:09 UTC 2022 - Christophe Giboudeaux -- Update to 6.3.1. Check the installed changes-6.3.0 file for the +- Update to 6.3.1. Check the installed changes-6.3.1 file for the complete list of changes. - Drop patch, fixed upstream: * 0001-Work-around-build-issue-in-pyside-6.3.patch