commit: 1d40d9cea3c030184fa2d9de40dd5b253f380a56 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Sat Aug 29 21:39:08 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Aug 30 08:45:24 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1d40d9ce
kde-frameworks/extra-cmake-modules: Refactor qmlplugindump patch Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> Closes: https://github.com/gentoo/kde/pull/891 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild | 2 +- ...ump.patch => extra-cmake-modules-5.74.0-disable-qmlplugindump.patch} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild index 0425b6f07a..86cdadf3ee 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild @@ -33,8 +33,8 @@ RESTRICT+=" !test? ( test )" PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" - "${FILESDIR}/${PN}-5.65.0-disable-qmlplugindump.patch" "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch" + "${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch" ) python_check_deps() { 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 similarity index 98% rename from kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch rename to kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch index 2cbfba7d5e..08fcf32338 100644 --- 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 @@ -28,7 +28,7 @@ index 8109ab8..1edc01d 100644 - 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) +-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)
