1 |
commit: 77a1463d2b54754a79129baa63dc14b0b0139459 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon May 16 23:39:09 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 9 18:06:12 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=77a1463d |
7 |
|
8 |
kde-apps/konqueror: Add KMEXTRA=dolphin for USE=filemanager |
9 |
|
10 |
Gentoo-bug: 562224 |
11 |
|
12 |
Package-Manager: portage-2.2.28 |
13 |
|
14 |
Signed-off-by: Johannes Huber <johu <AT> gentoo.org> |
15 |
|
16 |
kde-apps/konqueror/konqueror-16.04.3.ebuild | 44 ++++++++++++++++++++--- |
17 |
kde-apps/konqueror/konqueror-16.04.49.9999.ebuild | 44 ++++++++++++++++++++--- |
18 |
kde-apps/konqueror/konqueror-9999.ebuild | 44 ++++++++++++++++++++--- |
19 |
kde-apps/konqueror/metadata.xml | 1 + |
20 |
4 files changed, 121 insertions(+), 12 deletions(-) |
21 |
|
22 |
diff --git a/kde-apps/konqueror/konqueror-16.04.3.ebuild b/kde-apps/konqueror/konqueror-16.04.3.ebuild |
23 |
index 09426ea..38fe745 100644 |
24 |
--- a/kde-apps/konqueror/konqueror-16.04.3.ebuild |
25 |
+++ b/kde-apps/konqueror/konqueror-16.04.3.ebuild |
26 |
@@ -14,12 +14,17 @@ HOMEPAGE=" |
27 |
https://konqueror.org/ |
28 |
" |
29 |
KEYWORDS="~amd64 ~arm ~x86" |
30 |
-IUSE="+bookmarks debug svg" |
31 |
+IUSE="+bookmarks debug +filemanager svg" |
32 |
# 4 of 4 tests fail. Last checked for 4.0.3 |
33 |
RESTRICT="test" |
34 |
|
35 |
DEPEND=" |
36 |
$(add_kdeapps_dep libkonq) |
37 |
+ filemanager? ( |
38 |
+ $(add_kdebase_dep kactivities '' 4.13) |
39 |
+ media-libs/phonon[qt4] |
40 |
+ x11-libs/libXrender |
41 |
+ ) |
42 |
" |
43 |
|
44 |
# bug #544630: evince[nsplugin] crashes konqueror |
45 |
@@ -28,8 +33,18 @@ RDEPEND="${DEPEND} |
46 |
$(add_kdeapps_dep kfmclient) |
47 |
$(add_kdeapps_dep kurifilter-plugins) |
48 |
bookmarks? ( $(add_kdeapps_dep keditbookmarks) ) |
49 |
+ filemanager? ( |
50 |
+ $(add_kdeapps_dep kdebase-kioslaves) |
51 |
+ $(add_kdeapps_dep kfind) |
52 |
+ $(add_kdeapps_dep konsolepart) |
53 |
+ ) |
54 |
svg? ( $(add_kdeapps_dep svgpart) ) |
55 |
!app-text/evince[nsplugin] |
56 |
+ !kde-apps/dolphin:4 |
57 |
+" |
58 |
+ |
59 |
+KMEXTRA=" |
60 |
+ dolphin/ |
61 |
" |
62 |
|
63 |
KMEXTRACTONLY=" |
64 |
@@ -40,6 +55,14 @@ KMEXTRACTONLY=" |
65 |
src_prepare() { |
66 |
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc |
67 |
|
68 |
+ use filemanager || cmake_comment_add_subdirectory dolphin |
69 |
+ |
70 |
+ # required for dolphin |
71 |
+ sed -e "/konq_copytomenu.h/ s/# //" \ |
72 |
+ -e "/konq_copytomenu.h/ s/ - anyone needs it?//" \ |
73 |
+ -i lib/konq/CMakeLists.txt \ |
74 |
+ || die "Failed to fix libkonq CMakeLists.txt" |
75 |
+ |
76 |
kde4-meta_src_prepare |
77 |
|
78 |
# Do not install *.desktop files for kfmclient |
79 |
@@ -47,12 +70,25 @@ src_prepare() { |
80 |
|| die "Failed to omit .desktop files" |
81 |
} |
82 |
|
83 |
+src_configure() { |
84 |
+ local mycmakeargs |
85 |
+ |
86 |
+ if use filemanager ; then |
87 |
+ mycmakeargs=( |
88 |
+ -DWITH_Baloo=OFF |
89 |
+ -DWITH_BalooWidgets=OFF |
90 |
+ -DWITH_KFileMetaData=OFF |
91 |
+ ) |
92 |
+ fi |
93 |
+ |
94 |
+ kde4-meta_src_configure |
95 |
+} |
96 |
+ |
97 |
pkg_postinst() { |
98 |
kde4-meta_pkg_postinst |
99 |
|
100 |
- if ! has_version kde-apps/dolphin:${SLOT} ; then |
101 |
- elog "If you want to use konqueror as a filemanager, install the dolphin kpart:" |
102 |
- elog "kde-apps/dolphin:${SLOT}" |
103 |
+ if use filemanager && ! has_version media-gfx/icoutils ; then |
104 |
+ elog "For .exe file preview support, install media-gfx/icoutils." |
105 |
fi |
106 |
|
107 |
if ! has_version virtual/jre ; then |
108 |
|
109 |
diff --git a/kde-apps/konqueror/konqueror-16.04.49.9999.ebuild b/kde-apps/konqueror/konqueror-16.04.49.9999.ebuild |
110 |
index 4e181da..8dd0e92 100644 |
111 |
--- a/kde-apps/konqueror/konqueror-16.04.49.9999.ebuild |
112 |
+++ b/kde-apps/konqueror/konqueror-16.04.49.9999.ebuild |
113 |
@@ -14,12 +14,17 @@ HOMEPAGE=" |
114 |
https://konqueror.org/ |
115 |
" |
116 |
KEYWORDS="" |
117 |
-IUSE="+bookmarks debug svg" |
118 |
+IUSE="+bookmarks debug +filemanager svg" |
119 |
# 4 of 4 tests fail. Last checked for 4.0.3 |
120 |
RESTRICT="test" |
121 |
|
122 |
DEPEND=" |
123 |
$(add_kdeapps_dep libkonq) |
124 |
+ filemanager? ( |
125 |
+ $(add_kdebase_dep kactivities '' 4.13) |
126 |
+ media-libs/phonon[qt4] |
127 |
+ x11-libs/libXrender |
128 |
+ ) |
129 |
" |
130 |
|
131 |
# bug #544630: evince[nsplugin] crashes konqueror |
132 |
@@ -28,8 +33,18 @@ RDEPEND="${DEPEND} |
133 |
$(add_kdeapps_dep kfmclient) |
134 |
$(add_kdeapps_dep kurifilter-plugins) |
135 |
bookmarks? ( $(add_kdeapps_dep keditbookmarks) ) |
136 |
+ filemanager? ( |
137 |
+ $(add_kdeapps_dep kdebase-kioslaves) |
138 |
+ $(add_kdeapps_dep kfind) |
139 |
+ $(add_kdeapps_dep konsolepart) |
140 |
+ ) |
141 |
svg? ( $(add_kdeapps_dep svgpart) ) |
142 |
!app-text/evince[nsplugin] |
143 |
+ !kde-apps/dolphin:4 |
144 |
+" |
145 |
+ |
146 |
+KMEXTRA=" |
147 |
+ dolphin/ |
148 |
" |
149 |
|
150 |
KMEXTRACTONLY=" |
151 |
@@ -40,6 +55,14 @@ KMEXTRACTONLY=" |
152 |
src_prepare() { |
153 |
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc |
154 |
|
155 |
+ use filemanager || cmake_comment_add_subdirectory dolphin |
156 |
+ |
157 |
+ # required for dolphin |
158 |
+ sed -e "/konq_copytomenu.h/ s/# //" \ |
159 |
+ -e "/konq_copytomenu.h/ s/ - anyone needs it?//" \ |
160 |
+ -i lib/konq/CMakeLists.txt \ |
161 |
+ || die "Failed to fix libkonq CMakeLists.txt" |
162 |
+ |
163 |
kde4-meta_src_prepare |
164 |
|
165 |
# Do not install *.desktop files for kfmclient |
166 |
@@ -47,12 +70,25 @@ src_prepare() { |
167 |
|| die "Failed to omit .desktop files" |
168 |
} |
169 |
|
170 |
+src_configure() { |
171 |
+ local mycmakeargs |
172 |
+ |
173 |
+ if use filemanager ; then |
174 |
+ mycmakeargs=( |
175 |
+ -DWITH_Baloo=OFF |
176 |
+ -DWITH_BalooWidgets=OFF |
177 |
+ -DWITH_KFileMetaData=OFF |
178 |
+ ) |
179 |
+ fi |
180 |
+ |
181 |
+ kde4-meta_src_configure |
182 |
+} |
183 |
+ |
184 |
pkg_postinst() { |
185 |
kde4-meta_pkg_postinst |
186 |
|
187 |
- if ! has_version kde-apps/dolphin:${SLOT} ; then |
188 |
- elog "If you want to use konqueror as a filemanager, install the dolphin kpart:" |
189 |
- elog "kde-apps/dolphin:${SLOT}" |
190 |
+ if use filemanager && ! has_version media-gfx/icoutils ; then |
191 |
+ elog "For .exe file preview support, install media-gfx/icoutils." |
192 |
fi |
193 |
|
194 |
if ! has_version virtual/jre ; then |
195 |
|
196 |
diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild |
197 |
index 4e181da..8dd0e92 100644 |
198 |
--- a/kde-apps/konqueror/konqueror-9999.ebuild |
199 |
+++ b/kde-apps/konqueror/konqueror-9999.ebuild |
200 |
@@ -14,12 +14,17 @@ HOMEPAGE=" |
201 |
https://konqueror.org/ |
202 |
" |
203 |
KEYWORDS="" |
204 |
-IUSE="+bookmarks debug svg" |
205 |
+IUSE="+bookmarks debug +filemanager svg" |
206 |
# 4 of 4 tests fail. Last checked for 4.0.3 |
207 |
RESTRICT="test" |
208 |
|
209 |
DEPEND=" |
210 |
$(add_kdeapps_dep libkonq) |
211 |
+ filemanager? ( |
212 |
+ $(add_kdebase_dep kactivities '' 4.13) |
213 |
+ media-libs/phonon[qt4] |
214 |
+ x11-libs/libXrender |
215 |
+ ) |
216 |
" |
217 |
|
218 |
# bug #544630: evince[nsplugin] crashes konqueror |
219 |
@@ -28,8 +33,18 @@ RDEPEND="${DEPEND} |
220 |
$(add_kdeapps_dep kfmclient) |
221 |
$(add_kdeapps_dep kurifilter-plugins) |
222 |
bookmarks? ( $(add_kdeapps_dep keditbookmarks) ) |
223 |
+ filemanager? ( |
224 |
+ $(add_kdeapps_dep kdebase-kioslaves) |
225 |
+ $(add_kdeapps_dep kfind) |
226 |
+ $(add_kdeapps_dep konsolepart) |
227 |
+ ) |
228 |
svg? ( $(add_kdeapps_dep svgpart) ) |
229 |
!app-text/evince[nsplugin] |
230 |
+ !kde-apps/dolphin:4 |
231 |
+" |
232 |
+ |
233 |
+KMEXTRA=" |
234 |
+ dolphin/ |
235 |
" |
236 |
|
237 |
KMEXTRACTONLY=" |
238 |
@@ -40,6 +55,14 @@ KMEXTRACTONLY=" |
239 |
src_prepare() { |
240 |
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc |
241 |
|
242 |
+ use filemanager || cmake_comment_add_subdirectory dolphin |
243 |
+ |
244 |
+ # required for dolphin |
245 |
+ sed -e "/konq_copytomenu.h/ s/# //" \ |
246 |
+ -e "/konq_copytomenu.h/ s/ - anyone needs it?//" \ |
247 |
+ -i lib/konq/CMakeLists.txt \ |
248 |
+ || die "Failed to fix libkonq CMakeLists.txt" |
249 |
+ |
250 |
kde4-meta_src_prepare |
251 |
|
252 |
# Do not install *.desktop files for kfmclient |
253 |
@@ -47,12 +70,25 @@ src_prepare() { |
254 |
|| die "Failed to omit .desktop files" |
255 |
} |
256 |
|
257 |
+src_configure() { |
258 |
+ local mycmakeargs |
259 |
+ |
260 |
+ if use filemanager ; then |
261 |
+ mycmakeargs=( |
262 |
+ -DWITH_Baloo=OFF |
263 |
+ -DWITH_BalooWidgets=OFF |
264 |
+ -DWITH_KFileMetaData=OFF |
265 |
+ ) |
266 |
+ fi |
267 |
+ |
268 |
+ kde4-meta_src_configure |
269 |
+} |
270 |
+ |
271 |
pkg_postinst() { |
272 |
kde4-meta_pkg_postinst |
273 |
|
274 |
- if ! has_version kde-apps/dolphin:${SLOT} ; then |
275 |
- elog "If you want to use konqueror as a filemanager, install the dolphin kpart:" |
276 |
- elog "kde-apps/dolphin:${SLOT}" |
277 |
+ if use filemanager && ! has_version media-gfx/icoutils ; then |
278 |
+ elog "For .exe file preview support, install media-gfx/icoutils." |
279 |
fi |
280 |
|
281 |
if ! has_version virtual/jre ; then |
282 |
|
283 |
diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml |
284 |
index c1da49e..146bea6 100644 |
285 |
--- a/kde-apps/konqueror/metadata.xml |
286 |
+++ b/kde-apps/konqueror/metadata.xml |
287 |
@@ -7,5 +7,6 @@ |
288 |
</maintainer> |
289 |
<use> |
290 |
<flag name="bookmarks">Add dependency on bookmark package.</flag> |
291 |
+ <flag name="filemanager">Install the dolphin kpart for use as a file manager.</flag> |
292 |
</use> |
293 |
</pkgmetadata> |