| 1 |
commit: 1d40d9cea3c030184fa2d9de40dd5b253f380a56 |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 29 21:39:08 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 08:45:24 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1d40d9ce |
| 7 |
|
| 8 |
kde-frameworks/extra-cmake-modules: Refactor qmlplugindump patch |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 11 |
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> |
| 12 |
Closes: https://github.com/gentoo/kde/pull/891 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild | 2 +- |
| 16 |
...ump.patch => extra-cmake-modules-5.74.0-disable-qmlplugindump.patch} | 2 +- |
| 17 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild |
| 20 |
index 0425b6f07a..86cdadf3ee 100644 |
| 21 |
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild |
| 22 |
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild |
| 23 |
@@ -33,8 +33,8 @@ RESTRICT+=" !test? ( test )" |
| 24 |
|
| 25 |
PATCHES=( |
| 26 |
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" |
| 27 |
- "${FILESDIR}/${PN}-5.65.0-disable-qmlplugindump.patch" |
| 28 |
"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch" |
| 29 |
+ "${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch" |
| 30 |
) |
| 31 |
|
| 32 |
python_check_deps() { |
| 33 |
|
| 34 |
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.74.0-disable-qmlplugindump.patch |
| 35 |
similarity index 98% |
| 36 |
rename from kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch |
| 37 |
rename to kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch |
| 38 |
index 2cbfba7d5e..08fcf32338 100644 |
| 39 |
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch |
| 40 |
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch |
| 41 |
@@ -28,7 +28,7 @@ index 8109ab8..1edc01d 100644 |
| 42 |
- message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") |
| 43 |
-endif() |
| 44 |
- |
| 45 |
--execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode) |
| 46 |
+-execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30) |
| 47 |
- |
| 48 |
-if(ExitCode EQUAL 0) |
| 49 |
+if(ECM_DISABLE_QMLPLUGINDUMP) |
Archives