1
0

Accepting request 1132322 from KDE:Qt6

Update to 6.6.1 (forwarded request 1131610 from krop)

OBS-URL: https://build.opensuse.org/request/show/1132322
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python3-pyside6?expand=0&rev=24
This commit is contained in:
Ana Guerrero 2023-12-10 18:40:16 +00:00 committed by Git OBS Bridge
commit bb5055c374
5 changed files with 14 additions and 33 deletions

View File

@ -1,23 +0,0 @@
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

View File

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

BIN
pyside-setup-everywhere-src-6.6.1.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Dec 7 10:54:43 UTC 2023 - Christophe Marin <christophe@krop.fr>
- Update to 6.6.1. Check the installed changes-6.6.0 file for the
full list of changes
- Drop patch, merged upstream:
* 0001-Fix-QtAsyncio-install-dir.patch
-------------------------------------------------------------------
Tue Oct 17 10:35:38 UTC 2023 - Christophe Marin <christophe@krop.fr>

View File

@ -26,7 +26,7 @@
%endif
#
Name: python3-%{pyside_flavor}
Version: 6.6.0
Version: 6.6.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
@ -34,8 +34,6 @@ 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-Always-link-to-python-libraries.patch
# PATCH-FIX-UPSTREAM
Patch1: 0001-Fix-QtAsyncio-install-dir.patch
# SECTION common_dependencies
BuildRequires: clang-devel
BuildRequires: fdupes
@ -44,6 +42,7 @@ BuildRequires: python-rpm-macros
BuildRequires: python3-Sphinx
BuildRequires: python3-devel >= 3.7
BuildRequires: python3-numpy-devel
BuildRequires: python3-setuptools
BuildRequires: qt6-macros
BuildRequires: cmake(Qt6Core)
BuildRequires: cmake(Qt6Test)
@ -133,7 +132,7 @@ Requires: %{name} = %{version}
Python bindings for the Qt cross-platform application and UI framework
%prep
%autosetup -p1 -n %{tar_name}-%{short_version}
%autosetup -p1 -n %{tar_name}-%{version}
%build
_libsuffix=$(echo %{_lib} | cut -b4-)
@ -183,9 +182,6 @@ rm %{buildroot}%{_datadir}/PySide6/typesystems/*_{mac,win}.xml
%fdupes -s %{buildroot}%{python_sitearch}/PySide6
mkdir -p %{buildroot}%{_qt6_pluginsdir}/designer
mv %{buildroot}%{_prefix}/plugins/designer/libPySidePlugin.so %{buildroot}%{_qt6_pluginsdir}/designer
%endif
# Install egg-info
# qtpaths is needed