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..7e92aab --- /dev/null +++ b/0001-Fix-build-when-using-QT_FEATURE_opengles2.patch @@ -0,0 +1,45 @@ +From 2369e85c53bfc3a0d0c55173ac31c87945bb03ee Mon Sep 17 00:00:00 2001 +From: Christophe Marin +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 ++#elif QT_CONFIG(opengl) && !defined(ANDROID) + # include + # include + # include +@@ -33,6 +35,3 @@ + # include + # include + #endif +-#if QT_CONFIG(opengles2) +-# include +-#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 + +- 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 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