| 1 |
commit: 6d01c0493fa5fa86c7a8ee665e75bdd02c8147ac |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 15 13:06:24 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 15 13:06:24 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d01c049 |
| 7 |
|
| 8 |
kde-frameworks/extra-cmake-modules: Add missing patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.81, Repoman-2.3.20 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
...make-modules-5.65.0-disable-qmlplugindump.patch | 65 ++++++++++++++++++++++ |
| 14 |
1 file changed, 65 insertions(+) |
| 15 |
|
| 16 |
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 |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..2cbfba7d5eb |
| 19 |
--- /dev/null |
| 20 |
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch |
| 21 |
@@ -0,0 +1,65 @@ |
| 22 |
+From 8d30a7dd4517130bf1f6904b0969aaa78e44e16b Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 24 |
+Date: Sun, 8 Dec 2019 15:01:33 +0100 |
| 25 |
+Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to |
| 26 |
+ avoid sandbox violations |
| 27 |
+ |
| 28 |
+Back story: https://bugzilla.gnome.org/show_bug.cgi?id=744135 |
| 29 |
+BUG: 387753 |
| 30 |
+--- |
| 31 |
+ modules/ECMFindQMLModule.cmake.in | 35 +++++++++++++++++++------------ |
| 32 |
+ 1 file changed, 22 insertions(+), 13 deletions(-) |
| 33 |
+ |
| 34 |
+diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in |
| 35 |
+index 8109ab8..1edc01d 100644 |
| 36 |
+--- a/modules/ECMFindQMLModule.cmake.in |
| 37 |
++++ b/modules/ECMFindQMLModule.cmake.in |
| 38 |
+@@ -26,23 +26,32 @@ |
| 39 |
+ #============================================================================= |
| 40 |
+ |
| 41 |
+ include(FindPackageHandleStandardArgs) |
| 42 |
+-include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") |
| 43 |
+ |
| 44 |
+-query_qmake(qt_binaries_dir QT_INSTALL_BINS) |
| 45 |
++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF) |
| 46 |
+ |
| 47 |
+-find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) |
| 48 |
+-if(NOT QMLPLUGINDUMP_PROGRAM) |
| 49 |
+- message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") |
| 50 |
+-endif() |
| 51 |
+- |
| 52 |
+-execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode) |
| 53 |
+- |
| 54 |
+-if(ExitCode EQUAL 0) |
| 55 |
++if(ECM_DISABLE_QMLPLUGINDUMP) |
| 56 |
++ message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.") |
| 57 |
+ set(@GENMODULE@_FOUND TRUE) |
| 58 |
+- set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}") |
| 59 |
++ set(@GENMODULE@_VERSION @VERSION@) |
| 60 |
+ else() |
| 61 |
+- message(STATUS "qmlplugindump failed for @MODULE_NAME@.") |
| 62 |
+- set(@GENMODULE@_FOUND FALSE) |
| 63 |
++ include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") |
| 64 |
++ |
| 65 |
++ query_qmake(qt_binaries_dir QT_INSTALL_BINS) |
| 66 |
++ |
| 67 |
++ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) |
| 68 |
++ if(NOT QMLPLUGINDUMP_PROGRAM) |
| 69 |
++ message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") |
| 70 |
++ endif() |
| 71 |
++ |
| 72 |
++ execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode) |
| 73 |
++ |
| 74 |
++ if(ExitCode EQUAL 0) |
| 75 |
++ set(@GENMODULE@_FOUND TRUE) |
| 76 |
++ set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}") |
| 77 |
++ else() |
| 78 |
++ message(STATUS "qmlplugindump failed for @MODULE_NAME@.") |
| 79 |
++ set(@GENMODULE@_FOUND FALSE) |
| 80 |
++ endif() |
| 81 |
+ endif() |
| 82 |
+ |
| 83 |
+ find_package_handle_standard_args(@GENMODULE@ |
| 84 |
+-- |
| 85 |
+2.24.0 |
| 86 |
+ |
Archives