pyside2-tools: update to 5.15.2, testing support
Closes: #26962 [via git-merge-pr]
This commit is contained in:
parent
2f7f587547
commit
96821403b0
|
@ -0,0 +1,34 @@
|
|||
--- sources/pyside2-tools/tests/CMakeLists.txt
|
||||
+++ 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}")
|
||||
--- sources/pyside2-tools/tests/rcc/CMakeLists.txt
|
||||
+++ 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})
|
||||
--- sources/pyside2-tools/tests/rcc/run_test.sh
|
||||
+++ 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
|
|
@ -1,23 +1,27 @@
|
|||
# Template file for 'pyside2-tools'
|
||||
pkgname=pyside2-tools
|
||||
version=5.15.0
|
||||
version=5.15.2
|
||||
revision=1
|
||||
_pkgname="pyside-setup-opensource-src-${version}"
|
||||
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"
|
||||
checkdepends="pkg-config"
|
||||
short_desc="Python3 bindings for the Qt5 toolkit"
|
||||
maintainer="yopito <pierre.bourgin@free.fr>"
|
||||
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=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
|
||||
checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
|
||||
python_version=3
|
||||
|
||||
if [ ${CROSS_BUILD} ]; then
|
||||
hostmakedepends+=" qt5-qmake qt5-host-tools"
|
||||
fi
|
||||
|
||||
pre_check() {
|
||||
export QT_QPA_PLATFORM=offscreen
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue