Accepting request 1090156 from KDE:Qt6

OBS-URL: https://build.opensuse.org/request/show/1090156
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python3-pyside6?expand=0&rev=19

0001-CMake-Fix-installation-of-pyi-files.patch

@@ -0,0 +1,37 @@
+From 7a3a196a7733e5af18881c22b9082bcc91f992ca Mon Sep 17 00:00:00 2001
+From: Christophe Marin <christophe@krop.fr>
+Date: Tue, 30 May 2023 11:02:03 +0200
+Subject: [PATCH] CMake: Fix installation of pyi files
+
+'file(GLOB ...)' cannot be used since these files are generated
+at build time.
+
+Patch by Julien Schueller.
+
+Fixes: PYSIDE-2184
+Pick-to: 6.5
+
+---
+ sources/pyside6/cmake/Macros/PySideModules.cmake | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/sources/pyside6/cmake/Macros/PySideModules.cmake b/sources/pyside6/cmake/Macros/PySideModules.cmake
+index d86b993..463c609 100644
+--- a/sources/pyside6/cmake/Macros/PySideModules.cmake
++++ b/sources/pyside6/cmake/Macros/PySideModules.cmake
+@@ -259,11 +259,7 @@ macro(create_pyside_module)
+                               ${generate_pyi_options})
+         add_dependencies("${module_NAME}_pyi" ${module_NAME})
+ 
+-        file(GLOB hinting_stub_files
+-             RELATIVE
+-                 "${CMAKE_CURRENT_BINARY_DIR}/PySide6"
+-                 "${CMAKE_CURRENT_BINARY_DIR}/PySide6/*.pyi")
+-        install(FILES ${hinting_stub_files}
++        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../${module_NAME}.pyi"
+                 DESTINATION "${PYTHON_SITE_PACKAGES}/PySide6")
+     endif()
+ 
+-- 
+2.40.1
+

0001-Fix-build-when-using-QT_FEATURE_opengles2.patch

@@ -1,45 +0,0 @@
-From 2369e85c53bfc3a0d0c55173ac31c87945bb03ee Mon Sep 17 00:00:00 2001
-From: Christophe Marin <christophe@krop.fr>
-Date: Sat, 22 Apr 2023 09:53:19 +0200
-Subject: [PATCH] Fix build when using QT_FEATURE_opengles2
-
-'QT_CONFIG(opengl)' doesn't necessarily mean all of the
-qopenglfunctions_* headers are present.
-
-That's not the case when QT_FEATURE_opengles2 is enabled. Only
-qopenglfunctions_es2.h is installed in this configuration.
-
-Amends: 6d6f614fdd7510a1b8a00a51bb6232a3d151523b
-
-Fixes: QTBUG-112708
-Pick-to: 6.5
-Change-Id: I00219554caf25e48236724c150f8bcd7fc9dc46c
----
- sources/pyside6/PySide6/QtOpenGL/QtOpenGL_global.post.h.in | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/sources/pyside6/PySide6/QtOpenGL/QtOpenGL_global.post.h.in b/sources/pyside6/PySide6/QtOpenGL/QtOpenGL_global.post.h.in
-index 3fdc1d4e1..c5b5ab293 100644
---- a/sources/pyside6/PySide6/QtOpenGL/QtOpenGL_global.post.h.in
-+++ b/sources/pyside6/PySide6/QtOpenGL/QtOpenGL_global.post.h.in
-@@ -4,7 +4,9 @@
- // OpenGL functions are not in the QtGui module header
- #cmakedefine ANDROID
- 
--#if QT_CONFIG(opengl) && !defined(ANDROID)
-+#if QT_CONFIG(opengles2)
-+#  include <QtOpenGL/qopenglfunctions_es2.h>
-+#elif QT_CONFIG(opengl) && !defined(ANDROID)
- #  include <QtOpenGL/qopenglfunctions_1_0.h>
- #  include <QtOpenGL/qopenglfunctions_1_1.h>
- #  include <QtOpenGL/qopenglfunctions_1_2.h>
-@@ -33,6 +35,3 @@
- #  include <QtOpenGL/qopenglfunctions_4_5_core.h>
- #  include <QtOpenGL/qopenglversionfunctionsfactory.h>
- #endif
--#if QT_CONFIG(opengles2)
--#  include <QtOpenGL/qopenglfunctions_es2.h>
--#endif
--- 
-2.40.0
-

pyside-setup-everywhere-src-6.5.0.tar.xz

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

pyside-setup-everywhere-src-6.5.1.tar.xz

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

python3-pyside6.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue May 30 08:23:43 UTC 2023 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.5.1. Check the installed changes-6.5.1 file for the
+  full list of changes
+- Drop patch, merged upstream:
+  * 0001-Fix-build-when-using-QT_FEATURE_opengles2.patch
+- Add patch:
+  * 0001-CMake-Fix-installation-of-pyi-files.patch
+
 -------------------------------------------------------------------
 Mon Apr 24 09:45:54 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
 

python3-pyside6.spec

@@ -26,7 +26,7 @@
 %endif
 #
 Name:           python3-%{pyside_flavor}
-Version:        6.5.0
+Version:        6.5.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,12 +35,9 @@ Source:         https://download.qt.io/official_releases/QtForPython/pyside6/PyS
 # PATCH-FIX-OPENSUSE
 Patch0:         0001-Always-link-to-python-libraries.patch
 # PATCH-FIX-UPSTREAM
-Patch1:         0001-Fix-build-when-using-QT_FEATURE_opengles2.patch
+Patch1:         0001-CMake-Fix-installation-of-pyi-files.patch
 # SECTION common_dependencies
-# boo#1210176 - PYSIDE-2268
+BuildRequires:  clang-devel
-BuildRequires:  clang15-devel
-BuildRequires:  llvm15-libclang13
-#!BuildIgnore:  clang16
 BuildRequires:  fdupes
 BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
@@ -134,7 +131,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-)
@@ -209,13 +206,18 @@ export LD_LIBRARY_PATH=%{buildroot}%{_qt6_libdir}:$LD_LIBRARY_PATH
 for dir in libminimal libother libsample libsmart; do
   export LD_LIBRARY_PATH=$PWD/sources/shiboken6/shiboken6/tests/$dir:$LD_LIBRARY_PATH
 done
+# 2023-05-30 Only fails on armv7l
+%ifarch armv7l armv7hl
+%define excluded_tests 1
+ctest_exclude_regex="smart_smart_pointer"
+%endif
 %endif
 
 %if "%{pyside_flavor}" == "pyside6"
 %define xvfb_command xvfb-run -s "-screen 0 1600x1200x16 -ac +extension GLX +render -noreset" \\
 
 %define excluded_tests 1
-# Excluded tests (last update: 2023-04-08)
+# Excluded tests (last update: 2023-05-30)
 # QtWebEngineWidgets_pyside-474-qtwebengineview fails with 'ContextResult::kTransientFailure: Failed to send GpuControl.CreateCommandBuffer'
 # QtGui_qpen_test times out
 # QtMultimediaWidgets_qmultimediawidgets aborts
@@ -227,6 +229,10 @@ ctest_exclude_regex="QtWebEngineWidgets_pyside-474-qtwebengineview|QtGui_qpen_te
 %ifarch aarch64
 ctest_exclude_regex="$ctest_exclude_regex|registry_existence_test|QtWebEngineCore_web_engine_custom_scheme"
 %endif
+# Test broken by https://codereview.qt-project.org/c/pyside/pyside-setup/+/478366
+%ifarch aarch64 armv7l armv7hl
+ctest_exclude_regex="$ctest_exclude_regex|QtOpenGL_qopenglwindow_test"
+%endif
 %endif
 
 pushd sources/%{pyside_flavor}