1 |
commit: 0b20f4f1e705cfdaeffb8bb40ecf9542574a9dd2 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 31 15:14:57 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 31 15:14:57 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b20f4f1 |
7 |
|
8 |
kde-frameworks/extra-cmake-modules: Update patch by upstream review |
9 |
|
10 |
Package-Manager: Portage-2.3.21, Repoman-2.3.6 |
11 |
|
12 |
...ebuild => extra-cmake-modules-5.42.0-r1.ebuild} | 0 |
13 |
...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 55 ++++++++++++++++++---- |
14 |
2 files changed, 46 insertions(+), 9 deletions(-) |
15 |
|
16 |
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0-r1.ebuild |
17 |
similarity index 100% |
18 |
rename from kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild |
19 |
rename to kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0-r1.ebuild |
20 |
|
21 |
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch |
22 |
index d1bcf791fd4..a5b12aac357 100644 |
23 |
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch |
24 |
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch |
25 |
@@ -1,6 +1,6 @@ |
26 |
-From 32d596b8c64c1c963b053788feeee67ef012b836 Mon Sep 17 00:00:00 2001 |
27 |
+From 099fc991b85e91aa4bbfd20ba005f0c3a0002f97 Mon Sep 17 00:00:00 2001 |
28 |
From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
29 |
-Date: Sat, 2 Dec 2017 19:04:10 +0100 |
30 |
+Date: Wed, 31 Jan 2018 15:32:46 +0100 |
31 |
Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump |
32 |
|
33 |
Summary: |
34 |
@@ -11,28 +11,65 @@ Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami. |
35 |
|
36 |
Reviewers: apol |
37 |
|
38 |
-Subscribers: #frameworks, #build_system |
39 |
+Subscribers: aacid, dfaure, cgiboudeaux, #frameworks, #build_system |
40 |
|
41 |
Tags: #frameworks, #build_system |
42 |
|
43 |
Differential Revision: https://phabricator.kde.org/D9116 |
44 |
--- |
45 |
- modules/ECMFindQMLModule.cmake.in | 2 +- |
46 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
47 |
+ modules/ECMFindQMLModule.cmake.in | 5 ++++- |
48 |
+ 1 file changed, 4 insertions(+), 1 deletion(-) |
49 |
|
50 |
diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in |
51 |
-index 428d60a..d72c52b 100644 |
52 |
+index 428d60a..8109ab8 100644 |
53 |
--- a/modules/ECMFindQMLModule.cmake.in |
54 |
+++ b/modules/ECMFindQMLModule.cmake.in |
55 |
-@@ -27,7 +27,7 @@ |
56 |
+@@ -26,8 +26,11 @@ |
57 |
+ #============================================================================= |
58 |
|
59 |
include(FindPackageHandleStandardArgs) |
60 |
++include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") |
61 |
|
62 |
-find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump) |
63 |
-+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) |
64 |
++query_qmake(qt_binaries_dir QT_INSTALL_BINS) |
65 |
++ |
66 |
++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) |
67 |
if(NOT QMLPLUGINDUMP_PROGRAM) |
68 |
message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") |
69 |
endif() |
70 |
-- |
71 |
-2.15.1 |
72 |
+2.16.1 |
73 |
+ |
74 |
+From 3e3ac52aef1bbe22d293a05253c69b755f59428c Mon Sep 17 00:00:00 2001 |
75 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
76 |
+Date: Wed, 31 Jan 2018 15:58:10 +0100 |
77 |
+Subject: [PATCH] FindQtWaylandScanner.cmake: Use qmake-query for HINT |
78 |
+ |
79 |
+Instead of hardcoded /usr/lib, same solution as in D9116 |
80 |
+--- |
81 |
+ find-modules/FindQtWaylandScanner.cmake | 5 ++++- |
82 |
+ 1 file changed, 4 insertions(+), 1 deletion(-) |
83 |
+ |
84 |
+diff --git a/find-modules/FindQtWaylandScanner.cmake b/find-modules/FindQtWaylandScanner.cmake |
85 |
+index 79a1b05..37ebbdb 100644 |
86 |
+--- a/find-modules/FindQtWaylandScanner.cmake |
87 |
++++ b/find-modules/FindQtWaylandScanner.cmake |
88 |
+@@ -86,11 +86,14 @@ |
89 |
+ #============================================================================= |
90 |
+ |
91 |
+ include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake) |
92 |
++include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") |
93 |
+ |
94 |
+ ecm_find_package_version_check(QtWaylandScanner) |
95 |
+ |
96 |
++query_qmake(qt_binaries_dir QT_INSTALL_BINS) |
97 |
++ |
98 |
+ # Find qtwaylandscanner |
99 |
+-find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) |
100 |
++find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS ${qt_binaries_dir}) |
101 |
+ |
102 |
+ include(FindPackageHandleStandardArgs) |
103 |
+ find_package_handle_standard_args(QtWaylandScanner |
104 |
+-- |
105 |
+2.16.1 |