diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2021-11-13 20:19:02 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-11-13 20:50:57 +0100 |
commit | c68a1c4c24bc8eb34e4034428e27ade8ad1908b8 (patch) | |
tree | ab69746d4146de57f4f73055cb89d74daa27e139 /kde-frameworks/extra-cmake-modules | |
parent | kde-frameworks/breeze-icons-rcc: 5.88.0 version bump (diff) | |
download | gentoo-c68a1c4c24bc8eb34e4034428e27ade8ad1908b8.tar.gz gentoo-c68a1c4c24bc8eb34e4034428e27ade8ad1908b8.tar.bz2 gentoo-c68a1c4c24bc8eb34e4034428e27ade8ad1908b8.zip |
kde-frameworks/extra-cmake-modules: 5.88.0 version bump
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/extra-cmake-modules')
3 files changed, 144 insertions, 0 deletions
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index 0564d723bf8d..836349226000 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,2 +1,3 @@ DIST extra-cmake-modules-5.85.0.tar.xz 318048 BLAKE2B b33d1e4d131349f706f7ef3cc75b59dc48299f03c62699fb1cdc6a9c496ebc527628bf07da41241ddd86128c5fa44b2b2c0a68509a0eefe742efa37d02386be0 SHA512 78ff26496c37d93106449663ab30ad35784a3ad668f4b1ec49d1ef51916e5de050e828fec8f6dc4ee5e2bed95cf22becb06ddd971dc46b65acc19934f5c1c5b3 DIST extra-cmake-modules-5.87.0.tar.xz 318800 BLAKE2B bfb50ab565d6b9f58282b8b14ea1d1522eac0166ce55ee3a4dc3aaf247ad88d30e8caef27ea8841bdf8b7b1d1fea4d96fefa6630ae1b490225c096214931118d SHA512 88b431aaffbafbc619e6b332edb3c20110d869c17d11859cbb70fa5c6d1c8b8b29797cd8e9af375cd17b928d65b4a8b03c4e52e3b56012c1ffbbe7c4cc602c79 +DIST extra-cmake-modules-5.88.0.tar.xz 319140 BLAKE2B 784483a6b66cb859bb0b8764928e4a42a1c265119196e5f79e074930a302d10698fa7b59f065dfddfd6462b9810d378b2129cee3822b897f187d9a5225de69d1 SHA512 e560aa84dbbc1f1673bb51b7c384a64899244f255c7a20e6f5c4046334a6bbfa4632d01ec75b219cb129f0ac37c328a10fe1ea5bbd05bc4c839d797fa965ce3b 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 new file mode 100644 index 000000000000..bfa6d7323bb8 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.88.0.ebuild @@ -0,0 +1,78 @@ +# 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 new file mode 100644 index 000000000000..f2c836889894 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch @@ -0,0 +1,65 @@ +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 + |