author | Antonio Rojas
<arojas@archlinux.org> 2023-04-18 10:19:28 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2023-04-18 10:19:28 UTC |
parent | 55a3a2d5095c87d529001a53e5413b33b109ee5e |
PKGBUILD | +3 | -9 |
fix-build.patch | +0 | -12 |
limited-api.patch | +0 | -11 |
diff --git a/PKGBUILD b/PKGBUILD index 73403b9..096b1e4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ pkgname=(shiboken2 python-shiboken2 pyside2 pyside2-tools) _qtver=5.15.9 _clangver=15.0.7 pkgver=${_qtver/-/} -pkgrel=3 +pkgrel=4 arch=(x86_64) url='https://www.qt.io' license=(LGPL) @@ -30,18 +30,12 @@ optdepends=('qt5-svg: QtSvg bindings' 'qt5-serialport: QtSerialPort bindings' 'qt5-quickcontrols2: QtQuickControls2 bindings') _pkgfqn=pyside-setup-opensource-src-$_qtver -source=(https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-$pkgver-src/${_pkgfqn}.tar.xz - fix-build.patch - limited-api.patch +source=(https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-$pkgver-src/${_pkgfqn}-1.tar.xz python3.11.patch) -sha256sums=('2ea5917652036a9007d66ba4dc0aa75f381a3a25ccf0fa70fa2d9e9c8c9dacae' - '4f8815840b5df2e1e3b9f201a3402126821b0d9702920cefdc18050639143ad1' - '9d9b0d74b5159dbafd9e3c4cd794d84b671c299edab3cac1660f094e9a8791ea' +sha256sums=('3298660742037c71274a30770541abf6d1552ec65fc93678eedee5718852a62c' 'e91549f7d3da412e864af26f604d0023b80233a7165f50fa21e53cbe861db886') prepare() { - patch -d $_pkgfqn -p1 < fix-build.patch - patch -d $_pkgfqn -p1 < limited-api.patch patch -d $_pkgfqn -p1 < python3.11.patch # Fix build with Python 3.11 sed -e 's|0x030AFFFF|0x030BFFFF|' -i $_pkgfqn/sources/shiboken2/libshiboken/pep384impl.h } diff --git a/fix-build.patch b/fix-build.patch deleted file mode 100644 index f220279..0000000 --- a/fix-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru pyside-setup-opensource-src-5.15.6.orig/sources/shiboken2/libshiboken/embed/signature_bootstrap.py pyside-setup-opensource-src-5.15.6/sources/shiboken2/libshiboken/embed/signature_bootstrap.py ---- pyside-setup-opensource-src-5.15.6.orig/sources/shiboken2/libshiboken/embed/signature_bootstrap.py 2022-09-08 23:54:19.419724864 +0200 -+++ pyside-setup-opensource-src-5.15.6/sources/shiboken2/libshiboken/embed/signature_bootstrap.py 2022-09-08 23:55:04.494277606 +0200 -@@ -211,7 +211,7 @@ - return self if self._mod2path.get(fullname) else None - - def load_module(self, fullname): -- import importlib -+ import importlib.machinery - import sys - - filename = self._mod2path.get(fullname) diff --git a/limited-api.patch b/limited-api.patch deleted file mode 100644 index 9c0f834..0000000 --- a/limited-api.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pyside-setup-opensource-src-5.15.7/sources/shiboken2/libshiboken/pep384impl.cpp 2022-09-23 08:47:20.000000000 +0200 -+++ pyside-setup-opensource-src-5.15.8/sources/shiboken2/libshiboken/pep384impl.cpp 2023-01-04 08:07:17.000000000 +0100 -@@ -751,7 +751,7 @@ - #endif // IS_PY2 - Shiboken::AutoDecRef privateobj(PyObject_GetAttr( - reinterpret_cast<PyObject *>(Py_TYPE(self)), Shiboken::PyMagicName::name())); --#ifndef Py_LIMITED_API -+#if !defined(Py_LIMITED_API) && PY_VERSION_HEX < 0x03010000 - return _Py_Mangle(privateobj, name); - #else - // PYSIDE-1436: _Py_Mangle is no longer exposed; implement it always.