Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/
Date: Wed, 29 Dec 2021 19:16:52
Message-Id: 1640805323.bfa83df373f42f71c3ed584b9f06021652690c0b.asturm@gentoo
1 commit: bfa83df373f42f71c3ed584b9f06021652690c0b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 29 19:15:23 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 29 19:15:23 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bfa83df3
7
8 kde-frameworks/extra-cmake-modules: Drop obsolete patches
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 ...make-modules-5.74.0-disable-qmlplugindump.patch | 65 ----------------------
14 ...make-modules-5.88.0-disable-qmlplugindump.patch | 65 ----------------------
15 2 files changed, 130 deletions(-)
16
17 diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch
18 deleted file mode 100644
19 index 08fcf32338..0000000000
20 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch
21 +++ /dev/null
22 @@ -1,65 +0,0 @@
23 -From 8d30a7dd4517130bf1f6904b0969aaa78e44e16b Mon Sep 17 00:00:00 2001
24 -From: Andreas Sturmlechner <asturm@g.o>
25 -Date: Sun, 8 Dec 2019 15:01:33 +0100
26 -Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
27 - avoid sandbox violations
28 -
29 -Back story: https://bugzilla.gnome.org/show_bug.cgi?id=744135
30 -BUG: 387753
31 ----
32 - modules/ECMFindQMLModule.cmake.in | 35 +++++++++++++++++++------------
33 - 1 file changed, 22 insertions(+), 13 deletions(-)
34 -
35 -diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
36 -index 8109ab8..1edc01d 100644
37 ---- a/modules/ECMFindQMLModule.cmake.in
38 -+++ b/modules/ECMFindQMLModule.cmake.in
39 -@@ -26,23 +26,32 @@
40 - #=============================================================================
41 -
42 - include(FindPackageHandleStandardArgs)
43 --include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
44 -
45 --query_qmake(qt_binaries_dir QT_INSTALL_BINS)
46 -+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
47 -
48 --find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
49 --if(NOT QMLPLUGINDUMP_PROGRAM)
50 -- message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
51 --endif()
52 --
53 --execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30)
54 --
55 --if(ExitCode EQUAL 0)
56 -+if(ECM_DISABLE_QMLPLUGINDUMP)
57 -+ message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.")
58 - set(@GENMODULE@_FOUND TRUE)
59 -- set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
60 -+ set(@GENMODULE@_VERSION @VERSION@)
61 - else()
62 -- message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
63 -- set(@GENMODULE@_FOUND FALSE)
64 -+ include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
65 -+
66 -+ query_qmake(qt_binaries_dir QT_INSTALL_BINS)
67 -+
68 -+ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
69 -+ if(NOT QMLPLUGINDUMP_PROGRAM)
70 -+ message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
71 -+ endif()
72 -+
73 -+ execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode)
74 -+
75 -+ if(ExitCode EQUAL 0)
76 -+ set(@GENMODULE@_FOUND TRUE)
77 -+ set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
78 -+ else()
79 -+ message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
80 -+ set(@GENMODULE@_FOUND FALSE)
81 -+ endif()
82 - endif()
83 -
84 - find_package_handle_standard_args(@GENMODULE@
85 ---
86 -2.24.0
87 -
88
89 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
90 deleted file mode 100644
91 index f2c8368898..0000000000
92 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch
93 +++ /dev/null
94 @@ -1,65 +0,0 @@
95 -From 8bcda9bc1d12e2e8ea54dc8d957e415f9d5469a0 Mon Sep 17 00:00:00 2001
96 -From: Andreas Sturmlechner <asturm@g.o>
97 -Date: Sun, 8 Dec 2019 15:01:33 +0100
98 -Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
99 - avoid sandbox violations
100 -
101 -Back-story: https://bugzilla.gnome.org/show_bug.cgi?id=744135
102 -BUG: 387753
103 ----
104 - modules/ECMFindQMLModule.cmake.in | 35 +++++++++++++++++++------------
105 - 1 file changed, 22 insertions(+), 13 deletions(-)
106 -
107 -diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
108 -index 4234b702..d9817fe8 100644
109 ---- a/modules/ECMFindQMLModule.cmake.in
110 -+++ b/modules/ECMFindQMLModule.cmake.in
111 -@@ -5,23 +5,32 @@
112 - #=============================================================================
113 -
114 - include(FindPackageHandleStandardArgs)
115 --include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
116 -
117 --query_qmake(qt_binaries_dir QT_HOST_BINS)
118 -+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
119 -
120 --find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
121 --if(NOT QMLPLUGINDUMP_PROGRAM)
122 -- message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
123 --endif()
124 --
125 --execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30)
126 --
127 --if(ExitCode EQUAL 0)
128 -+if(ECM_DISABLE_QMLPLUGINDUMP)
129 -+ message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.")
130 - set(@GENMODULE@_FOUND TRUE)
131 -- set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
132 -+ set(@GENMODULE@_VERSION @VERSION@)
133 - else()
134 -- message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
135 -- set(@GENMODULE@_FOUND FALSE)
136 -+ include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
137 -+
138 -+ query_qmake(qt_binaries_dir QT_HOST_BINS)
139 -+
140 -+ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
141 -+ if(NOT QMLPLUGINDUMP_PROGRAM)
142 -+ message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
143 -+ endif()
144 -+
145 -+ execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode)
146 -+
147 -+ if(ExitCode EQUAL 0)
148 -+ set(@GENMODULE@_FOUND TRUE)
149 -+ set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
150 -+ else()
151 -+ message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
152 -+ set(@GENMODULE@_FOUND FALSE)
153 -+ endif()
154 - endif()
155 -
156 - find_package_handle_standard_args(@GENMODULE@
157 ---
158 -2.33.0
159 -
Report Message
Find on MARC Find on Google Groups