diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-02-10 09:19:50 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-02-10 10:10:33 +0100 |
commit | cf3f73e912fd0d1b2e5c4f14273ed2a1197b6f29 (patch) | |
tree | a2d94a6d3ad971076d6f2efcfd5fb417a510d4e2 /kde-frameworks/extra-cmake-modules | |
parent | kde-frameworks/breeze-icons-rcc: drop 5.88.0* (diff) | |
download | gentoo-cf3f73e912fd0d1b2e5c4f14273ed2a1197b6f29.tar.gz gentoo-cf3f73e912fd0d1b2e5c4f14273ed2a1197b6f29.tar.bz2 gentoo-cf3f73e912fd0d1b2e5c4f14273ed2a1197b6f29.zip |
kde-frameworks/extra-cmake-modules: drop 5.88.0*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/extra-cmake-modules')
3 files changed, 0 insertions, 144 deletions
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index 0cded364ed78..4be26439c4ef 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,2 +1 @@ -DIST extra-cmake-modules-5.88.0.tar.xz 319140 BLAKE2B 784483a6b66cb859bb0b8764928e4a42a1c265119196e5f79e074930a302d10698fa7b59f065dfddfd6462b9810d378b2129cee3822b897f187d9a5225de69d1 SHA512 e560aa84dbbc1f1673bb51b7c384a64899244f255c7a20e6f5c4046334a6bbfa4632d01ec75b219cb129f0ac37c328a10fe1ea5bbd05bc4c839d797fa965ce3b DIST extra-cmake-modules-5.90.0.tar.xz 323352 BLAKE2B 00df6be76989e0730b8b0be66ea68d979c22ee66f115720218b80eb6a06f2d471b24c08e4db2b5a4febdc3e44481adce522c4e62cf86bbe0c10d07cd40ae0cab SHA512 1f1257a8b9d0a7ba088d5da3bb96070c6cd18d19a17224249e886d7a4aa9bda8192be54607908b1cbcbea57366649cebde173e5bce64ea16ed3b60d1a5ba04a5 diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.88.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.88.0.ebuild deleted file mode 100644 index 03b27348e72c..000000000000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.88.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -QTMIN=5.15.2 -inherit cmake kde.org python-any-r1 - -DESCRIPTION="Extra modules and scripts for CMake" -HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules" - -LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86" -IUSE="doc test" - -RESTRICT="!test? ( test )" - -BDEPEND=" - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - >=dev-qt/qthelp-${QTMIN}:5 - ) - test? ( - >=dev-qt/linguist-tools-${QTMIN}:5 - >=dev-qt/qtcore-${QTMIN}:5 - ) -" -RDEPEND=" - app-arch/libarchive[bzip2] -" - -PATCHES=( - "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" - "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch" - "${FILESDIR}/${PN}-5.88.0-disable-qmlplugindump.patch" -) - -python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -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}" - -DBUILD_QTHELP_DOCS=$(usex doc) - -DBUILD_HTML_DOCS=$(usex doc) - -DBUILD_MAN_DOCS=$(usex doc) - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} - -src_test() { - # ECMToolchainAndroidTest passes but then breaks src_install - # ECMPoQmToolsTest is broken, bug #627806 - # KDEFetchTranslations can not possibly succeed in releases, bug #764953 - # possible race condition with multiple jobs, bug #701854 - local myctestargs=( - -j1 - -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest|KDEFetchTranslations)" - ) - - cmake_src_test -} diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch deleted file mode 100644 index f2c836889894..000000000000 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 8bcda9bc1d12e2e8ea54dc8d957e415f9d5469a0 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 8 Dec 2019 15:01:33 +0100 -Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to - avoid sandbox violations - -Back-story: https://bugzilla.gnome.org/show_bug.cgi?id=744135 -BUG: 387753 ---- - modules/ECMFindQMLModule.cmake.in | 35 +++++++++++++++++++------------ - 1 file changed, 22 insertions(+), 13 deletions(-) - -diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in -index 4234b702..d9817fe8 100644 ---- a/modules/ECMFindQMLModule.cmake.in -+++ b/modules/ECMFindQMLModule.cmake.in -@@ -5,23 +5,32 @@ - #============================================================================= - - include(FindPackageHandleStandardArgs) --include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") - --query_qmake(qt_binaries_dir QT_HOST_BINS) -+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF) - --find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) --if(NOT QMLPLUGINDUMP_PROGRAM) -- message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") --endif() -- --execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30) -- --if(ExitCode EQUAL 0) -+if(ECM_DISABLE_QMLPLUGINDUMP) -+ message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.") - set(@GENMODULE@_FOUND TRUE) -- set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}") -+ set(@GENMODULE@_VERSION @VERSION@) - else() -- message(STATUS "qmlplugindump failed for @MODULE_NAME@.") -- set(@GENMODULE@_FOUND FALSE) -+ include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") -+ -+ query_qmake(qt_binaries_dir QT_HOST_BINS) -+ -+ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) -+ if(NOT QMLPLUGINDUMP_PROGRAM) -+ message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") -+ endif() -+ -+ execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode) -+ -+ if(ExitCode EQUAL 0) -+ set(@GENMODULE@_FOUND TRUE) -+ set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}") -+ else() -+ message(STATUS "qmlplugindump failed for @MODULE_NAME@.") -+ set(@GENMODULE@_FOUND FALSE) -+ endif() - endif() - - find_package_handle_standard_args(@GENMODULE@ --- -2.33.0 - |