Accepting request 939021 from KDE:Qt:6.2

PySide 6.2.2

OBS-URL: https://build.opensuse.org/request/show/939021
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=5
This commit is contained in:
Christophe Giboudeaux 2021-12-10 08:12:05 +00:00 committed by Git OBS Bridge
parent 154db152b2
commit d2708f10de
6 changed files with 33 additions and 21 deletions

View File

@ -1,18 +1,18 @@
From c94527c95ffc68b3b161c8cd0a786ae179f30915 Mon Sep 17 00:00:00 2001 From 3de1ff0464ccf0f5e88c62330e98cb816c42f7b2 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr> From: Christophe Giboudeaux <christophe@krop.fr>
Date: Tue, 27 Jul 2021 14:54:00 +0200 Date: Tue, 27 Jul 2021 14:54:00 +0200
Subject: [PATCH] Always link to python libraries. Subject: [PATCH] Always link to python libraries.
Change-Id: I687191431adaff55927de353db8f81dfa30ba1b1 Change-Id: I687191431adaff55927de353db8f81dfa30ba1b1
--- ---
sources/shiboken6/data/shiboken_helpers.cmake | 18 +++--------------- sources/shiboken6/cmake/ShibokenHelpers.cmake | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-) 1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/sources/shiboken6/data/shiboken_helpers.cmake b/sources/shiboken6/data/shiboken_helpers.cmake diff --git a/sources/shiboken6/cmake/ShibokenHelpers.cmake b/sources/shiboken6/cmake/ShibokenHelpers.cmake
index 7e772c7fd..438f63480 100644 index 87a6762..189d7ab 100644
--- a/sources/shiboken6/data/shiboken_helpers.cmake --- a/sources/shiboken6/cmake/ShibokenHelpers.cmake
+++ b/sources/shiboken6/data/shiboken_helpers.cmake +++ b/sources/shiboken6/cmake/ShibokenHelpers.cmake
@@ -300,21 +300,9 @@ macro(shiboken_compute_python_libraries) @@ -310,21 +310,9 @@ macro(shiboken_compute_python_libraries)
"SHIBOKEN_COMPUTE_LIBS" "shiboken_compute_python_libraries" "SHIBOKEN_COMPUTE_LIBS" "shiboken_compute_python_libraries"
"IS_CALLED_FROM_EXPORT" "" "" ${ARGN}) "IS_CALLED_FROM_EXPORT" "" "" ${ARGN})
@ -38,5 +38,5 @@ index 7e772c7fd..438f63480 100644
# If the resulting variable # If the resulting variable
# contains a "debug;X;optimized;Y" list like described in shiboken_check_if_limited_api, # contains a "debug;X;optimized;Y" list like described in shiboken_check_if_limited_api,
-- --
2.33.0 2.34.1

View File

