commit: f6fdd254c3fa5a2c94fa4cfe713d13bd0447eb3b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Mar 25 19:29:50 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Mar 25 19:29:50 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f6fdd254
kde-frameworks/extra-cmake-modules: Rebase disable-qmlplugindump.patch Closes: https://bugs.gentoo.org/835995 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 +- ...extra-cmake-modules-5.93.0-disable-qmlplugindump.patch} | 14 +++++++------- 2 files changed, 8 insertions(+), 8 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 2d5e795709..df4d73770a 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.91.0-disable-qmlplugindump.patch" + "${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch" ) python_check_deps() { diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch similarity index 90% rename from kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch rename to kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch index fbec9a441e..0683bd3eff 100644 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch @@ -1,4 +1,4 @@ -From 76ee984d5094990c2bd79c71b84ba9f82b3bf3da Mon Sep 17 00:00:00 2001 +From 1c79ef2189dc156bbe0f182411bcc136f140a21d 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 @@ -13,7 +13,7 @@ BUG: 387753 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in -index 6c054bf0..1c17c981 100644 +index 0ee5665e..d6e1f14c 100644 --- a/modules/ECMFindQmlModule.cmake.in +++ b/modules/ECMFindQmlModule.cmake.in @@ -7,27 +7,36 @@ @@ -21,8 +21,8 @@ index 6c054bf0..1c17c981 100644 include("${ECM_MODULE_DIR}/QtVersionOption.cmake") -if (QT_MAJOR_VERSION EQUAL "5") -- include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") -- query_qmake(qt_binaries_dir QT_HOST_BINS) +- include("${ECM_MODULE_DIR}/ECMQueryQt.cmake") +- ecm_query_qt(qt_binaries_dir QT_HOST_BINS) - find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) -elseif (QT_MAJOR_VERSION EQUAL "6") - find_package(Qt6 COMPONENTS QmlTools REQUIRED) @@ -47,8 +47,8 @@ index 6c054bf0..1c17c981 100644 - set(@GENMODULE@_FOUND FALSE) + + if (QT_MAJOR_VERSION EQUAL "5") -+ include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") -+ query_qmake(qt_binaries_dir QT_HOST_BINS) ++ include("${ECM_MODULE_DIR}/ECMQueryQt.cmake") ++ ecm_query_qt(qt_binaries_dir QT_HOST_BINS) + find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) + elseif (QT_MAJOR_VERSION EQUAL "6") + find_package(Qt6 COMPONENTS QmlTools REQUIRED) @@ -72,5 +72,5 @@ index 6c054bf0..1c17c981 100644 find_package_handle_standard_args(@GENMODULE@ -- -2.34.1 +2.35.1
