1 |
commit: 072ad719c6c03a0d303800152caedfa7b8f4cdfe |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 18 09:05:35 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 18 09:36:52 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072ad719 |
7 |
|
8 |
kde-frameworks/extra-cmake-modules: FindQHelpGenerator: Find Qt5Help |
9 |
|
10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../extra-cmake-modules-5.52.0-r1.ebuild | 68 ++++++++++++++++++++++ |
14 |
...ake-modules-5.52.0-fix-FindQHelpGenerator.patch | 47 +++++++++++++++ |
15 |
2 files changed, 115 insertions(+) |
16 |
|
17 |
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild |
18 |
new file mode 100644 |
19 |
index 00000000000..058394d8887 |
20 |
--- /dev/null |
21 |
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild |
22 |
@@ -0,0 +1,68 @@ |
23 |
+# Copyright 1999-2018 Gentoo Authors |
24 |
+# Distributed under the terms of the GNU General Public License v2 |
25 |
+ |
26 |
+EAPI=6 |
27 |
+ |
28 |
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) |
29 |
+ECM_KDEINSTALLDIRS="false" |
30 |
+KDE_AUTODEPS="false" |
31 |
+KDE_DEBUG="false" |
32 |
+KDE_QTHELP="false" |
33 |
+KDE_TEST="false" |
34 |
+inherit kde5 python-any-r1 |
35 |
+ |
36 |
+DESCRIPTION="Extra modules and scripts for CMake" |
37 |
+HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git" |
38 |
+ |
39 |
+LICENSE="BSD" |
40 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" |
41 |
+IUSE="doc test" |
42 |
+ |
43 |
+DEPEND=" |
44 |
+ doc? ( |
45 |
+ ${PYTHON_DEPS} |
46 |
+ $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') |
47 |
+ ) |
48 |
+ test? ( |
49 |
+ $(add_qt_dep qtcore) |
50 |
+ $(add_qt_dep linguist-tools) |
51 |
+ ) |
52 |
+" |
53 |
+RDEPEND=" |
54 |
+ app-arch/libarchive[bzip2] |
55 |
+" |
56 |
+ |
57 |
+PATCHES=( |
58 |
+ "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" |
59 |
+ "${FILESDIR}/${P}-fix-FindQHelpGenerator.patch" |
60 |
+) |
61 |
+ |
62 |
+python_check_deps() { |
63 |
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
64 |
+} |
65 |
+ |
66 |
+pkg_setup() { |
67 |
+ use doc && python-any-r1_pkg_setup |
68 |
+} |
69 |
+ |
70 |
+src_configure() { |
71 |
+ local mycmakeargs=( |
72 |
+ -DBUILD_QTHELP_DOCS=$(usex doc) |
73 |
+ -DBUILD_HTML_DOCS=$(usex doc) |
74 |
+ -DBUILD_MAN_DOCS=$(usex doc) |
75 |
+ -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" |
76 |
+ ) |
77 |
+ use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON ) |
78 |
+ |
79 |
+ kde5_src_configure |
80 |
+} |
81 |
+ |
82 |
+src_test() { |
83 |
+ # ECMToolchainAndroidTest passes but then breaks src_install |
84 |
+ # ECMPoQmToolsTest is broken, bug #627806 |
85 |
+ local myctestargs=( |
86 |
+ -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" |
87 |
+ ) |
88 |
+ |
89 |
+ kde5_src_test |
90 |
+} |
91 |
|
92 |
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.52.0-fix-FindQHelpGenerator.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.52.0-fix-FindQHelpGenerator.patch |
93 |
new file mode 100644 |
94 |
index 00000000000..9e4200121fe |
95 |
--- /dev/null |
96 |
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.52.0-fix-FindQHelpGenerator.patch |
97 |
@@ -0,0 +1,47 @@ |
98 |
+From 96d169b87292d935646b1924952829b0f4d5d669 Mon Sep 17 00:00:00 2001 |
99 |
+From: Pino Toscano <pino@×××.org> |
100 |
+Date: Sat, 17 Nov 2018 08:57:09 +0100 |
101 |
+Subject: FindQHelpGenerator: try to find Qt5Help instead of Qt5Core |
102 |
+ |
103 |
+Summary: |
104 |
+The Qt5Help CMake modules contain the Qt5::qhelpgenerator target, so |
105 |
+look for that instead of Qt5Core. Otherwise, the Qt5::qhelpgenerator |
106 |
+is available only if Qt5Help was searched previously (which does not |
107 |
+happen often). |
108 |
+ |
109 |
+Using the Qt5::qhelpgenerator is more reliable than the search for the |
110 |
+qhelpgenerator executable based on the qmake path. |
111 |
+ |
112 |
+Test Plan: |
113 |
+build some framework with -DBUILD_QCH=ON, and notice that |
114 |
+the right path of qhelpgenerator is found directly with the |
115 |
+Qt5::qhelpgenerator target. |
116 |
+ |
117 |
+Reviewers: kossebau |
118 |
+ |
119 |
+Reviewed By: kossebau |
120 |
+ |
121 |
+Subscribers: kde-frameworks-devel, kde-buildsystem |
122 |
+ |
123 |
+Tags: #frameworks, #build_system |
124 |
+ |
125 |
+Differential Revision: https://phabricator.kde.org/D16938 |
126 |
+--- |
127 |
+ find-modules/FindQHelpGenerator.cmake | 2 +- |
128 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
129 |
+ |
130 |
+diff --git a/find-modules/FindQHelpGenerator.cmake b/find-modules/FindQHelpGenerator.cmake |
131 |
+index 50aef27..272e587 100644 |
132 |
+--- a/find-modules/FindQHelpGenerator.cmake |
133 |
++++ b/find-modules/FindQHelpGenerator.cmake |
134 |
+@@ -33,7 +33,7 @@ |
135 |
+ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
136 |
+ #============================================================================= |
137 |
+ |
138 |
+-find_package(Qt5Core QUIET) |
139 |
++find_package(Qt5Help QUIET) |
140 |
+ if (TARGET Qt5::qhelpgenerator) |
141 |
+ get_target_property(QHelpGenerator_EXECUTABLE Qt5::qhelpgenerator LOCATION) |
142 |
+ else() |
143 |
+-- |
144 |
+cgit v0.11.2 |