diff options
Diffstat (limited to 'kde-frameworks/extra-cmake-modules')
4 files changed, 2 insertions, 159 deletions
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index 85f282d0adf1..11f62e59a810 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,13 +1,10 @@ AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697 AUX extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch 1636 BLAKE2B 8aa07049667ec2e4e986e459fa557ec171dde2746ff603b7d6a18f3197aa025ff1ee07d89e6dd17a722abde379aed69eaee58b99131c289efa979ad1bc3dc91c SHA512 3ba5f3d6cdf6afb230378e9891426ab64414eb19876ad0a7253b4301a50cd23a1bfbe9f5d267545fe788e846a4f86f93c09887b5f76f96f19643f0e18d6b0ba1 -AUX extra-cmake-modules-5.90.0-disable-qmlplugindump.patch 3129 BLAKE2B 9bc0c5c8312ff14fbf8b58efea9d2f7c629b20fb8aca7e17ccf5c1425348ffe52e9c8862cd9308924892076d2361a74ac00e1a69fac5288bead037f0fb1309ac SHA512 881ddf5eb2432d402ffd6f1076353a4d903b7165b792ddda2ff8f60e1bf026cb471e6675325356df88c0b882d9f5a9cdcba0d1dba99ac652198e14a9783f54e3 AUX extra-cmake-modules-5.91.0-disable-qmlplugindump.patch 3155 BLAKE2B f01348bebd4aa0498495dc140b623bc132e45ba1b0b596b55eddb4fda2420a28a4ee2e54d06820a5c855e74b7161024c2b771d595b3ab5d8548c6edcb73c8262 SHA512 5c8bd46ef8e702d14b8984e308c58fc7f060cc44072ea53e1a544ffad270c79ea0df79b41025b9c95796bb96400a7ee8b9dcc944d6b3c207b4797f972513c6f1 AUX extra-cmake-modules-5.93.0-disable-qmlplugindump.patch 3151 BLAKE2B e202be33de10a33c150aad553ada59b97084cd8e60adcdec0ead12f523f05a3563762454cf1b76fdc8a8e4b323f7b2d92860c43b6ca2340d431094ef98c232ab SHA512 d531e66a2a7dc01b799eb2019f671390ebaca408e27a8c5bf78115e953acd9fd08318667722254d1c95c1c210388b83ca384147b22ed731fb1db93e6846dae55 AUX extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch 1703 BLAKE2B 71d07fcfb3a93caf5f73f818cff7f0139c4866ef3a1abaede189e171217ec9a4e6825ec6d37c344ab8d94989493647f4d7b5749d3db1767b54bb9c6e328ca571 SHA512 8b015810e455aa0a54535f594668595900b0b2d700685c952cbb9a2dd46e3c413815b33fef69f4251bb20c93e4c3a4e6b9691680b3ffcf1bac5cf48931bb5e3b -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 -EBUILD extra-cmake-modules-5.90.0.ebuild 1818 BLAKE2B 441701cc21d7deebd8ced8cfcdf2c9f0b6f2f36dc93cd240716db2b978406035ec919e473873564515056ad14bd3b2f281468876bc263806b923a4ad4148824e SHA512 b9be8244576e037ce843d06cf4bd425f1a7417c5737fb06e5e370686519dce02c4af705917d73822e9dbbcbf603a5cb974549fea2e6dc9a1a85371c04598b74d -EBUILD extra-cmake-modules-5.92.0.ebuild 1823 BLAKE2B 6424202720de6effbd1cdbadfb0facceaf72173e9b6ddf1da971b87aa78363de64c8062705a1a73ab15ce82001a5cada1c1b565d01be66485911a44428d8d748 SHA512 9dcd21d0e86dd764d2895efcf363eecef02ddc12dea7b93b6c500dfe479a42d459ec76aca6b561bde5e4e3e65060943da1e6018749dc1571db2a56aa62f11615 +EBUILD extra-cmake-modules-5.92.0.ebuild 1818 BLAKE2B bed80d21fa05b767896265d5e7648d60f5d85a4bea47c2f3c351cec09a43e84404488339e4af4b4027951540d840f4f02027e504defb070567e13938e0d498ad SHA512 c85253481df5d7edab33e4b9b979fc8ca743dec3491a53640d0ddff2de64d3c72a5436c5ec5c7377495ba3f6eeacb5249a9682478d5d274db3e5ce8361122fb5 EBUILD extra-cmake-modules-5.93.0.ebuild 1823 BLAKE2B ffa5884d7e6001f8af81b16107c741d9ba3978deec6051ad63abed74e3398664b45afcf58bebba327459c3b3800144a65d81f593f44f8790b62e57a3b1591fe7 SHA512 409299c9c52c7a82a23eaebf622e5d4efe28cf6f6c2612137108387c4fc266215e725539ad3bb900d396e1bfd3b4d292e94aeb6d7c790a472ecaa6ccf2353196 MISC metadata.xml 480 BLAKE2B ab8e3f4e0a74a0e856bba9cf47e40254738c6d545a569bf12fae38e8e6d1e5d0cfd5a0ffaf6d5266a1532ea455d5f7f5421f1b88fa09539af6e31d2e85e170ad SHA512 0161373d45e5fd9a1c3c4f47892fcf1173419481f8de3ee73cc029ac628d36551516d0b99acc8b227b336ec5ce138844fd2654555edff3a73b8c07dbd931e468 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/extra-cmake-modules-5.92.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild index 6d30f42e236f..408c253bc7f6 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( 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 - |