Accepting request 986188 from home:cgiboudeaux:branches:KDE:Qt5

- 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
This commit is contained in:
Fabian Vogt 2022-07-01 09:47:44 +00:00 committed by Git OBS Bridge
parent 0445fede29
commit 5207deb475
5 changed files with 64 additions and 4 deletions

View File

@ -0,0 +1,45 @@
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c68ed0def4111ef5d0641370306338d277ae8983a77eaf22f223ddd3a14450b
size 3578184

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3920a4fb353300260c9bc46ff70f1fb975c5e7efa22e9d51222588928ce19b33
size 3577972

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Jul 1 08:06:29 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- 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
-------------------------------------------------------------------
Fri Jun 17 21:31:00 UTC 2022 - Ben Greiner <code@bnavigator.de>

View File

@ -22,7 +22,7 @@
%global __requires_exclude qmlimport\\((Charts|TextBalloonPlugin)
Name: python3-pyside2
Version: 5.15.4
Version: 5.15.5
Release: 0
Summary: Python bindings for Qt
# Legal:
@ -41,6 +41,8 @@ Patch1: 0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch
Patch2: 0001-cmake-Don-t-assume-qhelpgenerator-is-in-PATH.patch
# PATCH-FIX-UPSTREAM
Patch3: 0001-Backport-LLVM-13-fix-from-shiboken6.patch
# PATCH-FIX-UPSTREAM
Patch4: 0001-Backport-Fix-GLES-builds.patch
# Provide the PyPI names
Provides: python3-PySide2 = %{version}-%{release}
Provides: python3-shiboken2 = %{version}-%{release}