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

Accepting request 1082177 from home:krop:Qt6:Extra

Browse Source 
- Add patch to fix build on arm (boo#1210723):
  * 0001-Fix-build-when-using-QT_FEATURE_opengles2.patch

OBS-URL: https://build.opensuse.org/request/show/1082177
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=35
This commit is contained in:
Christophe Marin 2023-04-22 15:03:33 +00:00 committed by Git OBS Bridge
parent 6177bae45a
commit 7d47f027e8
3 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
0001-Fix-build-when-using-QT_FEATURE_opengles2.patch Normal file
View File

@ -0,0 +1,45 @@
From 394dd41ae732157df5e9f48a50de40746527d745 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 means 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: 6d6f614f
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

6
python3-pyside6.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Apr 22 08:38:24 UTC 2023 - Christophe Marin <christophe@krop.fr>
- Add patch to fix build on arm (boo#1210723):
* 0001-Fix-build-when-using-QT_FEATURE_opengles2.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 4 23:22:25 UTC 2023 - Christophe Marin <christophe@krop.fr> Tue Apr 4 23:22:25 UTC 2023 - Christophe Marin <christophe@krop.fr>

2
python3-pyside6.spec
View File

@ -34,6 +34,8 @@ 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}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE
Patch0: 0001-Always-link-to-python-libraries.patch Patch0: 0001-Always-link-to-python-libraries.patch
# PATCH-FIX-UPSTREAM
Patch1: 0001-Fix-build-when-using-QT_FEATURE_opengles2.patch
# SECTION common_dependencies # SECTION common_dependencies
# boo#1210176 - PYSIDE-2268 # boo#1210176 - PYSIDE-2268
BuildRequires: clang15-devel BuildRequires: clang15-devel