diff --git a/community/shiboken2-pyside2/README.md b/community/shiboken2-pyside2/README.md deleted file mode 100644 index f9794936..00000000 --- a/community/shiboken2-pyside2/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# shiboken2-pyside2 - -## Installation - -In order to build this package, you need to build qt5 with accessibility -support, otherwise the build will fail. If there is a fix found, this -readme will be updated accordingly. - -To build 'qt5' with accessibility, run the following commands: - -`$ kiss fork qt5; cd qt5; sed -i '/access/d' build; kiss build` - diff --git a/community/shiboken2-pyside2/build b/community/shiboken2-pyside2/build deleted file mode 100755 index 95f0bd52..00000000 --- a/community/shiboken2-pyside2/build +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -e - -export DESTDIR="$1" - -for p in *.patch; do - patch -p1 < "$p" -done - -cmake -B build \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=None \ - -DBUILD_TESTS=OFF \ - -DUSE_PYTHON_VERSION=3 - -# This is extraoridinarily hacky... -# But there is no other way to get this thing to build properly. -# This is because the two are mutual dependencies of each other. -cmake --build build || : -cmake --install build || : diff --git a/community/shiboken2-pyside2/checksums b/community/shiboken2-pyside2/checksums deleted file mode 100644 index ec30143f..00000000 --- a/community/shiboken2-pyside2/checksums +++ /dev/null @@ -1,3 +0,0 @@ -1f42306f5096d19904b1d74b29eeef23dbb36d3658685f2bd36544a911c7c0b40d -50bf5eb049cff5017aea5c60a086dada07e44f987abfe20d9dd5f443271d24d107 -56ad5b48bab883d6cfd80a00efcc219610a4b5ea66abffea5195749806e38989c3 diff --git a/community/shiboken2-pyside2/depends b/community/shiboken2-pyside2/depends deleted file mode 100644 index 17439ab2..00000000 --- a/community/shiboken2-pyside2/depends +++ /dev/null @@ -1,6 +0,0 @@ -clang -cmake make -libxml2 -libxslt -qt5 -qt5-xmlpatterns diff --git a/community/shiboken2-pyside2/esources b/community/shiboken2-pyside2/esources deleted file mode 100644 index e08da176..00000000 --- a/community/shiboken2-pyside2/esources +++ /dev/null @@ -1,3 +0,0 @@ -https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-VERSION-src/pyside-setup-opensource-src-VERSION.tar.xz -patches/numpy-1.23.patch -patches/py3.11.patch diff --git a/community/shiboken2-pyside2/patches/numpy-1.23.patch b/community/shiboken2-pyside2/patches/numpy-1.23.patch deleted file mode 100644 index eb186376..00000000 --- a/community/shiboken2-pyside2/patches/numpy-1.23.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp b/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp -index 996968f..a072dfd 100644 ---- a/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp -+++ b/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp -@@ -116,8 +116,8 @@ std::ostream &operator<<(std::ostream &str, PyArrayObject *o) - str << " NPY_ARRAY_NOTSWAPPED"; - if ((flags & NPY_ARRAY_WRITEABLE) != 0) - str << " NPY_ARRAY_WRITEABLE"; -- if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0) -- str << " NPY_ARRAY_UPDATEIFCOPY"; -+ if ((flags & NPY_ARRAY_WRITEBACKIFCOPY) != 0) -+ str << " NPY_ARRAY_WRITEBACKIFCOPY"; - } else { - str << '0'; - } diff --git a/community/shiboken2-pyside2/patches/py3.11.patch b/community/shiboken2-pyside2/patches/py3.11.patch deleted file mode 100644 index 6469ea74..00000000 --- a/community/shiboken2-pyside2/patches/py3.11.patch +++ /dev/null @@ -1,161 +0,0 @@ -From b64ad27d8dfeeecaaa8a98051252a32c9d998df4 Mon Sep 17 00:00:00 2001 -From: Friedemann Kleint -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 -Reviewed-by: Qt CI Bot ---- - sources/shiboken2/libshiboken/basewrapper.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build_scripts/config.py b/build_scripts/config.py -index 00cbd3f..63e52a2 100644 ---- a/build_scripts/config.py -+++ b/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 -diff --git a/sources/pyside2/libpyside/pysideqflags.cpp b/sources/pyside2/libpyside/pysideqflags.cpp -index 8b224f2..784082a 100644 ---- a/sources/pyside2/libpyside/pysideqflags.cpp -+++ b/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(type); - PepType_PFTP(flagsType)->converterPtr = &PepType_PFTP(flagsType)->converter; -diff --git a/sources/pyside2/libpyside/pysidesignal.cpp b/sources/pyside2/libpyside/pysidesignal.cpp -index b5069a0..ce89a9d 100644 ---- a/sources/pyside2/libpyside/pysidesignal.cpp -+++ b/sources/pyside2/libpyside/pysidesignal.cpp -@@ -162,7 +162,7 @@ PyTypeObject *PySideSignalTypeF(void) - if (!type) { - type = reinterpret_cast(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); - } -diff --git a/sources/pyside2/libpyside/pysideweakref.cpp b/sources/pyside2/libpyside/pysideweakref.cpp -index cd90634..730990f 100644 ---- a/sources/pyside2/libpyside/pysideweakref.cpp -+++ b/sources/pyside2/libpyside/pysideweakref.cpp -@@ -90,7 +90,7 @@ PyObject *create(PyObject *obj, PySideWeakRefFunction func, void *userData) - - if (Py_TYPE(PySideCallableObjectTypeF()) == 0) - { -- Py_TYPE(PySideCallableObjectTypeF()) = &PyType_Type; -+ Py_SET_TYPE(PySideCallableObjectTypeF(), &PyType_Type); - PyType_Ready(PySideCallableObjectTypeF()); - } - -diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp -index 7ac7fad..e2eccd0 100644 ---- a/sources/shiboken2/libshiboken/basewrapper.cpp -+++ b/sources/shiboken2/libshiboken/basewrapper.cpp -@@ -377,7 +377,7 @@ SbkObjectType *SbkObject_TypeF(void) - static PyTypeObject *type = nullptr; - if (!type) { - type = reinterpret_cast(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 *enclosingObject, - typeSpec->slots[0].pfunc = reinterpret_cast(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(heaptype); - #if PY_VERSION_HEX < 0x03000000 -@@ -1525,6 +1525,7 @@ bool setCppPointer(SbkObject *sbkObj, PyTypeObject *desiredType, void *cptr) - bool isValid(PyObject *pyObj) - { - if (!pyObj || pyObj == Py_None -+ || PyType_Check(pyObj) != 0 - || Py_TYPE(Py_TYPE(pyObj)) != SbkObjectType_TypeF()) { - return true; - } -diff --git a/sources/shiboken2/libshiboken/sbkenum.cpp b/sources/shiboken2/libshiboken/sbkenum.cpp -index 7dc73df..9459e42 100644 ---- a/sources/shiboken2/libshiboken/sbkenum.cpp -+++ b/sources/shiboken2/libshiboken/sbkenum.cpp -@@ -754,7 +754,7 @@ newTypeWithName(const char *name, - PyTuple_SetItem(bases, 0, reinterpret_cast(basetype)); - auto *type = reinterpret_cast(SbkType_FromSpecWithBases(&newspec, bases)); - PyErr_Print(); -- Py_TYPE(type) = SbkEnumType_TypeF(); -+ Py_SET_TYPE(type, SbkEnumType_TypeF()); - - auto *enumType = reinterpret_cast(type); - PepType_SETP(enumType)->cppName = cppName; -diff --git a/sources/shiboken2/libshiboken/sbkstring.cpp b/sources/shiboken2/libshiboken/sbkstring.cpp -index 077fb53..a9d451c 100644 ---- a/sources/shiboken2/libshiboken/sbkstring.cpp -+++ b/sources/shiboken2/libshiboken/sbkstring.cpp -@@ -41,8 +41,14 @@ - #include "sbkstaticstrings_p.h" - #include "autodecref.h" - --#include --#include -+#if PY_VERSION_HEX >= 0x030B0000 || defined(Py_LIMITED_API) -+# define USE_INTERN_STRINGS -+#endif -+ -+#ifndef USE_INTERN_STRINGS -+# include -+# include -+#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; - - static void finalizeStaticStrings(); // forward -@@ -283,6 +296,8 @@ PyObject *createStaticString(const char *str) - return result; - } - -+#endif // !USE_INTERN_STRINGS -+ - /////////////////////////////////////////////////////////////////////// - // - // PYSIDE-1019: Helper function for snake_case vs. camelCase names diff --git a/community/shiboken2-pyside2/sources b/community/shiboken2-pyside2/sources deleted file mode 100644 index b8e8f9cd..00000000 --- a/community/shiboken2-pyside2/sources +++ /dev/null @@ -1,3 +0,0 @@ -https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.7-src/pyside-setup-opensource-src-5.15.7.tar.xz -patches/numpy-1.23.patch -patches/py3.11.patch diff --git a/community/shiboken2-pyside2/version b/community/shiboken2-pyside2/version deleted file mode 100644 index 29d70a1e..00000000 --- a/community/shiboken2-pyside2/version +++ /dev/null @@ -1 +0,0 @@ -5.15.7 1