commit: ae99e91c16a6004cb9ddc18b3eb457da50dee243 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 27 19:04:26 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jan 27 19:04:26 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae99e91c
kde-frameworks/extra-cmake-modules: Rebase disable-qmlplugindump.patch Reported-by: Duncan <1i5t5.duncan <AT> cox.net> Closes: https://bugs.gentoo.org/831769 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../extra-cmake-modules/extra-cmake-modules-9999.ebuild | 2 +- ...tra-cmake-modules-5.91.0-disable-qmlplugindump.patch} | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 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 a45565a633..2d5e795709 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild @@ -34,7 +34,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch" - "${FILESDIR}/${PN}-5.90.0-disable-qmlplugindump.patch" + "${FILESDIR}/${PN}-5.91.0-disable-qmlplugindump.patch" ) python_check_deps() { diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch similarity index 86% rename from kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch rename to kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch index db46d3e861..fbec9a441e 100644 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch @@ -1,4 +1,4 @@ -From 763df79a4b468acd401f8adb5b245245a63d2934 Mon Sep 17 00:00:00 2001 +From 76ee984d5094990c2bd79c71b84ba9f82b3bf3da Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sun, 8 Dec 2019 15:01:33 +0100 Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to @@ -9,13 +9,13 @@ See also: https://phabricator.kde.org/D25812 Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135 BUG: 387753 --- - modules/ECMFindQMLModule.cmake.in | 45 ++++++++++++++++++------------- + modules/ECMFindQmlModule.cmake.in | 45 ++++++++++++++++++------------- 1 file changed, 27 insertions(+), 18 deletions(-) -diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in -index 7cd737b..9847825 100644 ---- a/modules/ECMFindQMLModule.cmake.in -+++ b/modules/ECMFindQMLModule.cmake.in +diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in +index 6c054bf0..1c17c981 100644 +--- a/modules/ECMFindQmlModule.cmake.in ++++ b/modules/ECMFindQmlModule.cmake.in @@ -7,27 +7,36 @@ include(FindPackageHandleStandardArgs) include("${ECM_MODULE_DIR}/QtVersionOption.cmake") @@ -25,7 +25,7 @@ index 7cd737b..9847825 100644 - query_qmake(qt_binaries_dir QT_HOST_BINS) - find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) -elseif (QT_MAJOR_VERSION EQUAL "6") -- find_package(Qt6QmlTools REQUIRED) +- find_package(Qt6 COMPONENTS QmlTools REQUIRED) - get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION) -endif() - @@ -51,7 +51,7 @@ index 7cd737b..9847825 100644 + query_qmake(qt_binaries_dir QT_HOST_BINS) + find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) + elseif (QT_MAJOR_VERSION EQUAL "6") -+ find_package(Qt6QmlTools REQUIRED) ++ find_package(Qt6 COMPONENTS QmlTools REQUIRED) + get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION) + endif() +
