From 9cfc05d44141143bf95a9a1869c705f31fd8e706 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 5 Oct 2020 20:32:45 +0200 Subject: kde-frameworks/extra-cmake-modules: drop 5.70* Signed-off-by: Andreas Sturmlechner --- kde-frameworks/extra-cmake-modules/Manifest | 1 - .../extra-cmake-modules-5.70.0.ebuild | 76 ---------------------- ...make-modules-5.65.0-disable-qmlplugindump.patch | 65 ------------------ 3 files changed, 142 deletions(-) delete mode 100644 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild delete mode 100644 kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index 8729eb1fbac9..5a8cc0d9316c 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,2 +1 @@ -DIST extra-cmake-modules-5.70.0.tar.xz 343476 BLAKE2B efcf47af54decc383c150aff14628408f6e77001ba4c6bc8a6f1636e62e20c06fb435a0bf7d93ce610ed7404ae186b732d994d2a530f2d65207cee70cdac8af8 SHA512 cbee488db0ccef4c876770ec073408208037d791ea67d9f72937c4fa20765f69d9312a3f9e2106526d4fb0a76e25d7fed13178209f8e0b1b3f01b76be17d4784 DIST extra-cmake-modules-5.74.0.tar.xz 344588 BLAKE2B 00724160628ee9cb628b5f3f3b119908b9f0b135f4c98f5f2ac0b2d707abb0fd8775cb87ff7bad152e2010647b64222c57ee8a042d89c5649bb7d27d5f3b3839 SHA512 5d4f612758bda73d8327cc582bda3550807de90e1b729d24a59ac7e70db127da208a53590f48cda9775f2be6e22a7db47958e3f01577b4baf0b8ef86672579a1 diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild deleted file mode 100644 index 36c1e259b30d..000000000000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -QTMIN=5.12.3 -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 x86" -IUSE="doc 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] -" - -RESTRICT+=" !test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" - "${FILESDIR}/${PN}-5.65.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 - # possible race condition with multiple jobs, bug #701854 - local myctestargs=( - -j1 - -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" - ) - - cmake_src_test -} diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch deleted file mode 100644 index 2cbfba7d5ebd..000000000000 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 8d30a7dd4517130bf1f6904b0969aaa78e44e16b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -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 8109ab8..1edc01d 100644 ---- a/modules/ECMFindQMLModule.cmake.in -+++ b/modules/ECMFindQMLModule.cmake.in -@@ -26,23 +26,32 @@ - #============================================================================= - - include(FindPackageHandleStandardArgs) --include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") - --query_qmake(qt_binaries_dir QT_INSTALL_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) -- --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_INSTALL_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.24.0 - -- cgit v1.2.3-65-gdbad