| 1 |
commit: c24905bfe4ba7433673e214f6555fb8348ec3724 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 5 15:22:17 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 5 15:24:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c24905bf |
| 7 |
|
| 8 |
kde-frameworks/extra-cmake-modules: Rebase disable-qmlplugindump.patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/816309 |
| 11 |
Package-Manager: Portage-3.0.26, Repoman-3.0.3 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
.../extra-cmake-modules-9999.ebuild | 2 +- |
| 15 |
...make-modules-5.88.0-disable-qmlplugindump.patch | 65 ++++++++++++++++++++++ |
| 16 |
2 files changed, 66 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild |
| 19 |
index 142667eb9f..a612724875 100644 |
| 20 |
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild |
| 21 |
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild |
| 22 |
@@ -34,7 +34,7 @@ RDEPEND=" |
| 23 |
PATCHES=( |
| 24 |
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" |
| 25 |
"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch" |
| 26 |
- "${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch" |
| 27 |
+ "${FILESDIR}/${PN}-5.88.0-disable-qmlplugindump.patch" |
| 28 |
) |
| 29 |
|
| 30 |
python_check_deps() { |
| 31 |
|
| 32 |
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 |
| 33 |
new file mode 100644 |
| 34 |
index 0000000000..f2c8368898 |
| 35 |
--- /dev/null |
| 36 |
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch |
| 37 |
@@ -0,0 +1,65 @@ |
| 38 |
+From 8bcda9bc1d12e2e8ea54dc8d957e415f9d5469a0 Mon Sep 17 00:00:00 2001 |
| 39 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 40 |
+Date: Sun, 8 Dec 2019 15:01:33 +0100 |
| 41 |
+Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to |
| 42 |
+ avoid sandbox violations |
| 43 |
+ |
| 44 |
+Back-story: https://bugzilla.gnome.org/show_bug.cgi?id=744135 |
| 45 |
+BUG: 387753 |
| 46 |
+--- |
| 47 |
+ modules/ECMFindQMLModule.cmake.in | 35 +++++++++++++++++++------------ |
| 48 |
+ 1 file changed, 22 insertions(+), 13 deletions(-) |
| 49 |
+ |
| 50 |
+diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in |
| 51 |
+index 4234b702..d9817fe8 100644 |
| 52 |
+--- a/modules/ECMFindQMLModule.cmake.in |
| 53 |
++++ b/modules/ECMFindQMLModule.cmake.in |
| 54 |
+@@ -5,23 +5,32 @@ |
| 55 |
+ #============================================================================= |
| 56 |
+ |
| 57 |
+ include(FindPackageHandleStandardArgs) |
| 58 |
+-include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") |
| 59 |
+ |
| 60 |
+-query_qmake(qt_binaries_dir QT_HOST_BINS) |
| 61 |
++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF) |
| 62 |
+ |
| 63 |
+-find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) |
| 64 |
+-if(NOT QMLPLUGINDUMP_PROGRAM) |
| 65 |
+- message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") |
| 66 |
+-endif() |
| 67 |
+- |
| 68 |
+-execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30) |
| 69 |
+- |
| 70 |
+-if(ExitCode EQUAL 0) |
| 71 |
++if(ECM_DISABLE_QMLPLUGINDUMP) |
| 72 |
++ message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.") |
| 73 |
+ set(@GENMODULE@_FOUND TRUE) |
| 74 |
+- set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}") |
| 75 |
++ set(@GENMODULE@_VERSION @VERSION@) |
| 76 |
+ else() |
| 77 |
+- message(STATUS "qmlplugindump failed for @MODULE_NAME@.") |
| 78 |
+- set(@GENMODULE@_FOUND FALSE) |
| 79 |
++ include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") |
| 80 |
++ |
| 81 |
++ query_qmake(qt_binaries_dir QT_HOST_BINS) |
| 82 |
++ |
| 83 |
++ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) |
| 84 |
++ if(NOT QMLPLUGINDUMP_PROGRAM) |
| 85 |
++ message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") |
| 86 |
++ endif() |
| 87 |
++ |
| 88 |
++ execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode) |
| 89 |
++ |
| 90 |
++ if(ExitCode EQUAL 0) |
| 91 |
++ set(@GENMODULE@_FOUND TRUE) |
| 92 |
++ set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}") |
| 93 |
++ else() |
| 94 |
++ message(STATUS "qmlplugindump failed for @MODULE_NAME@.") |
| 95 |
++ set(@GENMODULE@_FOUND FALSE) |
| 96 |
++ endif() |
| 97 |
+ endif() |
| 98 |
+ |
| 99 |
+ find_package_handle_standard_args(@GENMODULE@ |
| 100 |
+-- |
| 101 |
+2.33.0 |
| 102 |
+ |
Archives