1 |
commit: 13dec085bcd84e7c7c67ae53cd5152c08bc9213e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 2 18:29:26 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 2 18:33:32 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13dec085 |
7 |
|
8 |
kde-frameworks/extra-cmake-modules: Fix ECMFindQMLModule.cmake.in |
9 |
|
10 |
See also: https://phabricator.kde.org/D9116 |
11 |
|
12 |
Bug: https://bugs.gentoo.org/639460 |
13 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
14 |
|
15 |
kde-frameworks/extra-cmake-modules/Manifest | 2 +- |
16 |
.../extra-cmake-modules-5.40.0-r1.ebuild | 63 ++++++++++++++++++++++ |
17 |
...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 +++++++++++++ |
18 |
3 files changed, 102 insertions(+), 1 deletion(-) |
19 |
|
20 |
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest |
21 |
index a5966730bab..f466f82d096 100644 |
22 |
--- a/kde-frameworks/extra-cmake-modules/Manifest |
23 |
+++ b/kde-frameworks/extra-cmake-modules/Manifest |
24 |
@@ -1,2 +1,2 @@ |
25 |
DIST extra-cmake-modules-5.37.0.tar.xz 311696 SHA256 26198cf05c084c158bb23f0585a9df5bba1aa16b746252c80bdf4f0261b527cb SHA512 eb064dcf03960913c41c61dcb02ed12fa1b83abe507f9b161770bae8fe32b74dee45a29b12af26e636e896b97b17221adf67ea8465fcc9ab319b4ee55ab4f8bf WHIRLPOOL 0085edc89a6ac6369b509cd16ee79447f3d6c924aa06ca8bf73471772ae03afd8d57223fad70c5d5e4e3256ffc12e1de0b9176dfdbb2526015b41230a16da12d |
26 |
-DIST extra-cmake-modules-5.40.0.tar.xz 312532 SHA256 83e48889c84474e4f560e10e4eea0cc529f8511b3bd0415fcb898ac0496e630a SHA512 5390edfde7acb4c89abd2f5abc4fb533f2f4b45061127796b3a2f9d7ab65d7b8ba5cc0aee0543a28886118af8f1c7aed4f5b51c33f20223d9948ca39944c399c WHIRLPOOL 8b41b776a90c4126c9291a0bd7cde6a417240e0976b6d3325fbe7d534a90bf51e9f36871b76ebe9a11e06510367620fe63351e625b4b4665b896ed7f17ecd201 |
27 |
+DIST extra-cmake-modules-5.40.0.tar.xz 312532 BLAKE2B 0054ee4d3d17f238c4940404c6f5e00c951d305b0fce3e206bdc84dff0be683d4dc7e7043db61019422d182385ec2990e05b2df384b14e7b248d492cf918e691 SHA512 5390edfde7acb4c89abd2f5abc4fb533f2f4b45061127796b3a2f9d7ab65d7b8ba5cc0aee0543a28886118af8f1c7aed4f5b51c33f20223d9948ca39944c399c |
28 |
|
29 |
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..76f08e6ba7c |
32 |
--- /dev/null |
33 |
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild |
34 |
@@ -0,0 +1,63 @@ |
35 |
+# Copyright 1999-2017 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=6 |
39 |
+ |
40 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
41 |
+KDE_AUTODEPS="false" |
42 |
+KDE_DEBUG="false" |
43 |
+KDE_QTHELP="false" |
44 |
+KDE_TEST="false" |
45 |
+inherit kde5 python-any-r1 |
46 |
+ |
47 |
+DESCRIPTION="Extra modules and scripts for CMake" |
48 |
+HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git" |
49 |
+ |
50 |
+LICENSE="BSD" |
51 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
52 |
+IUSE="doc test" |
53 |
+ |
54 |
+DEPEND=" |
55 |
+ doc? ( |
56 |
+ ${PYTHON_DEPS} |
57 |
+ $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') |
58 |
+ ) |
59 |
+ test? ( |
60 |
+ $(add_qt_dep qtcore) |
61 |
+ $(add_qt_dep linguist-tools) |
62 |
+ ) |
63 |
+" |
64 |
+RDEPEND=" |
65 |
+ app-arch/libarchive[bzip2] |
66 |
+" |
67 |
+ |
68 |
+PATCHES=( "${FILESDIR}/${P}-qmlplugindump-path.patch" ) |
69 |
+ |
70 |
+python_check_deps() { |
71 |
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
72 |
+} |
73 |
+ |
74 |
+pkg_setup() { |
75 |
+ use doc && python-any-r1_pkg_setup |
76 |
+} |
77 |
+ |
78 |
+src_configure() { |
79 |
+ local mycmakeargs=( |
80 |
+ -DBUILD_HTML_DOCS="$(usex doc)" |
81 |
+ -DBUILD_MAN_DOCS="$(usex doc)" |
82 |
+ -DDOC_INSTALL_DIR="/usr/share/doc/${PF}" |
83 |
+ ) |
84 |
+ use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON ) |
85 |
+ |
86 |
+ cmake-utils_src_configure |
87 |
+} |
88 |
+ |
89 |
+src_test() { |
90 |
+ # ECMToolchainAndroidTest passes but then breaks src_install |
91 |
+ # ECMPoQmToolsTest is broken, bug #627806 |
92 |
+ local myctestargs=( |
93 |
+ -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" |
94 |
+ ) |
95 |
+ |
96 |
+ kde5_src_test |
97 |
+} |
98 |
|
99 |
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 |
100 |
new file mode 100644 |
101 |
index 00000000000..d1bcf791fd4 |
102 |
--- /dev/null |
103 |
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch |
104 |
@@ -0,0 +1,38 @@ |
105 |
+From 32d596b8c64c1c963b053788feeee67ef012b836 Mon Sep 17 00:00:00 2001 |
106 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
107 |
+Date: Sat, 2 Dec 2017 19:04:10 +0100 |
108 |
+Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump |
109 |
+ |
110 |
+Summary: |
111 |
+Without any hint, qmlplugindump version is whatever default is set by qtchooser. |
112 |
+Fix uses the same approach as FindQtWaylandScanner.cmake. |
113 |
+ |
114 |
+Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami. |
115 |
+ |
116 |
+Reviewers: apol |
117 |
+ |
118 |
+Subscribers: #frameworks, #build_system |
119 |
+ |
120 |
+Tags: #frameworks, #build_system |
121 |
+ |
122 |
+Differential Revision: https://phabricator.kde.org/D9116 |
123 |
+--- |
124 |
+ modules/ECMFindQMLModule.cmake.in | 2 +- |
125 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
126 |
+ |
127 |
+diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in |
128 |
+index 428d60a..d72c52b 100644 |
129 |
+--- a/modules/ECMFindQMLModule.cmake.in |
130 |
++++ b/modules/ECMFindQMLModule.cmake.in |
131 |
+@@ -27,7 +27,7 @@ |
132 |
+ |
133 |
+ include(FindPackageHandleStandardArgs) |
134 |
+ |
135 |
+-find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump) |
136 |
++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) |
137 |
+ if(NOT QMLPLUGINDUMP_PROGRAM) |
138 |
+ message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") |
139 |
+ endif() |
140 |
+-- |
141 |
+2.15.1 |
142 |
+ |