1 |
commit: b9c60a48cdad024cf2778ea323e9b4d4223c169f |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Dec 17 23:22:19 2015 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 18 16:03:48 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b9c60a48 |
7 |
|
8 |
kde-apps/libkdepim: Add USE=designer |
9 |
|
10 |
Backport patch to 15.12 |
11 |
|
12 |
Package-Manager: portage-2.2.24 |
13 |
|
14 |
.../files/libkdepim-15.12.0-find-qt5designer.patch | 27 ++++++++++++++++++++++ |
15 |
....49.9999.ebuild => libkdepim-15.12.0-r1.ebuild} | 14 +++++++++-- |
16 |
kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild | 12 +++++++++- |
17 |
kde-apps/libkdepim/libkdepim-9999.ebuild | 10 +++++++- |
18 |
kde-apps/libkdepim/metadata.xml | 3 +++ |
19 |
5 files changed, 62 insertions(+), 4 deletions(-) |
20 |
|
21 |
diff --git a/kde-apps/libkdepim/files/libkdepim-15.12.0-find-qt5designer.patch b/kde-apps/libkdepim/files/libkdepim-15.12.0-find-qt5designer.patch |
22 |
new file mode 100644 |
23 |
index 0000000..1bfc631 |
24 |
--- /dev/null |
25 |
+++ b/kde-apps/libkdepim/files/libkdepim-15.12.0-find-qt5designer.patch |
26 |
@@ -0,0 +1,27 @@ |
27 |
+From: Heiko Becker <heirecka@×××××××.org> |
28 |
+Date: Thu, 17 Dec 2015 15:22:42 +0000 |
29 |
+Subject: Search for Qt5Designer |
30 |
+X-Git-Url: http://quickgit.kde.org/?p=libkdepim.git&a=commitdiff&h=b6005eb9e45965ae2249aaa41d03919824ec6dfc |
31 |
+--- |
32 |
+Search for Qt5Designer |
33 |
+ |
34 |
+Otherwise Qt5Designer_FOUND in src/designer/CMakeLists.txt is always |
35 |
+false and the corresponding code never built. |
36 |
+--- |
37 |
+ |
38 |
+ |
39 |
+--- a/CMakeLists.txt |
40 |
++++ b/CMakeLists.txt |
41 |
+@@ -45,6 +45,11 @@ |
42 |
+ find_package(KF5AkonadiSearch ${AKONADISEARCH_LIB_VERSION} CONFIG REQUIRED) |
43 |
+ set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi") |
44 |
+ |
45 |
++find_package(Qt5Designer CONFIG) |
46 |
++set_package_properties(Qt5Designer PROPERTIES |
47 |
++ PURPOSE "Required to build the Qt Designer plugins" |
48 |
++ TYPE OPTIONAL |
49 |
++) |
50 |
+ |
51 |
+ ecm_setup_version(${LIBKDEPIM_LIB_VERSION} VARIABLE_PREFIX LIBKDEPIM |
52 |
+ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/libkdepim_version.h" |
53 |
+ |
54 |
|
55 |
diff --git a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild b/kde-apps/libkdepim/libkdepim-15.12.0-r1.ebuild |
56 |
similarity index 79% |
57 |
copy from kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild |
58 |
copy to kde-apps/libkdepim/libkdepim-15.12.0-r1.ebuild |
59 |
index e2040e9..271d0fe 100644 |
60 |
--- a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild |
61 |
+++ b/kde-apps/libkdepim/libkdepim-15.12.0-r1.ebuild |
62 |
@@ -10,8 +10,8 @@ inherit kde5 |
63 |
|
64 |
DESCRIPTION="Common PIM libraries" |
65 |
LICENSE="LGPL-2+" |
66 |
-KEYWORDS="" |
67 |
-IUSE="" |
68 |
+KEYWORDS="~amd64 ~x86" |
69 |
+IUSE="designer" |
70 |
|
71 |
COMMON_DEPEND=" |
72 |
$(add_frameworks_dep kcmutils) |
73 |
@@ -33,6 +33,7 @@ COMMON_DEPEND=" |
74 |
" |
75 |
DEPEND="${COMMON_DEPEND} |
76 |
sys-devel/gettext |
77 |
+ designer? ( dev-qt/designer:5 ) |
78 |
" |
79 |
RDEPEND="${COMMON_DEPEND} |
80 |
!<kde-apps/kdepim-15.08.50:5 |
81 |
@@ -45,3 +46,12 @@ if [[ ${KDE_BUILD_TYPE} = live ]] ; then |
82 |
else |
83 |
S="${WORKDIR}/${KMNAME}-${PV}/${PN}" |
84 |
fi |
85 |
+ |
86 |
+PATCHES=( "${FILESDIR}/${PN}-15.12.0-find-qt5designer.patch" ) |
87 |
+ |
88 |
+src_configure() { |
89 |
+ local mycmakeargs=( |
90 |
+ $(cmake-utils_use_find_package designer Qt5Designer) |
91 |
+ ) |
92 |
+ kde5_src_configure |
93 |
+} |
94 |
|
95 |
diff --git a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild b/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild |
96 |
index e2040e9..510abaf 100644 |
97 |
--- a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild |
98 |
+++ b/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild |
99 |
@@ -11,7 +11,7 @@ inherit kde5 |
100 |
DESCRIPTION="Common PIM libraries" |
101 |
LICENSE="LGPL-2+" |
102 |
KEYWORDS="" |
103 |
-IUSE="" |
104 |
+IUSE="designer" |
105 |
|
106 |
COMMON_DEPEND=" |
107 |
$(add_frameworks_dep kcmutils) |
108 |
@@ -33,6 +33,7 @@ COMMON_DEPEND=" |
109 |
" |
110 |
DEPEND="${COMMON_DEPEND} |
111 |
sys-devel/gettext |
112 |
+ designer? ( dev-qt/designer:5 ) |
113 |
" |
114 |
RDEPEND="${COMMON_DEPEND} |
115 |
!<kde-apps/kdepim-15.08.50:5 |
116 |
@@ -45,3 +46,12 @@ if [[ ${KDE_BUILD_TYPE} = live ]] ; then |
117 |
else |
118 |
S="${WORKDIR}/${KMNAME}-${PV}/${PN}" |
119 |
fi |
120 |
+ |
121 |
+PATCHES=( "${FILESDIR}/${PN}-15.12.0-find-qt5designer.patch" ) |
122 |
+ |
123 |
+src_configure() { |
124 |
+ local mycmakeargs=( |
125 |
+ $(cmake-utils_use_find_package designer Qt5Designer) |
126 |
+ ) |
127 |
+ kde5_src_configure |
128 |
+} |
129 |
|
130 |
diff --git a/kde-apps/libkdepim/libkdepim-9999.ebuild b/kde-apps/libkdepim/libkdepim-9999.ebuild |
131 |
index 58c76a3..4ca9503 100644 |
132 |
--- a/kde-apps/libkdepim/libkdepim-9999.ebuild |
133 |
+++ b/kde-apps/libkdepim/libkdepim-9999.ebuild |
134 |
@@ -10,7 +10,7 @@ inherit kde5 |
135 |
DESCRIPTION="Common PIM libraries" |
136 |
LICENSE="LGPL-2+" |
137 |
KEYWORDS="" |
138 |
-IUSE="" |
139 |
+IUSE="designer" |
140 |
|
141 |
COMMON_DEPEND=" |
142 |
$(add_frameworks_dep kcmutils) |
143 |
@@ -32,9 +32,17 @@ COMMON_DEPEND=" |
144 |
" |
145 |
DEPEND="${COMMON_DEPEND} |
146 |
sys-devel/gettext |
147 |
+ designer? ( dev-qt/designer:5 ) |
148 |
" |
149 |
RDEPEND="${COMMON_DEPEND} |
150 |
!<kde-apps/kdepim-15.08.50:5 |
151 |
!kde-base/kdepim-common-libs:4 |
152 |
!kde-base/libkdepim:4 |
153 |
" |
154 |
+ |
155 |
+src_configure() { |
156 |
+ local mycmakeargs=( |
157 |
+ $(cmake-utils_use_find_package designer Qt5Designer) |
158 |
+ ) |
159 |
+ kde5_src_configure |
160 |
+} |
161 |
|
162 |
diff --git a/kde-apps/libkdepim/metadata.xml b/kde-apps/libkdepim/metadata.xml |
163 |
index a23f444..774f7f1 100644 |
164 |
--- a/kde-apps/libkdepim/metadata.xml |
165 |
+++ b/kde-apps/libkdepim/metadata.xml |
166 |
@@ -2,4 +2,7 @@ |
167 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
168 |
<pkgmetadata> |
169 |
<herd>kde</herd> |
170 |
+ <use> |
171 |
+ <flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag> |
172 |
+ </use> |
173 |
</pkgmetadata> |