From 7d47f027e89351b4987e9f555bfc8172661484faa115c1a116ce5e723fec2811 Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe+obs@krop.fr>
Date: Sat, 22 Apr 2023 15:03:33 +0000
Subject: [PATCH] Accepting request 1082177 from home:krop:Qt6:Extra

- 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
---
 ...uild-when-using-QT_FEATURE_opengles2.patch | 45 +++++++++++++++++++
 python3-pyside6.changes                       |  6 +++
 python3-pyside6.spec                          |  2 +
 3 files changed, 53 insertions(+)
 create mode 100644 0001-Fix-build-when-using-QT_FEATURE_opengles2.patch

diff --git a/0001-Fix-build-when-using-QT_FEATURE_opengles2.patch b/0001-Fix-build-when-using-QT_FEATURE_opengles2.patch
new file mode 100644
index 0000000..a92fc23
--- /dev/null
+++ b/0001-Fix-build-when-using-QT_FEATURE_opengles2.patch
@@ -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
+
diff --git a/python3-pyside6.changes b/python3-pyside6.changes
index 6a7e31a..0c24e09 100644
--- a/python3-pyside6.changes
+++ b/python3-pyside6.changes
@@ -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>
 
diff --git a/python3-pyside6.spec b/python3-pyside6.spec
index 0c700de..fb9a71e 100644
--- a/python3-pyside6.spec
+++ b/python3-pyside6.spec
@@ -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
 # 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