rpm/python3-pyside6
SHA256
1
0
Fork 0
forked from pool/python3-pyside6
Code Pull Requests Activity

Accepting request 1119214 from KDE:Qt6

Browse Source 
Update to 6.6.0 (forwarded request 1118842 from krop)

OBS-URL: https://build.opensuse.org/request/show/1119214
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python3-pyside6?expand=0&rev=23
This commit is contained in:
Ana Guerrero 2023-10-20 21:18:48 +00:00 committed by Git OBS Bridge
commit 4179476c05
7 changed files with 48 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
0001-Fix-QtAsyncio-install-dir.patch Normal file
View File

@ -0,0 +1,23 @@
From ad548b61d6b011a66bc2004448c00fca595390de Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe@krop.fr>
Date: Wed, 18 Oct 2023 23:10:57 +0200
Subject: [PATCH] Fix QtAsyncio install dir
(https://bugreports.qt.io/browse/PYSIDE-2494)
---
sources/pyside6/PySide6/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sources/pyside6/PySide6/CMakeLists.txt b/sources/pyside6/PySide6/CMakeLists.txt
index e24fdb682..37b7a6c9c 100644
--- a/sources/pyside6/PySide6/CMakeLists.txt
+++ b/sources/pyside6/PySide6/CMakeLists.txt
@@ -111,4 +111,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyside6_global.h
DESTINATION include/${BINDING_NAME}${pyside6_SUFFIX})
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/QtAsyncio"
- DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+ DESTINATION "${PYTHON_SITE_PACKAGES}/${BINDING_NAME}${pyside6_SUFFIX}")
--
2.42.0

35
0001-Fix-tests-sample_privatector-sample_privatedtor-fail.patch
View File

@ -1,35 +0,0 @@
From 4f7c3fdd07aefcf7c0afe92baf30938736d29cef Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 18 Sep 2023 13:39:17 +0200
Subject: [PATCH] Fix tests sample_privatector sample_privatedtor failing with
Python 3.11.5
Remove special characters from the format string as they cause:
ValueError PyUnicode_FromFormatV() expects an ASCII-encoded format string, got a non-ASCII byte: 0xc2
Fixes: PYSIDE-2465
Pick-to: 6.6 6.5 6.2 5.15
Change-Id: I506efcb44168fdc979a1d16bf33d5d5d14525e2e
---
sources/shiboken6/libshiboken/basewrapper.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sources/shiboken6/libshiboken/basewrapper.cpp b/sources/shiboken6/libshiboken/basewrapper.cpp
index a0e4e5311..64424298d 100644
--- a/sources/shiboken6/libshiboken/basewrapper.cpp
+++ b/sources/shiboken6/libshiboken/basewrapper.cpp
@@ -601,9 +601,9 @@ PyObject *SbkQApp_tp_new(PyTypeObject *subtype, PyObject *, PyObject *)
PyObject *SbkDummyNew(PyTypeObject *type, PyObject *, PyObject *)
{
// PYSIDE-595: Give the same error as type_call does when tp_new is NULL.
+ const char regret[] = "¯\\_(ツ)_/¯";
PyErr_Format(PyExc_TypeError,
- "cannot create '%.100s' instances ¯\\_(ツ)_/¯",
- type->tp_name);
+ "cannot create '%.100s' instances %s", type->tp_name, regret);
return nullptr;
}
--
2.42.0

53
0001-adapt-qC_Debug_Info_Warning_Critical_-for-new-definition.patch
View File

@ -1,53 +0,0 @@
From 63ef7628091c8827e3d0d688220d3ae165587eb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristi=C3=A1n=20Maureira-Fredes?=
<cristian.maureira-fredes@qt.io>
Date: Thu, 13 Jul 2023 14:41:14 +0200
Subject: adapt qC{Debug,Info,Warning,Critical} for new definition
In response to:
I3eb1bd30e0124f89a052fffd16a7564f4450ec8a
Change-Id: I5393660521a8ee12a14bf2c287a6ea9a0393408f
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
sources/pyside6/PySide6/QtCore/typesystem_core_common.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
index bf6e263d4..e8155d41d 100644
--- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
+++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
@@ -3340,25 +3340,25 @@
<include file-name="qloggingcategory.h" location="global" />
</extra-includes>
<inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qloggingcategory_to_cpp">
- qCDebug(*category, "%s", %2);
+ qCDebug((*category), "%s", %2);
</inject-code>
</add-function>
<add-function signature="qCCritical(PyObject *, const char *)">
<inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qloggingcategory_to_cpp">
- qCCritical(*category, "%s", %2);
+ qCCritical((*category), "%s", %2);
</inject-code>
</add-function>
<add-function signature="qCInfo(PyObject *, const char *)">
<inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qloggingcategory_to_cpp">
- qCInfo(*category, "%s", %2);
+ qCInfo((*category), "%s", %2);
</inject-code>
</add-function>
<add-function signature="qCWarning(PyObject *, const char *)">
<inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qloggingcategory_to_cpp">
- qCWarning(*category, "%s", %2);
+ qCWarning((*category), "%s", %2);
</inject-code>
</add-function>
--
cgit v1.2.3

