From b4d2573fbd9278fd6f04bd625f5dcc78c4b62c0d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Nov 2024 22:02:55 -0500 Subject: [PATCH] pyside2-tools: remove package no longer needed by any package --- .../patches/dont-install-symlinks.patch | 46 ------------------- .../patches/tests-use-qt5-rcc-and-uic.patch | 34 -------------- srcpkgs/pyside2-tools/template | 22 --------- srcpkgs/pyside2-tools/update | 3 -- srcpkgs/removed-packages/template | 1 + 5 files changed, 1 insertion(+), 105 deletions(-) delete mode 100644 srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch delete mode 100644 srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch delete mode 100644 srcpkgs/pyside2-tools/template delete mode 100644 srcpkgs/pyside2-tools/update diff --git a/srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch b/srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch deleted file mode 100644 index 9ba21ea664b..00000000000 --- a/srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 - ---- a/sources/pyside2-tools/CMakeLists.txt -+++ b/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/patches/tests-use-qt5-rcc-and-uic.patch b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch deleted file mode 100644 index 0ec2442b65f..00000000000 --- a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/sources/pyside2-tools/tests/CMakeLists.txt -+++ b/sources/pyside2-tools/tests/CMakeLists.txt -@@ -1,4 +1,11 @@ -+ -+# Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc, -+# with '-g python' option -+ -+FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic) -+FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc) -+ - add_subdirectory(rcc) --add_test(QWizard ${SHIBOKEN_PYTHON_INTERPRETER} ${CMAKE_SOURCE_DIR}/pyside2-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui") -+add_test(QWizard ${PYSIDE2UICBINARY} --generator=python "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui") - set_tests_properties(QWizard PROPERTIES - ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}") ---- a/sources/pyside2-tools/tests/rcc/CMakeLists.txt -+++ b/sources/pyside2-tools/tests/rcc/CMakeLists.txt -@@ -1,6 +1,6 @@ - macro(ADD_RCC_TEST name pyfile qrcfile) - add_test(${name} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh -- ${PYSIDERCC_EXECUTABLE} -+ ${PYSIDE2RCCBINARY} - ${CMAKE_CURRENT_SOURCE_DIR}/${pyfile} - ${CMAKE_CURRENT_SOURCE_DIR}/${qrcfile} - ${CMAKE_CURRENT_SOURCE_DIR}) ---- a/sources/pyside2-tools/tests/rcc/run_test.sh -+++ b/sources/pyside2-tools/tests/rcc/run_test.sh -@@ -8,5 +8,5 @@ - # $3: qrc file - - export PYTHONPATH=$PYTHONPATH:`pwd` --$1 -o `basename $3 .qrc`_rc.py $3 -+$1 --generator=python -o `basename $3 .qrc`_rc.py $3 - `pkg-config shiboken2 --variable=python_interpreter` $2 diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template deleted file mode 100644 index 169dd144dc4..00000000000 --- a/srcpkgs/pyside2-tools/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'pyside2-tools' -pkgname=pyside2-tools -version=5.15.5 -revision=1 -_pkgname="pyside-setup-opensource-src-${version}" -build_wrksrc="sources/pyside2-tools" -build_style=cmake -hostmakedepends="cmake python3-devel shiboken2" -makedepends="python3-devel libshiboken2-devel qt5-devel - libpyside2-python3-devel" -checkdepends="pkg-config" -short_desc="Python3 bindings for the Qt5 toolkit" -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=3920a4fb353300260c9bc46ff70f1fb975c5e7efa22e9d51222588928ce19b33 -python_version=3 - -if [ ${CROSS_BUILD} ]; then - hostmakedepends+=" qt5-qmake qt5-host-tools" -fi diff --git a/srcpkgs/pyside2-tools/update b/srcpkgs/pyside2-tools/update deleted file mode 100644 index 1c0e6e5fef6..00000000000 --- a/srcpkgs/pyside2-tools/update +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=pyside-setup-opensource-src -vdprefix=PySide2- -vdsuffix=-src diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 0dc01a5fe14..913f27e9599 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -578,6 +578,7 @@ replaces=" pygtk<=2.24.0_14 pygtksourceview<=2.10.1_5 pyside-tools<=0.2.15_2 + pyside2-tools<=5.15.5_1 pystopwatch<=2019_2 python-Babel<=2.8.0_4 python-Cython<=0.29.36_1