diff options
Diffstat (limited to 'kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch')
-rw-r--r-- | kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch | 76 |
1 files changed, 0 insertions, 76 deletions
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 - |