diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-04-30 23:36:07 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-05-04 22:49:24 +0200 |
commit | 6a0c9e0e69e54fe2e8517d2173993f40841713fd (patch) | |
tree | ee3c1a8e218e50bb15af4766788a74bcce9c822a /kde-frameworks | |
parent | kde-frameworks/breeze-icons-rcc: drop 5.90.0* (diff) | |
download | gentoo-6a0c9e0e69e54fe2e8517d2173993f40841713fd.tar.gz gentoo-6a0c9e0e69e54fe2e8517d2173993f40841713fd.tar.bz2 gentoo-6a0c9e0e69e54fe2e8517d2173993f40841713fd.zip |
kde-frameworks/extra-cmake-modules: drop 5.90.0*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks')
3 files changed, 0 insertions, 155 deletions
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index 97694ad3b2f9..a427e362e628 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,3 +1,2 @@ -DIST extra-cmake-modules-5.90.0.tar.xz 323352 BLAKE2B 00df6be76989e0730b8b0be66ea68d979c22ee66f115720218b80eb6a06f2d471b24c08e4db2b5a4febdc3e44481adce522c4e62cf86bbe0c10d07cd40ae0cab SHA512 1f1257a8b9d0a7ba088d5da3bb96070c6cd18d19a17224249e886d7a4aa9bda8192be54607908b1cbcbea57366649cebde173e5bce64ea16ed3b60d1a5ba04a5 DIST extra-cmake-modules-5.92.0.tar.xz 329884 BLAKE2B e2d6bb7ff492f916f2e276faf452c2b02adfed8133096cff17c76992d11255f93a55cfc8140dc1b577facdb03cbbcddfefcbbe5242a006aa4c5786a0c64bf329 SHA512 c4adc98a5d3ff0844165fc5f51f9a1a4ff04ef8e8d8b87b87b094d0601577c239f87f05dd461270563d5160af7248ee064984275223a48e931b1761450dcaf20 DIST extra-cmake-modules-5.93.0.tar.xz 331192 BLAKE2B 9977570536104297424b201842ffe13a9fc9b3c4859067b65e145b60ffd1cec57308bc316bd485c79fff5d94e6648515567a27bb2c273df19f8c2b663f475c72 SHA512 a7b79a3db555e7a140ebc49f6b987c5950a2a002cfb4641b30be823dd39b97d3239ce0892c31c8f41463d3a40f6ba9183343a65d52d087bd464289fa93bca882 diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild deleted file mode 100644 index 92eb7fde3515..000000000000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 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.90.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.90.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch deleted file mode 100644 index db46d3e86167..000000000000 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 763df79a4b468acd401f8adb5b245245a63d2934 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 - -See also: https://phabricator.kde.org/D25812 - -Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135 -BUG: 387753 ---- - modules/ECMFindQMLModule.cmake.in | 45 ++++++++++++++++++------------- - 1 file changed, 27 insertions(+), 18 deletions(-) - -diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in -index 7cd737b..9847825 100644 ---- a/modules/ECMFindQMLModule.cmake.in -+++ b/modules/ECMFindQMLModule.cmake.in -@@ -7,27 +7,36 @@ - include(FindPackageHandleStandardArgs) - include("${ECM_MODULE_DIR}/QtVersionOption.cmake") - --if (QT_MAJOR_VERSION EQUAL "5") -- include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") -- query_qmake(qt_binaries_dir QT_HOST_BINS) -- find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) --elseif (QT_MAJOR_VERSION EQUAL "6") -- find_package(Qt6QmlTools REQUIRED) -- get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION) --endif() -- --if(NOT QMLPLUGINDUMP_PROGRAM) -- message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") --endif() -+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF) - --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) -+ -+ if (QT_MAJOR_VERSION EQUAL "5") -+ include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") -+ query_qmake(qt_binaries_dir QT_HOST_BINS) -+ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) -+ elseif (QT_MAJOR_VERSION EQUAL "6") -+ find_package(Qt6QmlTools REQUIRED) -+ get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION) -+ endif() -+ -+ 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) -+ 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.34.1 - |