Fabian Vogt
5207deb475
- Update to 5.15.5
* Crashes in QClipboard.mimeData(), QTextCursor.currentList() and
QTextCursor.currentTable() have been fixed.
* Fixed issues where __feature__ was affected by other imports.
* Fixed crashes on QImage(uchar *) constructors, related to GIL
handling.
* QOpenGLPaintDevice has been added.
- Add patch to fix ARM build failures:
* 0001-Backport-Fix-GLES-builds.patch
OBS-URL: https://build.opensuse.org/request/show/986188
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=60
46 lines
2.3 KiB
Diff
46 lines
2.3 KiB
Diff
From b078923c003f0e6048c37a8a4b20415e4bec9c72 Mon Sep 17 00:00:00 2001
|
|
From: Christophe Giboudeaux <christophe@krop.fr>
|
|
Date: Fri, 1 Jul 2022 09:59:08 +0200
|
|
Subject: [PATCH] Backport: Fix GLES builds
|
|
|
|
Add QOpenGLVersionFunctionsFactory to list of dropped entries.
|
|
|
|
Backported from Ie203372c2d15776a466f0fa04fe32a777bf85e52
|
|
Task-number: PYSIDE-1636
|
|
|
|
Change-Id: I4507820eb0ac897abe8a3a28b3de16f3dd8250d5
|
|
---
|
|
sources/pyside2/PySide2/QtGui/CMakeLists.txt | 2 +-
|
|
sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
|
|
index c4a38a184..0306543ac 100644
|
|
--- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt
|
|
+++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
|
|
@@ -227,7 +227,7 @@ 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/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt b/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt
|
|
index 383afb68f..03c4fd046 100644
|
|
--- a/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt
|
|
+++ b/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt
|
|
@@ -11,7 +11,7 @@ set(QtOpenGLFunctions_SRC ${QtOpenGLFunctions_GEN_DIR}/qtopenglfunctions_module_
|
|
list(FIND QtOpenGLFunctions_enabled_features "opengles2" _opengles2Index)
|
|
# ### fixme: For cmake >= 3.3: if(opengles2 IN_LIST QtOpenGLFunctions_enabled_features)
|
|
if(_opengles2Index GREATER -1)
|
|
- list(APPEND QtOpenGLFunctions_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery)
|
|
+ list(APPEND QtOpenGLFunctions_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery QOpenGLVersionFunctionsFactory)
|
|
list(APPEND QtOpenGLFunctions_SRC
|
|
${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_es2_wrapper.cpp)
|
|
message(STATUS "Qt${QT_MAJOR_VERSION}OpenGLFunctions: Dropping Desktop OpenGL classes (GLES2)")
|
|
--
|
|
2.36.1
|
|
|