Date: Thursday, January 5, 2023 @ 09:09:37 Author: arojas Revision: 465632
archrelease: copy trunk to testing-x86_64 Added: pyside2/repos/testing-x86_64/PKGBUILD (from rev 465631, pyside2/trunk/PKGBUILD) pyside2/repos/testing-x86_64/fix-build.patch (from rev 465631, pyside2/trunk/fix-build.patch) pyside2/repos/testing-x86_64/limited-api.patch (from rev 465631, pyside2/trunk/limited-api.patch) Deleted: pyside2/repos/testing-x86_64/PKGBUILD pyside2/repos/testing-x86_64/fix-build.patch -------------------+ PKGBUILD | 227 ++++++++++++++++++++++++++-------------------------- fix-build.patch | 24 ++--- limited-api.patch | 12 ++ 3 files changed, 139 insertions(+), 124 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2023-01-05 09:09:23 UTC (rev 465631) +++ PKGBUILD 2023-01-05 09:09:37 UTC (rev 465632) @@ -1,112 +0,0 @@ -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Maintainer: Felix Yan <felixonm...@archlinux.org> - -pkgbase=pyside2 -pkgname=(shiboken2 python-shiboken2 pyside2 pyside2-tools) -_qtver=5.15.8 -_clangver=14.0.6 -pkgver=${_qtver/-/} -pkgrel=1 -arch=(x86_64) -url='https://www.qt.io' -license=(LGPL) -makedepends=(cmake python-setuptools llvm clang=$_clangver - qt5-multimedia qt5-tools qt5-sensors qt5-charts qt5-webengine qt5-datavis3d - qt5-websockets qt5-speech qt5-3d qt5-svg qt5-script qt5-scxml qt5-x11extras - qt5-quickcontrols2 qt5-serialport qt5-remoteobjects qt5-xmlpatterns) -optdepends=('qt5-svg: QtSvg bindings' - 'qt5-script: QtScript bindings' - 'qt5-speech: QtTextToSpeech bindings' - 'qt5-websockets: QtWebSockets bindings' - 'qt5-webengine: QtWebEngine bindings' - 'qt5-datavis3d: QtDataVisualization bindings' - 'qt5-scxml: QtScxml bindings' - 'qt5-sensors: QtSensors bindings' - 'qt5-3d: Qt3D bindings' - 'qt5-x11extras: QtX11Extras bindings' - 'qt5-charts: QtCharts bindings' - 'qt5-tools: QtHelp bindings' - 'qt5-remoteobjects: QtRemoteObjects 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) -sha256sums=('23436302c8deb5b4cbc769b205d09604e38ba83b40708efccb7bd8c9af6f6b5d' - '4f8815840b5df2e1e3b9f201a3402126821b0d9702920cefdc18050639143ad1') - -prepare() { - patch -d $_pkgfqn -p1 < fix-build.patch -} - -build() { - cmake -B build -S $_pkgfqn \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=None \ - -DBUILD_TESTS=OFF \ - -DFORCE_LIMITED_API=yes \ - -DPYTHON_EXECUTABLE=/usr/bin/python - cmake --build build -} - -package_shiboken2() { - pkgdesc='Generates bindings for C++ libraries using CPython source code' - depends=(clang=$_clangver llvm libxslt qt5-xmlpatterns) - - DESTDIR="$pkgdir" cmake --install build/sources/shiboken2 -# Provided in python-shiboken2 - rm -r "$pkgdir"/usr/lib/{python*,libshiboken*} -# Conflicts with shiboken6 and doesn't work anyway - rm "$pkgdir"/usr/bin/shiboken_tool.py -} - -package_python-shiboken2() { - pkgdesc='Python bindings for shiboken2' - depends=(python) - - DESTDIR="$pkgdir" cmake --install build/sources/shiboken2 -# Provided in shiboken2 - rm -r "$pkgdir"/usr/{bin,include,lib/{cmake,pkgconfig}} - -# Install egg-info - cd $_pkgfqn - python setup.py egg_info --build-type=shiboken2 - _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"` - cp -r shiboken2.egg-info "$pkgdir"/$_pythonpath -} - -package_pyside2() { - pkgdesc='Enables the use of Qt5 APIs in Python applications' - depends=(python-shiboken2 qt5-declarative) - optdepends=('qt5-svg: QtSvg bindings' - 'qt5-script: QtScript bindings' - 'qt5-speech: QtTextToSpeech bindings' - 'qt5-websockets: QtWebSockets bindings' - 'qt5-webengine: QtWebEngine bindings' - 'qt5-datavis3d: QtDataVisualization bindings' - 'qt5-scxml: QtScxml bindings' - 'qt5-sensors: QtSensors bindings' - 'qt5-3d: Qt3D bindings' - 'qt5-x11extras: QtX11Extras bindings' - 'qt5-charts: QtCharts bindings' - 'qt5-tools: QtHelp bindings' - 'qt5-remoteobjects: QtRemoteObjects bindings' - 'qt5-serialport: QtSerialPort bindings' - 'qt5-quickcontrols2: QtQuickControls2 bindings') - provides=(qt5-python-bindings) - - DESTDIR="$pkgdir" cmake --install build/sources/pyside2 -# Install egg-info - cd $_pkgfqn - python setup.py egg_info --build-type=pyside2 - _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"` - cp -r PySide2.egg-info "$pkgdir"/$_pythonpath -} - -package_pyside2-tools() { - pkgdesc='Tools for PySide2' - depends=(pyside2) - - DESTDIR="$pkgdir" cmake --install build/sources/pyside2-tools - rm "$pkgdir"/usr/bin/{rcc,uic,designer} # provided by qt5-base -} Copied: pyside2/repos/testing-x86_64/PKGBUILD (from rev 465631, pyside2/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2023-01-05 09:09:37 UTC (rev 465632) @@ -0,0 +1,115 @@ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgbase=pyside2 +pkgname=(shiboken2 python-shiboken2 pyside2 pyside2-tools) +_qtver=5.15.8 +_clangver=14.0.6 +pkgver=${_qtver/-/} +pkgrel=2 +arch=(x86_64) +url='https://www.qt.io' +license=(LGPL) +makedepends=(cmake python-setuptools llvm clang=$_clangver + qt5-multimedia qt5-tools qt5-sensors qt5-charts qt5-webengine qt5-datavis3d + qt5-websockets qt5-speech qt5-3d qt5-svg qt5-script qt5-scxml qt5-x11extras + qt5-quickcontrols2 qt5-serialport qt5-remoteobjects qt5-xmlpatterns) +optdepends=('qt5-svg: QtSvg bindings' + 'qt5-script: QtScript bindings' + 'qt5-speech: QtTextToSpeech bindings' + 'qt5-websockets: QtWebSockets bindings' + 'qt5-webengine: QtWebEngine bindings' + 'qt5-datavis3d: QtDataVisualization bindings' + 'qt5-scxml: QtScxml bindings' + 'qt5-sensors: QtSensors bindings' + 'qt5-3d: Qt3D bindings' + 'qt5-x11extras: QtX11Extras bindings' + 'qt5-charts: QtCharts bindings' + 'qt5-tools: QtHelp bindings' + 'qt5-remoteobjects: QtRemoteObjects 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) +sha256sums=('23436302c8deb5b4cbc769b205d09604e38ba83b40708efccb7bd8c9af6f6b5d' + '4f8815840b5df2e1e3b9f201a3402126821b0d9702920cefdc18050639143ad1' + '433b4fa26203ecabf6ac7d4288467a918a4fba91ef885b0a11c466aae99050cd') + +prepare() { + patch -d $_pkgfqn -p1 < fix-build.patch + patch -d $_pkgfqn -p1 < limited-api.patch +} + +build() { + cmake -B build -S $_pkgfqn \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=None \ + -DBUILD_TESTS=OFF \ + -DFORCE_LIMITED_API=yes \ + -DPYTHON_EXECUTABLE=/usr/bin/python + cmake --build build +} + +package_shiboken2() { + pkgdesc='Generates bindings for C++ libraries using CPython source code' + depends=(clang=$_clangver llvm libxslt qt5-xmlpatterns) + + DESTDIR="$pkgdir" cmake --install build/sources/shiboken2 +# Provided in python-shiboken2 + rm -r "$pkgdir"/usr/lib/{python*,libshiboken*} +# Conflicts with shiboken6 and doesn't work anyway + rm "$pkgdir"/usr/bin/shiboken_tool.py +} + +package_python-shiboken2() { + pkgdesc='Python bindings for shiboken2' + depends=(python) + + DESTDIR="$pkgdir" cmake --install build/sources/shiboken2 +# Provided in shiboken2 + rm -r "$pkgdir"/usr/{bin,include,lib/{cmake,pkgconfig}} + +# Install egg-info + cd $_pkgfqn + python setup.py egg_info --build-type=shiboken2 + _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"` + cp -r shiboken2.egg-info "$pkgdir"/$_pythonpath +} + +package_pyside2() { + pkgdesc='Enables the use of Qt5 APIs in Python applications' + depends=(python-shiboken2 qt5-declarative) + optdepends=('qt5-svg: QtSvg bindings' + 'qt5-script: QtScript bindings' + 'qt5-speech: QtTextToSpeech bindings' + 'qt5-websockets: QtWebSockets bindings' + 'qt5-webengine: QtWebEngine bindings' + 'qt5-datavis3d: QtDataVisualization bindings' + 'qt5-scxml: QtScxml bindings' + 'qt5-sensors: QtSensors bindings' + 'qt5-3d: Qt3D bindings' + 'qt5-x11extras: QtX11Extras bindings' + 'qt5-charts: QtCharts bindings' + 'qt5-tools: QtHelp bindings' + 'qt5-remoteobjects: QtRemoteObjects bindings' + 'qt5-serialport: QtSerialPort bindings' + 'qt5-quickcontrols2: QtQuickControls2 bindings') + provides=(qt5-python-bindings) + + DESTDIR="$pkgdir" cmake --install build/sources/pyside2 +# Install egg-info + cd $_pkgfqn + python setup.py egg_info --build-type=pyside2 + _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"` + cp -r PySide2.egg-info "$pkgdir"/$_pythonpath +} + +package_pyside2-tools() { + pkgdesc='Tools for PySide2' + depends=(pyside2) + + DESTDIR="$pkgdir" cmake --install build/sources/pyside2-tools + rm "$pkgdir"/usr/bin/{rcc,uic,designer} # provided by qt5-base +} Deleted: fix-build.patch =================================================================== --- fix-build.patch 2023-01-05 09:09:23 UTC (rev 465631) +++ fix-build.patch 2023-01-05 09:09:37 UTC (rev 465632) @@ -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) Copied: pyside2/repos/testing-x86_64/fix-build.patch (from rev 465631, pyside2/trunk/fix-build.patch) =================================================================== --- fix-build.patch (rev 0) +++ fix-build.patch 2023-01-05 09:09:37 UTC (rev 465632) @@ -0,0 +1,12 @@ +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) Copied: pyside2/repos/testing-x86_64/limited-api.patch (from rev 465631, pyside2/trunk/limited-api.patch) =================================================================== --- limited-api.patch (rev 0) +++ limited-api.patch 2023-01-05 09:09:37 UTC (rev 465632) @@ -0,0 +1,12 @@ +diff -ru pyside-setup-opensource-src-5.15.7/sources/shiboken2/libshiboken/pep384impl.cpp pyside-setup-opensource-src-5.15.8/sources/shiboken2/libshiboken/pep384impl.cpp +--- 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 ++#ifndef Py_LIMITED_API && PY_VERSION_HEX < 0x03010000 + return _Py_Mangle(privateobj, name); + #else + // PYSIDE-1436: _Py_Mangle is no longer exposed; implement it always.