commit: c24905bfe4ba7433673e214f6555fb8348ec3724 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Oct 5 15:22:17 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Oct 5 15:24:36 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c24905bf
kde-frameworks/extra-cmake-modules: Rebase disable-qmlplugindump.patch Closes: https://bugs.gentoo.org/816309 Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../extra-cmake-modules-9999.ebuild | 2 +- ...make-modules-5.88.0-disable-qmlplugindump.patch | 65 ++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild index 142667eb9f..a612724875 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.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 0000000000..f2c8368898 --- /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 <ast...@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 +