BIN
pyside-setup-everywhere-src-6.5.2.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

3
pyside-setup-everywhere-src-6.6.0.tar.xz Normal file
View File

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

11
python3-pyside6.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Oct 17 10:35:38 UTC 2023 - Christophe Marin <christophe@krop.fr>
- Update to 6.6.0. Check the installed changes-6.6.0 file for the
full list of changes
- Drop patches, merged upstream:
* 0001-Fix-tests-sample_privatector-sample_privatedtor-fail.patch
* 0001-adapt-qC_Debug_Info_Warning_Critical_-for-new-definition.patch
- Add patch:
* 0001-Fix-QtAsyncio-install-dir.patch
-------------------------------------------------------------------
Wed Oct 4 09:00:16 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>

21
python3-pyside6.spec
View File

@ -17,7 +17,7 @@
%define tar_name pyside-setup-everywhere-src
%define short_version 6.5
%define short_version 6.6
#
%if "@BUILD_FLAVOR@%{nil}" == "shiboken6"
%global pyside_flavor shiboken6
@ -26,18 +26,16 @@
%endif
#
Name: python3-%{pyside_flavor}
Version: 6.5.2
Version: 6.6.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://www.nic.funet.fi/pub/mirrors/download.qt-project.org/official_releases/QtForPython/pyside6/PySide6-%{version}-src/%{tar_name}-%{version}.tar.xz
Source: https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-%{version}-src/%{tar_name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE
Patch0: 0001-Always-link-to-python-libraries.patch
# PATCH-FIX-UPSTREAM
Patch1: 0001-Fix-tests-sample_privatector-sample_privatedtor-fail.patch
# PATCH-FIX-UPSTREAM
Patch2: 0001-adapt-qC_Debug_Info_Warning_Critical_-for-new-definition.patch
Patch1: 0001-Fix-QtAsyncio-install-dir.patch
# SECTION common_dependencies
BuildRequires: clang-devel
BuildRequires: fdupes
@ -65,6 +63,7 @@ BuildRequires: xvfb-run
# /SECTION
# SECTION essential_modules
BuildRequires: cmake(Qt6Concurrent)
BuildRequires: cmake(Qt6ExampleIconsPrivate)
BuildRequires: cmake(Qt6Gui)
BuildRequires: cmake(Qt6Network)
BuildRequires: cmake(Qt6PrintSupport)
@ -72,7 +71,6 @@ BuildRequires: cmake(Qt6Sql)
BuildRequires: cmake(Qt6Widgets)
# /SECTION
# SECTION optional_modules
BuildRequires: qt6-qml-private-devel
BuildRequires: cmake(Qt63DAnimation)
BuildRequires: cmake(Qt63DCore)
BuildRequires: cmake(Qt63DExtras)
@ -84,12 +82,14 @@ BuildRequires: cmake(Qt6Charts)
BuildRequires: cmake(Qt6DBus)
BuildRequires: cmake(Qt6DataVisualization)
BuildRequires: cmake(Qt6Designer)
BuildRequires: cmake(Qt6Graphs)
BuildRequires: cmake(Qt6Help)
BuildRequires: cmake(Qt6HttpServer)
BuildRequires: cmake(Qt6Location)
BuildRequires: cmake(Qt6Multimedia)
BuildRequires: cmake(Qt6MultimediaWidgets)
BuildRequires: cmake(Qt6NetworkAuth)
BuildRequires: qt6-qml-private-devel
BuildRequires: cmake(Qt6OpenGL)
BuildRequires: cmake(Qt6OpenGLWidgets)
BuildRequires: cmake(Qt6Positioning)
@ -133,7 +133,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-)
@ -219,13 +219,14 @@ ctest_exclude_regex="smart_smart_pointer"
%define xvfb_command xvfb-run -s "-screen 0 1600x1200x16 -ac +extension GLX +render -noreset" \\
%define excluded_tests 1
# Excluded tests (last update: 2023-05-30)
# Excluded tests (last update: 2023-10-17)
# 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)
# QtPositioning_positioning fails
ctest_exclude_regex="QtWebEngineWidgets_pyside-474-qtwebengineview|QtGui_qpen_test|QtMultimediaWidgets_qmultimediawidgets|Qt3DExtras_qt3dextras_test|QtPositioning_positioning"
# QtWidgets_qwidget_test fails randomly
ctest_exclude_regex="QtWebEngineWidgets_pyside-474-qtwebengineview|QtGui_qpen_test|QtMultimediaWidgets_qmultimediawidgets|Qt3DExtras_qt3dextras_test|QtPositioning_positioning|pyside6-deploy_test_pyside6_deploy|QtWidgets_qwidget_test"
# Random failures on aarch64: registry_existence_test times out and QtWebEngineCore_web_engine_custom_scheme asserts
%ifarch aarch64