[neon/qt/pyside2/Neon/unstable] debian: Backport upstream patch to fix GLES builds.

Dmitry Shachnev null at kde.org
Thu Jun 15 10:12:13 BST 2023


Git commit da923b146a238c857bd58baff0de8203f18dd29c by Dmitry Shachnev.
Committed on 07/01/2023 at 19:17.
Pushed by carlosdem into branch 'Neon/unstable'.

Backport upstream patch to fix GLES builds.

M  +6    -0    debian/changelog
A  +30   -0    debian/patches/Fix-GLES-builds.patch
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/pyside2/-/commit/da923b146a238c857bd58baff0de8203f18dd29c

diff --git a/debian/changelog b/debian/changelog
index 1cdbbaad..a81055ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pyside2 (5.15.8-2) UNRELEASED; urgency=medium
+
+  * Backport upstream patch to fix GLES builds.
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 07 Jan 2023 23:17:51 +0400
+
 pyside2 (5.15.8-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/Fix-GLES-builds.patch b/debian/patches/Fix-GLES-builds.patch
new file mode 100644
index 00000000..d5083b98
--- /dev/null
+++ b/debian/patches/Fix-GLES-builds.patch
@@ -0,0 +1,30 @@
+From: Friedemann Kleint <Friedemann.Kleint at qt.io>
+Date: Thu, 26 Aug 2021 13:41:25 +0200
+Subject: Fix GLES builds
+
+Add QOpenGLVersionFunctionsFactory to list of dropped entries.
+
+Fixes: PYSIDE-1636
+Pick-to: 6.1
+Change-Id: Ie203372c2d15776a466f0fa04fe32a777bf85e52
+Reviewed-by: Christophe Giboudeaux <christophe at krop.fr>
+Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes at qt.io>
+(cherry picked from commit e0848b2d644574e914d3f71c1fe4b309e39ac099)
+---
+ sources/pyside2/PySide2/QtGui/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
+index 88d8be9..b8ef288 100644
+--- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt
++++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
+@@ -227,7 +227,8 @@ endif()
+ list(FIND QtGui_enabled_features "opengles2" _opengles2Index)
+ # ### fixme: For cmake >= 3.3: if(opengles2 IN_LIST QtGui_enabled_features)
+ if(_opengles2Index GREATER -1)
+-    list(APPEND QtGui_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery)
++    list(APPEND QtGui_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery
++                QOpenGLVersionFunctionsFactory)
+     message(STATUS "Qt${QT_MAJOR_VERSION}Gui: Dropping Desktop OpenGL classes (GLES2)")
+ else()
+     list(APPEND QtGui_SRC
diff --git a/debian/patches/series b/debian/patches/series
index 84c00c4e..53267d91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ Fix-Property-GC-tracking-for-Python-3.11.patch
 make-wheels-compatible-with-Python-3.11.patch
 Revert-removal-of-version-check.patch
 importlib-machinery.patch
+Fix-GLES-builds.patch



More information about the Neon-commits mailing list