forked from pool/python3-pyside6
Update to 6.3.1
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=11
This commit is contained in:
parent
e0500ddd81
commit
70f150cead
@ -1,41 +0,0 @@
|
||||
From c9a2328c8264b8cc9cc2dcf31d49bd8923c05bf7 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
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
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9d808d617c8daa2fe074f9a481478dc923a9799b5c89f6c5af38ece111ed57e2
|
||||
size 7648368
|
3
pyside-setup-opensource-src-6.3.1.tar.xz
Normal file
3
pyside-setup-opensource-src-6.3.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e5a85ed68834eb8324e3486283a9451b030d7221809e2a9533162e6b93899977
|
||||
size 7685896
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 19 19:11:09 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- 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 <christophe@krop.fr>
|
||||
|
||||
|
@ -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}
|
||||
|
Loading…
Reference in New Issue
Block a user