From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- kde-frameworks/extra-cmake-modules/Manifest | 9 +-- .../extra-cmake-modules-5.60.0.ebuild | 72 --------------------- .../extra-cmake-modules-5.64.0.ebuild | 2 +- .../extra-cmake-modules-5.65.0.ebuild | 74 ++++++++++++++++++++++ ...make-modules-5.65.0-disable-qmlplugindump.patch | 65 +++++++++++++++++++ kde-frameworks/extra-cmake-modules/metadata.xml | 1 + 6 files changed, 146 insertions(+), 77 deletions(-) delete mode 100644 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.60.0.ebuild create mode 100644 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild create mode 100644 kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch (limited to 'kde-frameworks/extra-cmake-modules') diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index a813f28312aa..b33b019e8a4c 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,7 +1,8 @@ AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697 AUX extra-cmake-modules-5.64.0-tests.patch 5542 BLAKE2B fd8e8762015fcd205039cbb8a6c5a175a6d115e4f52d6af93537e838ce728f3c6212390d5f64478570f9710ce0d9bdec0e68b23417233d8ae6d90803c682ab20 SHA512 71ef3d46b2d148ba06d446f8e589d8ed3b8b3e3ae47e26f90e4571e587955539aaa28154bbef21c0e070bbbaedea71fc3ccdf38c2417e2fd8868a89c1b52e595 -DIST extra-cmake-modules-5.60.0.tar.xz 325768 BLAKE2B de99c37171d298ef8168403b9b27275171db142f204a2c2b3ff82942390b91510e16a19f0d366242f03259c0c045186a8a8f5bd598ef6051709a307423972fab SHA512 c505f765169d4e77a836d971cabe513f5fbda6c772bff10a97013dd14fb91167b461c7e01382e41c4e9ca050a20ab828f3090ef7cd64625fa784d81f2cbf2743 +AUX extra-cmake-modules-5.65.0-disable-qmlplugindump.patch 2666 BLAKE2B a321b9881f643fee4b790ce47063b54722a17d98fcc7a17da4a84fcd412ae1dd5ed959767990ae5953e282fc3a8e9ecd4089aa056f0f366a937aa38bd27e153c SHA512 f43998ab4f9cb334d2a269e589aed9db08bdc8c91f2f5413c6e4ea9c5391068146cb7d9de1c7a0bffe61489075231caee535d1e669d95df3bce1fac6aa4155c9 DIST extra-cmake-modules-5.64.0.tar.xz 339444 BLAKE2B 361689b58ee5b681afd0ff1dfe4ec8fa96f8ba4b1b559be1045c4551e4f874086130fd90a87327b967c9ec48cf532356e675954ceff5fd51f258dd26907110f9 SHA512 81649a1fbe148eab56ff9147b412303112376343c84767139908b9f39e77debcbbf6b8fe2c1edf3151d3556ab9a826eef9b893cc1ef679d0b5cb37096f23fa44 -EBUILD extra-cmake-modules-5.60.0.ebuild 1533 BLAKE2B 5c7ef9d239800dd4dafb1a788d850556dd5db93acb25142408594fc5be2423b4942179b734a6dcfa11dedd595d8759b5cc27bcf0f05661b0404b5470ad926fad SHA512 187d4aa8246d9cf2e5867a51a6cebd475d133a25653ffd15e764725b79d14244f65c0e38ca7b82c8da7e4545e3f70e6c2fc24fdd8ac15d833f08679527181c03 -EBUILD extra-cmake-modules-5.64.0.ebuild 1589 BLAKE2B 2dc1c889e5ab8cb204ec09a7e25f67b29644f11039c8616a9b8e539ee100f38058e31d4bfbaaffad02c66a826d41a3d77bc1c38b9f4250ffeace8c4c1d93d2ba SHA512 12d5003315f85d9217a397a5ae05456643da40a2887444c4dfdcd0db918f1f0adaefe88285bb487fe77faf1e0ed76ae5a756a20ff8240daf6595f3880596412f -MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 +DIST extra-cmake-modules-5.65.0.tar.xz 340384 BLAKE2B e19aed7f3c8a0a21c8f3993d95e14e7d1ffb82f1f2a6615d363cf6c696635f22afdad8ae8bb8ff07eb6b7f6b8ae98e876cf273988ad26bfd9599e3e8ca482c69 SHA512 0e48374deaad34e3a9d9be1bba81890e40611ff2ccccb71d8f702d40fdb53c599404ace20ead4daf13951834cee6224093d20a83f0eb85ad2a6c973eab925ed4 +EBUILD extra-cmake-modules-5.64.0.ebuild 1584 BLAKE2B 4a9ae32569380b71d4f56e4dbe7e87aaac2e18a1903a3d2988644f7fbfca0d63192e6176d96a8325ffed68d36612510fb7bb027171f3518b5f9fd16be24a9483 SHA512 f7f2c5e2920c299d5f9ee9e3f6064a0ee9173994ff9bd2b54a9c97f16514cf20f7e258516f42307a59401dca3d643a565dbca80ef76e9c89b41cd3821d749b49 +EBUILD extra-cmake-modules-5.65.0.ebuild 1615 BLAKE2B 7b31a53f0fbe16289e38d66afde18072ed1472d4d0f36105f2ba8366d9c70b67c21077e6529e390dd172dcdebd59bf03468b3a4102c2e09462b6621515d09151 SHA512 b1b8428b2b2b145e9413f09216f3c32ec72487d1e12f8ad2b0bee2b22a33507ac4b748a323e2cf6bed2330ba1896e4aff6255d071f9718b7106dc18bff054652 +MISC metadata.xml 273 BLAKE2B e5a4eabc4773a11bcdf052b2ce87104bb85b0ed030475140ad0ec7fea2dcb401f539c67e1b1dc1138a5985be143947c86ff3b0b4d6881cc3a0952140ce33732e SHA512 570f3ea3dd25cac1410c3290a4003a288b9e1a0b873884fc33250dfa110cc39b61bd4db1f4d06e3b6e5f761bda8da222a4e294d12ebd8194d771ac61069ffc92 diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.60.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.60.0.ebuild deleted file mode 100644 index ace24c894f90..000000000000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.60.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -ECM_KDEINSTALLDIRS="false" -KDE_AUTODEPS="false" -KDE_DEBUG="false" -KDE_QTHELP="false" -KDE_TEST="false" -inherit kde5 python-any-r1 - -DESCRIPTION="Extra modules and scripts for CMake" -HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git" - -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}]') - $(add_qt_dep qthelp) - ) - test? ( - $(add_qt_dep qtcore) - $(add_qt_dep linguist-tools) - ) -" -RDEPEND=" - app-arch/libarchive[bzip2] -" - -PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" ) - -python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_prepare() { - kde5_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=( - -DBUILD_QTHELP_DOCS=$(usex doc) - -DBUILD_HTML_DOCS=$(usex doc) - -DBUILD_MAN_DOCS=$(usex doc) - -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" - ) - - kde5_src_configure -} - -src_test() { - # ECMToolchainAndroidTest passes but then breaks src_install - # ECMPoQmToolsTest is broken, bug #627806 - local myctestargs=( - -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" - ) - - kde5_src_test -} diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild index c0a33ce5a2ac..85906ba2af72 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git" LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86" IUSE="doc test" BDEPEND=" diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild new file mode 100644 index 000000000000..e07020736632 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2019 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-utils kde.org python-any-r1 + +DESCRIPTION="Extra modules and scripts for CMake" +HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git" + +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-utils_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-utils_src_configure +} + +src_test() { + # ECMToolchainAndroidTest passes but then breaks src_install + # ECMPoQmToolsTest is broken, bug #627806 + local myctestargs=( + -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" + ) + + cmake-utils_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 new file mode 100644 index 000000000000..2cbfba7d5ebd --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch @@ -0,0 +1,65 @@ +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 + diff --git a/kde-frameworks/extra-cmake-modules/metadata.xml b/kde-frameworks/extra-cmake-modules/metadata.xml index 2fdbf33d963d..ce744e04eafa 100644 --- a/kde-frameworks/extra-cmake-modules/metadata.xml +++ b/kde-frameworks/extra-cmake-modules/metadata.xml @@ -5,4 +5,5 @@ kde@gentoo.org Gentoo KDE Project + -- cgit v1.2.3