@ -1,4 +1,4 @@
From ba855a5ba8ae6c52f704e4004d749afd766aa834 Mon Sep 17 00:00:00 2001 From 01b6cb4089b1ccc4617f2e4d2cce241e2c111069 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr> From: Christophe Giboudeaux <christophe@krop.fr>
Date: Sun, 25 Apr 2021 16:14:31 +0200 Date: Sun, 25 Apr 2021 16:14:31 +0200
Subject: [PATCH] Don't install CMake files into versioned directories Subject: [PATCH] Don't install CMake files into versioned directories
@ -11,10 +11,10 @@ Experience shows this causes issues.
3 files changed, 11 insertions(+), 11 deletions(-) 3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/sources/pyside6/libpyside/CMakeLists.txt b/sources/pyside6/libpyside/CMakeLists.txt diff --git a/sources/pyside6/libpyside/CMakeLists.txt b/sources/pyside6/libpyside/CMakeLists.txt
index 90f333e..b42691d 100644 index dca469e..e4802ec 100644
--- a/sources/pyside6/libpyside/CMakeLists.txt --- a/sources/pyside6/libpyside/CMakeLists.txt
+++ b/sources/pyside6/libpyside/CMakeLists.txt +++ b/sources/pyside6/libpyside/CMakeLists.txt
@@ -191,7 +191,7 @@ set(PYSIDE_GLUE "${CMAKE_INSTALL_PREFIX}/share/PySide6${pyside6_SUFFIX}/glue") @@ -157,7 +157,7 @@ set(PYSIDE_GLUE "${CMAKE_INSTALL_PREFIX}/share/PySide6${pyside6_SUFFIX}/glue")
configure_package_config_file( configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/PySide6Config-spec.cmake.in" "${CMAKE_CURRENT_SOURCE_DIR}/PySide6Config-spec.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/install/PySide6Config${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake" "${CMAKE_CURRENT_BINARY_DIR}/install/PySide6Config${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake"
@ -23,7 +23,7 @@ index 90f333e..b42691d 100644
PATH_VARS PYSIDE_PYTHONPATH PYSIDE_TYPESYSTEMS PYSIDE_GLUE PATH_VARS PYSIDE_PYTHONPATH PYSIDE_TYPESYSTEMS PYSIDE_GLUE
) )
@@ -208,16 +208,16 @@ install(TARGETS pyside6 EXPORT PySide6Targets @@ -174,16 +174,16 @@ install(TARGETS pyside6 EXPORT PySide6Targets
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
RUNTIME DESTINATION bin) RUNTIME DESTINATION bin)
install(EXPORT PySide6Targets NAMESPACE PySide6:: install(EXPORT PySide6Targets NAMESPACE PySide6::
@ -45,7 +45,7 @@ index 90f333e..b42691d 100644
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6-${BINDING_API_VERSION}") - DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6-${BINDING_API_VERSION}")
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6") + DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6")
diff --git a/sources/shiboken6/data/CMakeLists.txt b/sources/shiboken6/data/CMakeLists.txt diff --git a/sources/shiboken6/data/CMakeLists.txt b/sources/shiboken6/data/CMakeLists.txt
index 46bd1bf..18c34c2 100644 index 6dedb13..4101f94 100644
--- a/sources/shiboken6/data/CMakeLists.txt --- a/sources/shiboken6/data/CMakeLists.txt
+++ b/sources/shiboken6/data/CMakeLists.txt +++ b/sources/shiboken6/data/CMakeLists.txt
@@ -33,7 +33,7 @@ endif() @@ -33,7 +33,7 @@ endif()
@ -72,22 +72,22 @@ index 46bd1bf..18c34c2 100644
- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}") - DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}")
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6") + DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/shiboken_helpers.cmake" install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ShibokenHelpers.cmake"
- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}") - DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}")
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6") + DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shiboken6${shiboken6_SUFFIX}.pc" install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shiboken6${shiboken6_SUFFIX}.pc"
DESTINATION "${LIB_INSTALL_DIR}/pkgconfig") DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt
index 2413181..d5a82b8 100644 index da1b562..09a8e36 100644
--- a/sources/shiboken6/libshiboken/CMakeLists.txt --- a/sources/shiboken6/libshiboken/CMakeLists.txt
+++ b/sources/shiboken6/libshiboken/CMakeLists.txt +++ b/sources/shiboken6/libshiboken/CMakeLists.txt
@@ -151,4 +151,4 @@ install(TARGETS libshiboken EXPORT Shiboken6Targets @@ -159,4 +159,4 @@ install(TARGETS libshiboken EXPORT Shiboken6Targets
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
RUNTIME DESTINATION bin) RUNTIME DESTINATION bin)
install(EXPORT Shiboken6Targets NAMESPACE Shiboken6:: install(EXPORT Shiboken6Targets NAMESPACE Shiboken6::
- DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}) - DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION})
+ DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken6) + DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken6)
-- --
2.31.1 2.34.1

View File

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

View File

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

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Dec 9 08:23:19 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 6.2.2
https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-6.2.2
- Rebase patches:
* 0001-Don-t-install-CMake-files-into-versioned-directories.patch
* 0001-Always-link-to-python-libraries.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Oct 30 09:41:32 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr> Sat Oct 30 09:41:32 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -30,7 +30,7 @@ ExclusiveArch: do_not_build
%endif %endif
# #
Name: python3-%{pyside_flavor} Name: python3-%{pyside_flavor}
Version: 6.2.1 Version: 6.2.2
Release: 0 Release: 0
Summary: Python bindings for Qt 6 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 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
@ -134,6 +134,9 @@ _libsuffix=$(echo %{_lib} | cut -b4-)
# doesn't handle build dirs called 'build' # doesn't handle build dirs called 'build'
%global __qt6_builddir %{pyside_flavor} %global __qt6_builddir %{pyside_flavor}
# Fix installation dir
sed -i 's#purelib#platlib#' sources/{pyside6/cmake/PySideSetup.cmake,shiboken6/cmake/ShibokenHelpers.cmake}
pushd sources/%{pyside_flavor} pushd sources/%{pyside_flavor}
# NOTE:The compiler and linker flags shall not be defined # NOTE:The compiler and linker flags shall not be defined