Sync from SUSE:SLFO:Main python3-pyside6 revision a816fa49453ef8560ec4a9be85f07357
This commit is contained in:
parent
05bc10691e
commit
6a0ca70b7c
@ -1,15 +1,18 @@
|
||||
From 3de1ff0464ccf0f5e88c62330e98cb816c42f7b2 Mon Sep 17 00:00:00 2001
|
||||
From e9591e27db4ae3412d4504a69a8afebee9a1b83e Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
Date: Tue, 27 Jul 2021 14:54:00 +0200
|
||||
Subject: [PATCH] Always link to python libraries.
|
||||
|
||||
Change-Id: I687191431adaff55927de353db8f81dfa30ba1b1
|
||||
---
|
||||
sources/shiboken6/cmake/ShibokenHelpers.cmake | 10 +++-------
|
||||
1 file changed, 3 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/sources/shiboken6/cmake/ShibokenHelpers.cmake b/sources/shiboken6/cmake/ShibokenHelpers.cmake
|
||||
index 1a46e5b..6c10c07 100644
|
||||
index 27ee333..4be2ad1 100644
|
||||
--- a/sources/shiboken6/cmake/ShibokenHelpers.cmake
|
||||
+++ b/sources/shiboken6/cmake/ShibokenHelpers.cmake
|
||||
@@ -420,13 +420,9 @@ macro(shiboken_compute_python_libraries)
|
||||
@@ -425,13 +425,9 @@ macro(shiboken_compute_python_libraries)
|
||||
"SHIBOKEN_COMPUTE_LIBS" "shiboken_compute_python_libraries"
|
||||
"IS_CALLED_FROM_EXPORT" "" "" ${ARGN})
|
||||
|
||||
@ -26,3 +29,6 @@ index 1a46e5b..6c10c07 100644
|
||||
|
||||
# If the resulting variable
|
||||
# contains a "debug;X;optimized;Y" list like described in shiboken_check_if_limited_api,
|
||||
--
|
||||
2.46.1
|
||||
|
||||
|
@ -26,11 +26,11 @@ without the first one being processed yet.
|
||||
|
||||
Submitted to upstream in https://codereview.qt-project.org/c/pyside/pyside-setup/+/567559
|
||||
|
||||
Index: pyside-setup-everywhere-src-6.7.1/sources/pyside6/libpyside/pysidesignal.cpp
|
||||
===================================================================
|
||||
--- pyside-setup-everywhere-src-6.7.1.orig/sources/pyside6/libpyside/pysidesignal.cpp
|
||||
+++ pyside-setup-everywhere-src-6.7.1/sources/pyside6/libpyside/pysidesignal.cpp
|
||||
@@ -718,7 +718,7 @@ static PyObject *signalInstanceDisconnec
|
||||
diff --git a/sources/pyside6/libpyside/pysidesignal.cpp b/sources/pyside6/libpyside/pysidesignal.cpp
|
||||
index 13d95fa..228f1e3 100644
|
||||
--- a/sources/pyside6/libpyside/pysidesignal.cpp
|
||||
+++ b/sources/pyside6/libpyside/pysidesignal.cpp
|
||||
@@ -715,7 +715,7 @@ static PyObject *signalInstanceDisconnect(PyObject *self, PyObject *args)
|
||||
Shiboken::AutoDecRef pyMethod(PyObject_GetAttr(source->d->source,
|
||||
PySide::PySideName::qtDisconnect()));
|
||||
PyObject *result = PyObject_CallObject(pyMethod, tupleArgs);
|
||||
|
BIN
pyside-setup-everywhere-src-6.7.2.tar.xz
(Stored with Git LFS)
BIN
pyside-setup-everywhere-src-6.7.2.tar.xz
(Stored with Git LFS)
Binary file not shown.
BIN
pyside-setup-everywhere-src-6.8.1.1.tar.xz
(Stored with Git LFS)
Normal file
BIN
pyside-setup-everywhere-src-6.8.1.1.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,55 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 14 09:31:54 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 6.8.1.1. Check the installed changes-6.8.1 file for the
|
||||
full list of changes
|
||||
- Drop patches, merged upstream:
|
||||
* 0001-PySide6-Documentation-Name-the-.rst-doc-files-accord.patch
|
||||
* 0001-build-Install-module-doc-snippet-files.patch
|
||||
- Drop 0001-signature-Fix-pointers-to-signature-bytes-with-the-h.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 8 09:58:04 UTC 2024 - Nico Krapp <nico.krapp@suse.com>
|
||||
|
||||
- Update to 6.8.0.2
|
||||
- Support lazy nested types.
|
||||
- Provide __all__ only on demand.
|
||||
- Handle correctly callback dynamic slots that fail.
|
||||
- Small fixes.
|
||||
- Drop patch, merged upstream:
|
||||
* 0001-Lazy-Init-Support-Lazy-Subtypes-amended.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 26 21:29:14 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Add patches to fix issue found by the KDE CI (PYSIDE-2893)
|
||||
* 0001-PySide6-Documentation-Name-the-.rst-doc-files-accord.patch
|
||||
* 0001-build-Install-module-doc-snippet-files.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 14 11:35:35 UTC 2024 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
- Add patch to fix shiboken on 32bit platforms:
|
||||
* 0001-signature-Fix-pointers-to-signature-bytes-with-the-h.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 14 06:45:34 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Add upstream change:
|
||||
* 0001-Lazy-Init-Support-Lazy-Subtypes-amended.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 10 20:20:00 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 6.8.0. Check the installed changes-6.8.0 file for the
|
||||
full list of changes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 28 08:37:04 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 6.7.3. Check the installed changes-6.7.3 file for the
|
||||
full list of changes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 5 19:17:03 UTC 2024 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
%define tar_name pyside-setup-everywhere-src
|
||||
%define short_version 6.7
|
||||
%define tar_version 6.8.1.1
|
||||
|
||||
%global flavor @BUILD_FLAVOR@%{nil}
|
||||
%if "%flavor" == ""
|
||||
@ -43,12 +43,12 @@ ExclusiveArch: donotbuild
|
||||
%endif
|
||||
|
||||
Name: %{mypython}-%{pyside_flavor}
|
||||
Version: 6.7.2
|
||||
Version: 6.8.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
|
||||
URL: https://www.qt.io
|
||||
Source: https://download.qt.io/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}-%{tar_version}.tar.xz
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch0: 0001-Always-link-to-python-libraries.patch
|
||||
# PATCH-FIX-UPSTREAM https://codereview.qt-project.org/c/pyside/pyside-setup/+/567559
|
||||
@ -71,10 +71,7 @@ BuildRequires: pkgconfig(libxslt)
|
||||
# /SECTION
|
||||
%if "%{pyside_flavor}" == "pyside6"
|
||||
# For the registry_existence test
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150500
|
||||
# Not available in 15.5
|
||||
BuildRequires: %{mypython}-distro
|
||||
%endif
|
||||
BuildRequires: %{mypython}-shiboken6-devel = %{version}
|
||||
# SECTION test_dependencies
|
||||
BuildRequires: Mesa-dri
|
||||
@ -248,7 +245,7 @@ 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: 2024-05-27)
|
||||
# Excluded tests (last update: 2024-09-28)
|
||||
# QtWebEngineWidgets_pyside-474-qtwebengineview fails with 'ContextResult::kTransientFailure: Failed to send GpuControl.CreateCommandBuffer'
|
||||
# QtGui_qpen_test times out
|
||||
# QtMultimediaWidgets_qmultimediawidgets aborts
|
||||
@ -260,13 +257,10 @@ ctest_exclude_regex="smart_smart_pointer"
|
||||
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|pyside6-android-deploy_test_pyside6_android_deploy|qoperatingsystemversion"
|
||||
|
||||
# registry_existence_test randomly times out and QtWebEngineCore_web_engine_custom_scheme asserts
|
||||
# QtWebEngineCore_qwebenginecookiestore_test fails with a mesa error ('MESA: error: ZINK: vkCreateInstance failed (VK_ERROR_INCOMPATIBLE_DRIVER)')
|
||||
# QtWebEngineCore_qwebenginecookiestore_test, pysidetest_new_inherited_functions_test fail with a mesa error ('MESA: error: ZINK: vkCreateInstance failed (VK_ERROR_INCOMPATIBLE_DRIVER)')
|
||||
# QtWidgets_bug_668, QtWidgets_bug_728 segfault
|
||||
%ifarch aarch64
|
||||
ctest_exclude_regex="$ctest_exclude_regex|registry_existence_test|QtWebEngineCore_web_engine_custom_scheme|QtWebEngineCore_qwebenginecookiestore_test"
|
||||
%endif
|
||||
# python311-distro is unavailable in 15.5, skip registry_existence_test
|
||||
%if 0%{?sle_version} == 150500
|
||||
ctest_exclude_regex="$ctest_exclude_regex|registry_existence_test"
|
||||
ctest_exclude_regex="$ctest_exclude_regex|registry_existence_test|QtWebEngineCore_web_engine_custom_scheme|QtWebEngineCore_qwebenginecookiestore_test|pysidetest_new_inherited_functions_test|QtWidgets_bug_668|QtWidgets_bug_728"
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user