diff options
Diffstat (limited to 'python/pyside2')
| -rw-r--r-- | python/pyside2/Modify-sendCommand-signatures.patch | 41 | ||||
| -rw-r--r-- | python/pyside2/pyside2.SlackBuild | 39 | ||||
| -rw-r--r-- | python/pyside2/pyside2.info | 8 |
3 files changed, 73 insertions, 15 deletions
diff --git a/python/pyside2/Modify-sendCommand-signatures.patch b/python/pyside2/Modify-sendCommand-signatures.patch new file mode 100644 index 0000000000..7465b109f8 --- /dev/null +++ b/python/pyside2/Modify-sendCommand-signatures.patch @@ -0,0 +1,41 @@ +From: Dmitry Shachnev <mitya57@debian.org> +Date: Sun, 4 Feb 2024 00:29:00 +0300 +Subject: Modify sendCommand signatures to use 0 as default value + +The original default value was QNodeCommand::CommandId(), and shiboken +copies it verbatim from the header file, however it does not work because +we do not generate "using namespace Qt3DCore;". + +0 is the same as QNodeCommand::CommandId(). +--- + sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml +index 8696a12..310595f 100644 +--- a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml ++++ b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml +@@ -58,6 +58,11 @@ + <object-type name="QAspectJob"/> + <object-type name="QBackendNode"> + <enum-type name="Mode"/> ++ <modify-function signature="sendCommand(const QString&,const QVariant&,unsigned long long)"> ++ <modify-argument index="3"> ++ <replace-default-expression with="0"/> ++ </modify-argument> ++ </modify-function> + </object-type> + <!-- TODO: Solve issues related to windows and a unresolved + external symbol +@@ -82,6 +87,11 @@ + </object-type> + <object-type name="QNode"> + <enum-type name="PropertyTrackingMode"/> ++ <modify-function signature="sendCommand(const QString&,const QVariant&,unsigned long long)"> ++ <modify-argument index="3"> ++ <replace-default-expression with="0"/> ++ </modify-argument> ++ </modify-function> + </object-type> + <object-type name="QNodeCommand" since="5.10"/> + <object-type name="QNodeCreatedChangeBase"/> diff --git a/python/pyside2/pyside2.SlackBuild b/python/pyside2/pyside2.SlackBuild index b1991bd9cf..94b1ffae07 100644 --- a/python/pyside2/pyside2.SlackBuild +++ b/python/pyside2/pyside2.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pyside2 -# Copyright 2021-2023 Christoph Willing Brisbane, Australia +# Copyright 2021-2025 Christoph Willing, Sydney Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,11 +26,16 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pyside2 SRCNAM=pyside-setup-opensource-src -VERSION=${VERSION:-5.15.10} +VERSION=${VERSION:-5.15.17} +SRCNAM_PATCHES=pyside2 +SRCNAM_PATCHES_VERSION=5.15.16-3.1 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +PYTHON_VERSION=${PYTHON_VERSION:-$(python3 -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')} +PYTHON_LIB_PATH=$(python3 -c "from sysconfig import get_path; print(get_path('platlib'))") + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -39,9 +44,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -65,6 +67,11 @@ else LIBDIRSUFFIX="" fi +cmake_policy_version="" +if pkg-config --atleast-version 1.2.14 alsa ; then + cmake_policy_version="-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ; +fi + set -e rm -rf $PKG @@ -72,7 +79,12 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-${VERSION%.*} tar xvf $CWD/$SRCNAM-$VERSION.tar.xz -cd $SRCNAM-${VERSION}/sources/$PRGNAM +cd $SRCNAM-${VERSION} + +tar xvf $CWD/${SRCNAM_PATCHES}_${SRCNAM_PATCHES_VERSION}.debian.tar.xz +while read -r patch ; do patch -Np1 -i debian/patches/$patch ; done <debian/patches/series +patch -Np1 < $CWD/Modify-sendCommand-signatures.patch + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -82,26 +94,29 @@ find -L . \ mkdir -p build cd build - export CC=/usr/bin/clang - export CXX=/usr/bin/clang++ cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=lib64 \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + $cmake_policy_version \ + -DUSE_PYTHON_VERSION=$PYTHON_VERSION \ -DBUILD_TESTS=OFF \ -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG + cmake --build sources/$PRGNAM + DESTDIR=$PKG cmake --install sources/$PRGNAM cd .. +python setup.py egg_info --build-type=pyside2 +mkdir -p $PKG/$PYTHON_LIB_PATH +mv PySide2.egg-info $PKG/$PYTHON_LIB_PATH/ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - COPYING doc/faq.rst doc \ + sources/$PRGNAM/{COPYING,doc} \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/python/pyside2/pyside2.info b/python/pyside2/pyside2.info index 25362e0b00..5e30fccd95 100644 --- a/python/pyside2/pyside2.info +++ b/python/pyside2/pyside2.info @@ -1,8 +1,10 @@ PRGNAM="pyside2" -VERSION="5.15.10" +VERSION="5.15.17" HOMEPAGE="https://wiki.qt.io/Qt_for_Python" -DOWNLOAD="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.10-src/pyside-setup-opensource-src-5.15.10.tar.xz" -MD5SUM="60441c2baeccb932ee0636034989ae57" +DOWNLOAD="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.17-src/pyside-setup-opensource-src-5.15.17.tar.xz \ + https://deb.debian.org/debian/pool/main/p/pyside2/pyside2_5.15.16-3.1.debian.tar.xz" +MD5SUM="706dfb88f55768f3944b0eb6737957b2 \ + 405c58187f66358ed7e1d323eebc3c6f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="shiboken2" |