aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2023-10-16 15:06:02 +0200
committerBart Ribbers <bribbers@disroot.org>2023-10-16 15:04:34 +0000
commitaff604e9f4f41e8048df3a83b6e30093dee544f4 (patch)
tree205e8e2258cb3eab0d305e7a745ef30f22693b78
parenta87f67fcd8ee17e1f01a0d8efa65b34171fa4d3d (diff)
community/py3-pyside2: upgrade to 5.15.11
-rw-r--r--community/py3-pyside2/APKBUILD12
-rw-r--r--community/py3-pyside2/arm-gles2.patch29
-rw-r--r--community/py3-pyside2/py3.11.patch161
3 files changed, 3 insertions, 199 deletions
diff --git a/community/py3-pyside2/APKBUILD b/community/py3-pyside2/APKBUILD
index 951e9363932..c7eb151cac7 100644
--- a/community/py3-pyside2/APKBUILD
+++ b/community/py3-pyside2/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=py3-pyside2
-pkgver=5.15.10
+pkgver=5.15.11
pkgrel=0
pkgdesc="Enables the use of Qt5 APIs in Python applications"
url="https://doc.qt.io/qtforpython-5/"
@@ -44,11 +44,7 @@ armv7|aarch64|x86|x86_64)
;;
esac
subpackages="$pkgname-dev"
-source="
- https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-$pkgver-src/pyside-setup-opensource-src-$pkgver.tar.xz
- arm-gles2.patch
- py3.11.patch
- "
+source="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-$pkgver-src/pyside-setup-opensource-src-$pkgver.tar.xz"
builddir="$srcdir/pyside-setup-opensource-src-$pkgver"
options="!check" # Tests fail
@@ -75,7 +71,5 @@ package() {
}
sha512sums="
-dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2 pyside-setup-opensource-src-5.15.10.tar.xz
-0d00032e463485adb0377c07d3e47d04f0e5618cc9028a60a989709c3221c1e16681f8252515909eb2b7086fbcc65dd8e642a82f749ff0f9643a7f5e966824d5 arm-gles2.patch
-4d3d13b65c6954c9f8704b28c19e672f7179f87f5f78767330674b7a692467551c3a09ce487dac08f1c55dcc1a36c86097dbed7b9df96222f61b07b768908481 py3.11.patch
+377b3f6a793313cf7f5bea0dcef6630bac32d79b247e213d0b1b719805b35692aa8dd9a8896c75c6266f05af38809f574051d64b1a2f958a48c90167feccfb91 pyside-setup-opensource-src-5.15.11.tar.xz
"
diff --git a/community/py3-pyside2/arm-gles2.patch b/community/py3-pyside2/arm-gles2.patch
deleted file mode 100644
index bbec7708d4a..00000000000
--- a/community/py3-pyside2/arm-gles2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch-Source: https://www.mail-archive.com/commit@lists.opensuse.org/msg46683.html
-don't ask me how long it took me to figure this one out.
---
-diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
-index 88d8be9..38a0c1a 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 62ed669..208e76f 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)")
diff --git a/community/py3-pyside2/py3.11.patch b/community/py3-pyside2/py3.11.patch
deleted file mode 100644
index 311a240a2e5..00000000000
--- a/community/py3-pyside2/py3.11.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From b64ad27d8dfeeecaaa8a98051252a32c9d998df4 Mon Sep 17 00:00:00 2001
-From: Friedemann Kleint <Friedemann.Kleint@qt.io>
-Date: Thu, 9 Jun 2022 16:50:41 +0200
-Subject: [PATCH] libshiboken: Fix a crash in Shiboken::Object::isValid() for
- Python 3.11
-
-The function is passed type objects for class methods, which caused
-it to crash.
-
-The first clause did not catch this, and so it was cast to SbkObject
-below.
-
-Add a type check to prevent this.
-
-Pick-to: 6.3 6.2 5.15
-Task-number: PYSIDE-1960
-Change-Id: Icfdd6fefb7156ac5961444bd5395109849a1d66e
-Reviewed-by: Christian Tismer <tismer@stackless.com>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
----
- sources/shiboken2/libshiboken/basewrapper.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: pyside-setup-opensource-src-5.15.7/sources/shiboken2/libshiboken/basewrapper.cpp
-===================================================================
---- pyside-setup-opensource-src-5.15.7.orig/sources/shiboken2/libshiboken/basewrapper.cpp
-+++ pyside-setup-opensource-src-5.15.7/sources/shiboken2/libshiboken/basewrapper.cpp
-@@ -377,7 +377,7 @@ SbkObjectType *SbkObject_TypeF(void)
- static PyTypeObject *type = nullptr;
- if (!type) {
- type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&SbkObject_Type_spec));
-- Py_TYPE(type) = SbkObjectType_TypeF();
-+ Py_SET_TYPE(type, SbkObjectType_TypeF());
- Py_INCREF(Py_TYPE(type));
- type->tp_weaklistoffset = offsetof(SbkObject, weakreflist);
- type->tp_dictoffset = offsetof(SbkObject, ob_dict);
-@@ -1160,7 +1160,7 @@ introduceWrapperType(PyObject *enclosing
- typeSpec->slots[0].pfunc = reinterpret_cast<void *>(baseType ? baseType : SbkObject_TypeF());
-
- PyObject *heaptype = SbkType_FromSpecWithBases(typeSpec, baseTypes);
-- Py_TYPE(heaptype) = SbkObjectType_TypeF();
-+ Py_SET_TYPE(heaptype, SbkObjectType_TypeF());
- Py_INCREF(Py_TYPE(heaptype));
- auto *type = reinterpret_cast<SbkObjectType *>(heaptype);
- #if PY_VERSION_HEX < 0x03000000
-@@ -1525,6 +1525,7 @@ bool setCppPointer(SbkObject *sbkObj, Py
- bool isValid(PyObject *pyObj)
- {
- if (!pyObj || pyObj == Py_None
-+ || PyType_Check(pyObj) != 0
- || Py_TYPE(Py_TYPE(pyObj)) != SbkObjectType_TypeF()) {
- return true;
- }
-Index: pyside-setup-opensource-src-5.15.7/sources/pyside2/libpyside/pysideqflags.cpp
-===================================================================
---- pyside-setup-opensource-src-5.15.7.orig/sources/pyside2/libpyside/pysideqflags.cpp
-+++ pyside-setup-opensource-src-5.15.7/sources/pyside2/libpyside/pysideqflags.cpp
-@@ -192,7 +192,7 @@ namespace QFlags
- }
- newspec.slots = SbkNewQFlagsType_spec.slots;
- PyTypeObject *type = (PyTypeObject *)SbkType_FromSpec(&newspec);
-- Py_TYPE(type) = &PyType_Type;
-+ Py_SET_TYPE(type, &PyType_Type);
-
- PySideQFlagsType *flagsType = reinterpret_cast<PySideQFlagsType *>(type);
- PepType_PFTP(flagsType)->converterPtr = &PepType_PFTP(flagsType)->converter;
-Index: pyside-setup-opensource-src-5.15.7/sources/pyside2/libpyside/pysidesignal.cpp
-===================================================================
---- pyside-setup-opensource-src-5.15.7.orig/sources/pyside2/libpyside/pysidesignal.cpp
-+++ pyside-setup-opensource-src-5.15.7/sources/pyside2/libpyside/pysidesignal.cpp
-@@ -162,7 +162,7 @@ PyTypeObject *PySideSignalTypeF(void)
- if (!type) {
- type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&PySideSignalType_spec));
- PyTypeObject *hold = Py_TYPE(type);
-- Py_TYPE(type) = PySideMetaSignalTypeF();
-+ Py_SET_TYPE(type, PySideMetaSignalTypeF());
- Py_INCREF(Py_TYPE(type));
- Py_DECREF(hold);
- }
-Index: pyside-setup-opensource-src-5.15.7/sources/pyside2/libpyside/pysideweakref.cpp
-===================================================================
---- pyside-setup-opensource-src-5.15.7.orig/sources/pyside2/libpyside/pysideweakref.cpp
-+++ pyside-setup-opensource-src-5.15.7/sources/pyside2/libpyside/pysideweakref.cpp
-@@ -90,7 +90,7 @@ PyObject *create(PyObject *obj, PySideWe
-
- if (Py_TYPE(PySideCallableObjectTypeF()) == 0)
- {
-- Py_TYPE(PySideCallableObjectTypeF()) = &PyType_Type;
-+ Py_SET_TYPE(PySideCallableObjectTypeF(), &PyType_Type);
- PyType_Ready(PySideCallableObjectTypeF());
- }
-
-Index: pyside-setup-opensource-src-5.15.7/sources/shiboken2/libshiboken/sbkenum.cpp
-===================================================================
---- pyside-setup-opensource-src-5.15.7.orig/sources/shiboken2/libshiboken/sbkenum.cpp
-+++ pyside-setup-opensource-src-5.15.7/sources/shiboken2/libshiboken/sbkenum.cpp
-@@ -754,7 +754,7 @@ newTypeWithName(const char *name,
- PyTuple_SetItem(bases, 0, reinterpret_cast<PyObject *>(basetype));
- auto *type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpecWithBases(&newspec, bases));
- PyErr_Print();
-- Py_TYPE(type) = SbkEnumType_TypeF();
-+ Py_SET_TYPE(type, SbkEnumType_TypeF());
-
- auto *enumType = reinterpret_cast<SbkEnumType *>(type);
- PepType_SETP(enumType)->cppName = cppName;
-Index: pyside-setup-opensource-src-5.15.7/sources/shiboken2/libshiboken/sbkstring.cpp
-===================================================================
---- pyside-setup-opensource-src-5.15.7.orig/sources/shiboken2/libshiboken/sbkstring.cpp
-+++ pyside-setup-opensource-src-5.15.7/sources/shiboken2/libshiboken/sbkstring.cpp
-@@ -41,8 +41,14 @@
- #include "sbkstaticstrings_p.h"
- #include "autodecref.h"
-
--#include <vector>
--#include <unordered_set>
-+#if PY_VERSION_HEX >= 0x030B0000 || defined(Py_LIMITED_API)
-+# define USE_INTERN_STRINGS
-+#endif
-+
-+#ifndef USE_INTERN_STRINGS
-+# include <vector>
-+# include <unordered_set>
-+#endif
-
- namespace Shiboken
- {
-@@ -233,6 +239,13 @@ Py_ssize_t len(PyObject *str)
- // PyObject *attr = PyObject_GetAttr(obj, name());
- //
-
-+#ifdef USE_INTERN_STRINGS
-+PyObject *createStaticString(const char *str)
-+{
-+ return PyUnicode_InternFromString(str);
-+}
-+#else
-+
- using StaticStrings = std::unordered_set<PyObject *>;
-
- static void finalizeStaticStrings(); // forward
-@@ -283,6 +296,8 @@ PyObject *createStaticString(const char
- return result;
- }
-
-+#endif // !USE_INTERN_STRINGS
-+
- ///////////////////////////////////////////////////////////////////////
- //
- // PYSIDE-1019: Helper function for snake_case vs. camelCase names
-Index: pyside-setup-opensource-src-5.15.7/build_scripts/config.py
-===================================================================
---- pyside-setup-opensource-src-5.15.7.orig/build_scripts/config.py
-+++ pyside-setup-opensource-src-5.15.7/build_scripts/config.py
-@@ -94,6 +94,7 @@ class Config(object):
- 'Programming Language :: Python :: 3.8',
- 'Programming Language :: Python :: 3.9',
- 'Programming Language :: Python :: 3.10',
-+ 'Programming Language :: Python :: 3.11',
- ]
-
- self.setup_script_dir = None