diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2023-11-18 18:01:52 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-11-18 18:02:14 +0100 |
| commit | b75c79ba74b11c5565d81c5cb75deb54738c6c2e (patch) | |
| tree | 9ae0821fc8baa980cccd7d422f065ae7aeb86504 /kde-frameworks/extra-cmake-modules | |
| parent | kde-frameworks/kwayland: add kde-invent upstream metadata (diff) | |
| download | kde-b75c79ba74b11c5565d81c5cb75deb54738c6c2e.tar.gz kde-b75c79ba74b11c5565d81c5cb75deb54738c6c2e.tar.bz2 kde-b75c79ba74b11c5565d81c5cb75deb54738c6c2e.zip | |
kde-frameworks/extra-cmake-modules: Disable PyQt5-based tests by patch
... replacing sed.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/extra-cmake-modules')
| -rw-r--r-- | kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.9999.ebuild | 12 | ||||
| -rw-r--r-- | kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch | 27 |
2 files changed, 29 insertions, 10 deletions
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.9999.ebuild index 0b9a1e6e94..68a04bec3e 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.9999.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.9999.ebuild @@ -16,6 +16,7 @@ IUSE="doc test" RESTRICT="!test? ( test )" +RDEPEND="app-arch/libarchive[bzip2]" BDEPEND=" doc? ( ${PYTHON_DEPS} @@ -27,14 +28,12 @@ BDEPEND=" >=dev-qt/qtcore-${QTMIN}:5 ) " -RDEPEND=" - app-arch/libarchive[bzip2] -" PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch" "${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch" + "${FILESDIR}/${PN}-5.112.0-disable-tests-requiring-PyQt5.patch" # bug 680256 ) python_check_deps() { @@ -45,13 +44,6 @@ pkg_setup() { use doc && python-any-r1_pkg_setup } -src_prepare() { - cmake_src_prepare - # Requires PyQt5, bug #680256 - sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \ - tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests" -} - src_configure() { local mycmakeargs=( -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch new file mode 100644 index 0000000000..17d6044805 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch @@ -0,0 +1,27 @@ +From 35d209b5662e468aa2f613ffdb9b91bc2e7f7e26 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sat, 18 Nov 2023 17:58:36 +0100 +Subject: [PATCH] Disable tests requiring PyQt5 + +Gentoo-bug: https://bugs.gentoo.org/680256 +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + tests/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 1415bb91..09d998e4 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -79,7 +79,7 @@ find_file(SIP_Qt5Core_Mod_FILE + PATH_SUFFIXES share/sip/PyQt5/QtCore + ) + +-if(NOT SIP_Qt5Core_Mod_FILE) ++if(TRUE) + message(STATUS "WARNING: skipping tests that require PyQt") + else() + find_package(PythonModuleGeneration) +-- +2.42.1 + |