Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python3-pyside6 for openSUSE:Factory
checked in at 2023-04-22 22:03:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-pyside6 (Old)
and /work/SRC/openSUSE:Factory/.python3-pyside6.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-pyside6"
Sat Apr 22 22:03:44 2023 rev:17 rq:1082196 version:6.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-pyside6/python3-pyside6.changes
2023-04-09 18:43:18.766530726 +0200
+++
/work/SRC/openSUSE:Factory/.python3-pyside6.new.1533/python3-pyside6.changes
2023-04-22 22:04:05.958521776 +0200
@@ -1,0 +2,6 @@
+Sat Apr 22 08:38:24 UTC 2023 - Christophe Marin <[email protected]>
+
+- Add patch to fix build on arm (boo#1210723):
+ * 0001-Fix-build-when-using-QT_FEATURE_opengles2.patch
+
+-------------------------------------------------------------------
New:
----
0001-Fix-build-when-using-QT_FEATURE_opengles2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-pyside6.spec ++++++
--- /var/tmp/diff_new_pack.r6l2p7/_old 2023-04-22 22:04:06.506525053 +0200
+++ /var/tmp/diff_new_pack.r6l2p7/_new 2023-04-22 22:04:06.514525100 +0200
@@ -34,6 +34,8 @@
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-build-when-using-QT_FEATURE_opengles2.patch
# SECTION common_dependencies
# boo#1210176 - PYSIDE-2268
BuildRequires: clang15-devel
++++++ 0001-Fix-build-when-using-QT_FEATURE_opengles2.patch ++++++
>From 2369e85c53bfc3a0d0c55173ac31c87945bb03ee Mon Sep 17 00:00:00 2001
From: Christophe Marin <[email protected]>
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
