| 1 |
commit: ae99e91c16a6004cb9ddc18b3eb457da50dee243 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 27 19:04:26 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 27 19:04:26 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae99e91c |
| 7 |
|
| 8 |
kde-frameworks/extra-cmake-modules: Rebase disable-qmlplugindump.patch |
| 9 |
|
| 10 |
Reported-by: Duncan <1i5t5.duncan <AT> cox.net> |
| 11 |
Closes: https://bugs.gentoo.org/831769 |
| 12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
.../extra-cmake-modules/extra-cmake-modules-9999.ebuild | 2 +- |
| 16 |
...tra-cmake-modules-5.91.0-disable-qmlplugindump.patch} | 16 ++++++++-------- |
| 17 |
2 files changed, 9 insertions(+), 9 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 a45565a633..2d5e795709 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 |
@@ -34,7 +34,7 @@ RDEPEND=" |
| 24 |
PATCHES=( |
| 25 |
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" |
| 26 |
"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch" |
| 27 |
- "${FILESDIR}/${PN}-5.90.0-disable-qmlplugindump.patch" |
| 28 |
+ "${FILESDIR}/${PN}-5.91.0-disable-qmlplugindump.patch" |
| 29 |
) |
| 30 |
|
| 31 |
python_check_deps() { |
| 32 |
|
| 33 |
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 |
| 34 |
similarity index 86% |
| 35 |
rename from kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch |
| 36 |
rename to kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch |
| 37 |
index db46d3e861..fbec9a441e 100644 |
| 38 |
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch |
| 39 |
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch |
| 40 |
@@ -1,4 +1,4 @@ |
| 41 |
-From 763df79a4b468acd401f8adb5b245245a63d2934 Mon Sep 17 00:00:00 2001 |
| 42 |
+From 76ee984d5094990c2bd79c71b84ba9f82b3bf3da Mon Sep 17 00:00:00 2001 |
| 43 |
From: Andreas Sturmlechner <asturm@g.o> |
| 44 |
Date: Sun, 8 Dec 2019 15:01:33 +0100 |
| 45 |
Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to |
| 46 |
@@ -9,13 +9,13 @@ See also: https://phabricator.kde.org/D25812 |
| 47 |
Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135 |
| 48 |
BUG: 387753 |
| 49 |
--- |
| 50 |
- modules/ECMFindQMLModule.cmake.in | 45 ++++++++++++++++++------------- |
| 51 |
+ modules/ECMFindQmlModule.cmake.in | 45 ++++++++++++++++++------------- |
| 52 |
1 file changed, 27 insertions(+), 18 deletions(-) |
| 53 |
|
| 54 |
-diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in |
| 55 |
-index 7cd737b..9847825 100644 |
| 56 |
---- a/modules/ECMFindQMLModule.cmake.in |
| 57 |
-+++ b/modules/ECMFindQMLModule.cmake.in |
| 58 |
+diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in |
| 59 |
+index 6c054bf0..1c17c981 100644 |
| 60 |
+--- a/modules/ECMFindQmlModule.cmake.in |
| 61 |
++++ b/modules/ECMFindQmlModule.cmake.in |
| 62 |
@@ -7,27 +7,36 @@ |
| 63 |
include(FindPackageHandleStandardArgs) |
| 64 |
include("${ECM_MODULE_DIR}/QtVersionOption.cmake") |
| 65 |
@@ -25,7 +25,7 @@ index 7cd737b..9847825 100644 |
| 66 |
- query_qmake(qt_binaries_dir QT_HOST_BINS) |
| 67 |
- find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) |
| 68 |
-elseif (QT_MAJOR_VERSION EQUAL "6") |
| 69 |
-- find_package(Qt6QmlTools REQUIRED) |
| 70 |
+- find_package(Qt6 COMPONENTS QmlTools REQUIRED) |
| 71 |
- get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION) |
| 72 |
-endif() |
| 73 |
- |
| 74 |
@@ -51,7 +51,7 @@ index 7cd737b..9847825 100644 |
| 75 |
+ query_qmake(qt_binaries_dir QT_HOST_BINS) |
| 76 |
+ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) |
| 77 |
+ elseif (QT_MAJOR_VERSION EQUAL "6") |
| 78 |
-+ find_package(Qt6QmlTools REQUIRED) |
| 79 |
++ find_package(Qt6 COMPONENTS QmlTools REQUIRED) |
| 80 |
+ get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION) |
| 81 |
+ endif() |
| 82 |
+ |
Archives