Accepting request 1078136 from home:krop:Qt6:Extra
Update to 6.5.0 OBS-URL: https://build.opensuse.org/request/show/1078136 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=33
This commit is contained in:
Christophe Marin
Git OBS Bridge
parent
e755fae209
commit
6177bae45a
@ -1,126 +0,0 @@
|
||||
From d64f9ed25aba35e44f6397461b66d49545f65c07 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
Date: Sun, 25 Apr 2021 16:14:31 +0200
|
||||
Subject: [PATCH] Don't install CMake files into versioned directories
|
||||
|
||||
Experience shows this causes issues.
|
||||
---
|
||||
sources/pyside6/libpyside/CMakeLists.txt | 10 +++++-----
|
||||
sources/pyside6/libpysideqml/CMakeLists.txt | 10 +++++-----
|
||||
sources/shiboken6/data/CMakeLists.txt | 10 +++++-----
|
||||
sources/shiboken6/libshiboken/CMakeLists.txt | 2 +-
|
||||
4 files changed, 16 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/sources/pyside6/libpyside/CMakeLists.txt b/sources/pyside6/libpyside/CMakeLists.txt
|
||||
index 0b2f7a097..a8807b9d7 100644
|
||||
--- a/sources/pyside6/libpyside/CMakeLists.txt
|
||||
+++ b/sources/pyside6/libpyside/CMakeLists.txt
|
||||
@@ -153,7 +153,7 @@ set(PYSIDE_GLUE "${CMAKE_INSTALL_PREFIX}/share/PySide6${pyside6_SUFFIX}/glue")
|
||||
configure_package_config_file(
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/PySide6Config-spec.cmake.in"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/install/PySide6Config${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake"
|
||||
- INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6-${BINDING_API_VERSION}"
|
||||
+ INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6"
|
||||
PATH_VARS PYSIDE_PYTHONPATH PYSIDE_TYPESYSTEMS PYSIDE_GLUE
|
||||
)
|
||||
|
||||
@@ -170,16 +170,16 @@ install(TARGETS pyside6 EXPORT PySide6Targets
|
||||
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
|
||||
RUNTIME DESTINATION bin)
|
||||
install(EXPORT PySide6Targets NAMESPACE PySide6::
|
||||
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6-${BINDING_API_VERSION}")
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6")
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pyside6${pyside6_SUFFIX}.pc"
|
||||
DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide6Config.cmake"
|
||||
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6-${BINDING_API_VERSION}")
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6")
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/PySide6Config${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake"
|
||||
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6-${BINDING_API_VERSION}")
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6")
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide6ConfigVersion.cmake"
|
||||
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6-${BINDING_API_VERSION}")
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6")
|
||||
diff --git a/sources/pyside6/libpysideqml/CMakeLists.txt b/sources/pyside6/libpysideqml/CMakeLists.txt
|
||||
index 42238c8cb..580c8fdff 100644
|
||||
--- a/sources/pyside6/libpysideqml/CMakeLists.txt
|
||||
+++ b/sources/pyside6/libpysideqml/CMakeLists.txt
|
||||
@@ -63,7 +63,7 @@ qfp_strip_library("pyside6qml")
|
||||
configure_package_config_file(
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/PySide6QmlConfig-spec.cmake.in"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/install/PySide6QmlConfig${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake"
|
||||
- INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}"
|
||||
+ INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml"
|
||||
)
|
||||
|
||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySide6QmlConfig.cmake.in"
|
||||
@@ -79,14 +79,14 @@ install(TARGETS pyside6qml EXPORT PySide6QmlTargets
|
||||
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
|
||||
RUNTIME DESTINATION bin)
|
||||
install(EXPORT PySide6QmlTargets NAMESPACE PySide6Qml::
|
||||
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}")
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml")
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide6QmlConfig.cmake"
|
||||
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}")
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml")
|
||||
|
||||
install(FILES
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/install/PySide6QmlConfig${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake"
|
||||
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}")
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml")
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide6QmlConfigVersion.cmake"
|
||||
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}")
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml")
|
||||
diff --git a/sources/shiboken6/data/CMakeLists.txt b/sources/shiboken6/data/CMakeLists.txt
|
||||
index 80dd7ca36..88d9487da 100644
|
||||
--- a/sources/shiboken6/data/CMakeLists.txt
|
||||
+++ b/sources/shiboken6/data/CMakeLists.txt
|
||||
@@ -29,7 +29,7 @@ endif()
|
||||
configure_package_config_file(
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/Shiboken6Config-spec.cmake.in"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/install/Shiboken6Config${PYTHON_CONFIG_SUFFIX}.cmake"
|
||||
- INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}"
|
||||
+ INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6"
|
||||
PATH_VARS SHIBOKEN_PYTHON_MODULE_DIR SHIBOKEN_SHARED_LIBRARY_DIR
|
||||
)
|
||||
|
||||
@@ -41,16 +41,16 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken6.pc.in"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/shiboken6${shiboken6_SUFFIX}.pc" @ONLY)
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Shiboken6Config.cmake"
|
||||
- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}")
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6")
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/Shiboken6Config${PYTHON_CONFIG_SUFFIX}.cmake"
|
||||
- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}")
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6")
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Shiboken6ConfigVersion.cmake"
|
||||
- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}")
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6")
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ShibokenHelpers.cmake"
|
||||
- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}")
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6")
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shiboken6${shiboken6_SUFFIX}.pc"
|
||||
DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
|
||||
diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt
|
||||
index c65dcdb44..7447d1d71 100644
|
||||
--- a/sources/shiboken6/libshiboken/CMakeLists.txt
|
||||
+++ b/sources/shiboken6/libshiboken/CMakeLists.txt
|
||||
@@ -179,4 +179,4 @@ install(TARGETS libshiboken EXPORT Shiboken6Targets
|
||||
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
|
||||
RUNTIME DESTINATION bin)
|
||||
install(EXPORT Shiboken6Targets NAMESPACE Shiboken6::
|
||||
- DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION})
|
||||
+ DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken6)
|
||||
--
|
||||
2.35.1
|
||||
|
||||
3
pyside-setup-everywhere-src-6.5.0.tar.xz
Normal file
3
pyside-setup-everywhere-src-6.5.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6ef53b29127267e381917e6f9399ce760edc0644cd5831988b1de72c9d583ab4
|
||||
size 13566572
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1ec9d0936332efd229650cf10fed36cadddff7a613a2ea6e897de4d504c1b505
|
||||
size 8759528
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 4 23:22:25 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 6.5.0. Check the installed changes-6.5.0 file for the
|
||||
full list of changes
|
||||
- Drop patch, merged upstream:
|
||||
* 0001-Don-t-install-CMake-files-into-versioned-directories.patch
|
||||
- Build pyside with llvm15 on Tumbleweed to work around
|
||||
boo#1210176 / https://bugreports.qt.io/browse/PYSIDE-2268
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 17 09:04:56 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
|
||||
@ -16,7 +16,8 @@
|
||||
#
|
||||
|
||||
|
||||
%define tar_name pyside-setup-opensource-src
|
||||
%define tar_name pyside-setup-everywhere-src
|
||||
%define short_version 6.5
|
||||
#
|
||||
%if "@BUILD_FLAVOR@%{nil}" == "shiboken6"
|
||||
%global pyside_flavor shiboken6
|
||||
@ -25,18 +26,19 @@
|
||||
%endif
|
||||
#
|
||||
Name: python3-%{pyside_flavor}
|
||||
Version: 6.4.2
|
||||
Version: 6.5.0
|
||||
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
|
||||
URL: https://www.qt.io
|
||||
Source: https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-%{version}-src/%{tar_name}-%{version}.tar.xz
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch0: 0001-Don-t-install-CMake-files-into-versioned-directories.patch
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch1: 0001-Always-link-to-python-libraries.patch
|
||||
Patch0: 0001-Always-link-to-python-libraries.patch
|
||||
# SECTION common_dependencies
|
||||
BuildRequires: clang-devel
|
||||
# boo#1210176 - PYSIDE-2268
|
||||
BuildRequires: clang15-devel
|
||||
BuildRequires: llvm15-libclang13
|
||||
#!BuildIgnore: clang16
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: python-rpm-macros
|
||||
@ -70,15 +72,12 @@ BuildRequires: cmake(Qt6Widgets)
|
||||
# /SECTION
|
||||
# SECTION optional_modules
|
||||
BuildRequires: qt6-qml-private-devel
|
||||
# TODO: Reenable when 6.5.0 is released
|
||||
%ifnarch %{ix86}
|
||||
BuildRequires: cmake(Qt63DAnimation)
|
||||
BuildRequires: cmake(Qt63DCore)
|
||||
BuildRequires: cmake(Qt63DExtras)
|
||||
BuildRequires: cmake(Qt63DInput)
|
||||
BuildRequires: cmake(Qt63DLogic)
|
||||
BuildRequires: cmake(Qt63DRender)
|
||||
%endif
|
||||
BuildRequires: cmake(Qt6Bluetooth)
|
||||
BuildRequires: cmake(Qt6Charts)
|
||||
BuildRequires: cmake(Qt6DBus)
|
||||
@ -86,6 +85,7 @@ BuildRequires: cmake(Qt6DataVisualization)
|
||||
BuildRequires: cmake(Qt6Designer)
|
||||
BuildRequires: cmake(Qt6Help)
|
||||
BuildRequires: cmake(Qt6HttpServer)
|
||||
BuildRequires: cmake(Qt6Location)
|
||||
BuildRequires: cmake(Qt6Multimedia)
|
||||
BuildRequires: cmake(Qt6MultimediaWidgets)
|
||||
BuildRequires: cmake(Qt6NetworkAuth)
|
||||
@ -100,6 +100,7 @@ BuildRequires: cmake(Qt6QuickWidgets)
|
||||
BuildRequires: cmake(Qt6RemoteObjects)
|
||||
BuildRequires: cmake(Qt6Scxml)
|
||||
BuildRequires: cmake(Qt6Sensors)
|
||||
BuildRequires: cmake(Qt6SerialBus)
|
||||
BuildRequires: cmake(Qt6SerialPort)
|
||||
BuildRequires: cmake(Qt6SpatialAudio)
|
||||
BuildRequires: cmake(Qt6StateMachine)
|
||||
@ -131,7 +132,7 @@ Requires: %{name} = %{version}
|
||||
Python bindings for the Qt cross-platform application and UI framework
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{tar_name}-%{version}
|
||||
%autosetup -p1 -n %{tar_name}-%{short_version}
|
||||
|
||||
%build
|
||||
_libsuffix=$(echo %{_lib} | cut -b4-)
|
||||
@ -207,12 +208,13 @@ done
|
||||
%define xvfb_command xvfb-run -s "-screen 0 1600x1200x16 -ac +extension GLX +render -noreset" \\
|
||||
|
||||
%define excluded_tests 1
|
||||
# Excluded tests (last update: 2023-01-12)
|
||||
# Excluded tests (last update: 2023-04-08)
|
||||
# QtWebEngineWidgets_pyside-474-qtwebengineview fails with 'ContextResult::kTransientFailure: Failed to send GpuControl.CreateCommandBuffer'
|
||||
# QtGui_qpen_test times out
|
||||
# QtMultimediaWidgets_qmultimediawidgets aborts
|
||||
# Qt3DExtras_qt3dextras_test fails on s390x (timeout) and randomly everywhere else (exception)
|
||||
ctest_exclude_regex="QtWebEngineWidgets_pyside-474-qtwebengineview|QtGui_qpen_test|QtMultimediaWidgets_qmultimediawidgets|Qt3DExtras_qt3dextras_test"
|
||||
# QtPositioning_positioning fails
|
||||
ctest_exclude_regex="QtWebEngineWidgets_pyside-474-qtwebengineview|QtGui_qpen_test|QtMultimediaWidgets_qmultimediawidgets|Qt3DExtras_qt3dextras_test|QtPositioning_positioning"
|
||||
|
||||
# Random failures on aarch64: registry_existence_test times out and QtWebEngineCore_web_engine_custom_scheme asserts
|
||||
%ifarch aarch64
|
||||
@ -230,8 +232,7 @@ ctest \
|
||||
%{?excluded_tests:--exclude-regex "($ctest_exclude_regex)"}
|
||||
popd
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%license sources/%{pyside_flavor}/COPYING*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user