From f7aa130a2b0a344b064fef3c977295bd4fbd04eb Mon Sep 17 00:00:00 2001 From: yopito Date: Sun, 10 May 2020 17:03:24 +0200 Subject: [PATCH] pyside2-tools: update to 5.14.2.1 [ci skip] --- .../patches/dont-install-symlinks.patch | 46 +++++++++++++++++++ srcpkgs/pyside2-tools/template | 30 +++++------- 2 files changed, 57 insertions(+), 19 deletions(-) create mode 100644 srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch diff --git a/srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch b/srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch new file mode 100644 index 00000000000..9f1bd43c312 --- /dev/null +++ b/srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch @@ -0,0 +1,46 @@ +don't install these symlinks, it's not pyside2-tools business: +* /usr/bin/designer -> /usr/bin/qtchooser +* /usr/bin/rcc -> /usr/bin/qtchooser +* /usr/bin/uic -> /usr/bin/qtchooser + +--- sources/pyside2-tools/CMakeLists.txt.ORIG ++++ sources/pyside2-tools/CMakeLists.txt +@@ -55,38 +55,6 @@ + set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}") + endif() + +-install(FILES "${UIC_PATH}" +- DESTINATION bin +- PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ +- WORLD_EXECUTE WORLD_READ) +- +-install(FILES "${RCC_PATH}" +- DESTINATION bin +- PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ +- WORLD_EXECUTE WORLD_READ) +- +-if (EXISTS ${DESIGNER_PATH}) +- if (APPLE) +- install(DIRECTORY "${DESIGNER_PATH}" +- DESTINATION bin +- FILE_PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ +- WORLD_EXECUTE WORLD_READ) +- else() +- install(FILES "${DESIGNER_PATH}" +- DESTINATION bin +- PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ +- WORLD_EXECUTE WORLD_READ) +- endif() +-endif() +- + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY) diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template index e7f10cbee4f..1141a572a1f 100644 --- a/srcpkgs/pyside2-tools/template +++ b/srcpkgs/pyside2-tools/template @@ -1,14 +1,13 @@ # Template file for 'pyside2-tools' -# XXX keep pyside2-tools version 5.13.2 to support Qt 5.13.2: -# pyside2-tools 5.14 rely on rcc and ui tools provided by Qt 5.14 pkgname=pyside2-tools -version=5.13.2 +version=5.14.2.1 revision=1 _pkgname="pyside-setup-opensource-src-${version}" -wrksrc="$_pkgname" -configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release - -DBUILD_TESTS=OFF" -hostmakedepends="cmake python3-devel" +wrksrc="${_pkgname/%5.14.2.1/5.14.2}" +build_wrksrc="sources/pyside2-tools" +build_style=cmake +configure_args="-DBUILD_TESTS=OFF" +hostmakedepends="cmake python3-devel shiboken2" makedepends="python3-devel libshiboken2-devel qt5-devel libpyside2-python3-devel" short_desc="Python3 bindings for the Qt5 toolkit" @@ -16,18 +15,11 @@ maintainer="yopito " license="LGPL-3.0-or-later" homepage="https://wiki.qt.io/Qt_for_Python/Shiboken" distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz" -checksum=3e255d64df08880d0281ebe86009d5ea45f24332b308954d967c33995f75e543 +checksum=11f48956208a487dabf6f531e60fb88ad0e48f2979cfc9e79c1c986387c491fa python_version=3 -do_build() { - [ ! -d build ] && mkdir build - pushd build - export CLANG_INSTALL_DIR=/usr - cmake ../sources/pyside2-tools ${configure_args} - make ${makejobs} - popd -} +export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -do_install() { - make -C build DESTDIR=${DESTDIR} install -} +if [ ${CROSS_BUILD} ]; then + hostmakedepends+=" qt5-qmake qt5-host-tools" +fi