1 |
commit: 49e87796953844e226f0037ede5baad8d767879b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 7 19:15:38 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 7 19:15:38 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=49e87796 |
7 |
|
8 |
kde-frameworks/extra-cmake-modules: Re-add qmlplugindump patch |
9 |
|
10 |
Still pending upstream. |
11 |
|
12 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
13 |
|
14 |
.../extra-cmake-modules-5.42.0.ebuild | 2 ++ |
15 |
...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 ++++++++++++++++++++++ |
16 |
2 files changed, 40 insertions(+) |
17 |
|
18 |
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.ebuild |
19 |
index 8b14f01dc7..fb96d84501 100644 |
20 |
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild |
21 |
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild |
22 |
@@ -31,6 +31,8 @@ RDEPEND=" |
23 |
app-arch/libarchive[bzip2] |
24 |
" |
25 |
|
26 |
+PATCHES=( "${FILESDIR}/${PN}-5.40.0-qmlplugindump-path.patch" ) |
27 |
+ |
28 |
python_check_deps() { |
29 |
has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
30 |
} |
31 |
|
32 |
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 |
33 |
new file mode 100644 |
34 |
index 0000000000..d1bcf791fd |
35 |
--- /dev/null |
36 |
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch |
37 |
@@ -0,0 +1,38 @@ |
38 |
+From 32d596b8c64c1c963b053788feeee67ef012b836 Mon Sep 17 00:00:00 2001 |
39 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
40 |
+Date: Sat, 2 Dec 2017 19:04:10 +0100 |
41 |
+Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump |
42 |
+ |
43 |
+Summary: |
44 |
+Without any hint, qmlplugindump version is whatever default is set by qtchooser. |
45 |
+Fix uses the same approach as FindQtWaylandScanner.cmake. |
46 |
+ |
47 |
+Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami. |
48 |
+ |
49 |
+Reviewers: apol |
50 |
+ |
51 |
+Subscribers: #frameworks, #build_system |
52 |
+ |
53 |
+Tags: #frameworks, #build_system |
54 |
+ |
55 |
+Differential Revision: https://phabricator.kde.org/D9116 |
56 |
+--- |
57 |
+ modules/ECMFindQMLModule.cmake.in | 2 +- |
58 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
59 |
+ |
60 |
+diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in |
61 |
+index 428d60a..d72c52b 100644 |
62 |
+--- a/modules/ECMFindQMLModule.cmake.in |
63 |
++++ b/modules/ECMFindQMLModule.cmake.in |
64 |
+@@ -27,7 +27,7 @@ |
65 |
+ |
66 |
+ include(FindPackageHandleStandardArgs) |
67 |
+ |
68 |
+-find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump) |
69 |
++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) |
70 |
+ if(NOT QMLPLUGINDUMP_PROGRAM) |
71 |
+ message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") |
72 |
+ endif() |
73 |
+-- |
74 |
+2.15.1 |
75 |
+ |