gentoo resync : 05.12.2021

3 files changed, 69 insertions, 3 deletions

diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index a10147be8f71..e735721cd03c 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,8 +1,9 @@
 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.74.0-disable-qmlplugindump.patch 2677 BLAKE2B 7ee3d039291f65e667d83dafbedf1a7790db9c411962dca48dadf8e65d25733cf1f74b406b871986340e65ab43cea586739274d3e9e36ad00021bfa1fc6700a8 SHA512 47105664fb59b5bee31b58c034e4e83cfa93983d40d369ff82204a35195171a5fab6063f0257eead5186fadd17f87c378daacecc3c9cdb63fdfd0dbe42fe56a7
+AUX extra-cmake-modules-5.88.0-disable-qmlplugindump.patch 2671 BLAKE2B b6dc3f2da4224b8a983ca7305c46f4413dae715980879c3645d9a757c0f0839e3eecac17cf11d2a0bbc36939d0170f08422c3d858dacd7f53a1892165da33ae5 SHA512 3e1adce381c73a370483a8302024b3c808def95ba8eec306e10b9ebae9465a326a683ca29db5998e2c472c900f59cac0b6570222653e5225128a2078e8622555
 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
 EBUILD extra-cmake-modules-5.85.0.ebuild 1818 BLAKE2B 5b656427e1b0a4c525428d985e9a3badde2543bdf7a71b3528cc6499b2111b43c6ea942b7916cd895ba720a56d852a5c7ac2051ec4faf552935ec3dc32d51185 SHA512 58a150ff3cc1f3f351d75dfbcf3b9faaa15ffb87a297152da746a2186f061475d54116ee3500f07a1fd33cc597ea4e31544c435d28e92b152abbaa975cd3fc5c
-EBUILD extra-cmake-modules-5.87.0.ebuild 1823 BLAKE2B b3b0e5b5f98ae2606fe0ba5dc6f26cfd936cb3241e5da5d49f172b751e45fb453f65907fd297b4057ca4a02489e3c597a99df83508d620154fdf37bd209c18c5 SHA512 419b66e3f05220ba7d65108f4543305cf680175e7f5419f5f549488339e0e73bdc40769c2efd498284df15992ec6ab9f7cc35efec3b2076b9561eef71e9ded52
+EBUILD extra-cmake-modules-5.88.0.ebuild 1823 BLAKE2B 0a28a5df8295bd07699dc3efa4574e172b7b8e63624cf5921a6dd88ef956b784e9c39d2455ffc80c6473b90f73237982b0db0102978e2829120b0133ea1fd5f4 SHA512 02a719e80d0dd8533d9aa96270c21f3340c1def4a2b31238ff035079365707858c19ebef0912b645c3201e05803655c6d04885e1a69cee086e8a609c03cfb2a5
 MISC metadata.xml 480 BLAKE2B ab8e3f4e0a74a0e856bba9cf47e40254738c6d545a569bf12fae38e8e6d1e5d0cfd5a0ffaf6d5266a1532ea455d5f7f5421f1b88fa09539af6e31d2e85e170ad SHA512 0161373d45e5fd9a1c3c4f47892fcf1173419481f8de3ee73cc029ac628d36551516d0b99acc8b227b336ec5ce138844fd2654555edff3a73b8c07dbd931e468
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.87.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.88.0.ebuild
index fe872c28e049..bfa6d7323bb8 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.87.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.88.0.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
 	"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
-	"${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch"
+	"${FILESDIR}/${PN}-5.88.0-disable-qmlplugindump.patch"
 )
 
 python_check_deps() {
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
+