1 |
commit: b3e335668294bc4b0a8f9f870d0e529dbf058780 |
2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 31 14:39:25 2011 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 31 14:39:25 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=b3e33566 |
7 |
|
8 |
[media-gfx/digikam] Not needed here anymore |
9 |
|
10 |
--- |
11 |
media-gfx/digikam/ChangeLog | 369 -------------------- |
12 |
media-gfx/digikam/Manifest | 58 --- |
13 |
media-gfx/digikam/digikam-1.8.0.ebuild | 125 ------- |
14 |
media-gfx/digikam/digikam-1.9.0-r1.ebuild | 130 ------- |
15 |
media-gfx/digikam/digikam-1.9.0.ebuild | 125 ------- |
16 |
media-gfx/digikam/digikam-2.0.0.ebuild | 140 -------- |
17 |
media-gfx/digikam/digikam-2.0.0_rc.ebuild | 139 -------- |
18 |
media-gfx/digikam/files/digikam-1.1.0-libpgf.patch | 232 ------------ |
19 |
.../digikam/files/digikam-1.1.0-libpng14.patch | 42 --- |
20 |
.../digikam/files/digikam-1.2.0-docs-r3.patch | 56 --- |
21 |
media-gfx/digikam/files/digikam-1.2.0-lapack.patch | 126 ------- |
22 |
.../digikam/files/digikam-1.2.0-libpgf-r3.patch | 157 --------- |
23 |
media-gfx/digikam/files/digikam-1.2.0-libpgf.patch | 208 ----------- |
24 |
.../digikam/files/digikam-1.2.0-ratingwidget.patch | 11 - |
25 |
media-gfx/digikam/files/digikam-1.3.0-docs.patch | 54 --- |
26 |
media-gfx/digikam/files/digikam-1.3.0-pgf.patch | 153 -------- |
27 |
.../digikam/files/digikam-1.4.0-clapack.patch | 181 ---------- |
28 |
media-gfx/digikam/files/digikam-1.4.0-docs.patch | 58 --- |
29 |
.../digikam/files/digikam-1.5.0-unbundle.patch | 294 ---------------- |
30 |
media-gfx/digikam/files/digikam-1.6.0-docs.patch | 49 --- |
31 |
media-gfx/digikam/files/digikam-1.7.0-docs.patch | 49 --- |
32 |
media-gfx/digikam/files/digikam-1.8.0-gcc46.patch | 15 - |
33 |
media-gfx/digikam/files/digikam-1.8.0-tests.patch | 15 - |
34 |
media-gfx/digikam/files/digikam-1.9.0-docs.patch | 50 --- |
35 |
media-gfx/digikam/files/digikam-1.9.0-newpgf.patch | 92 ----- |
36 |
.../digikam/files/digikam-1.9.0-nomysql.patch | 60 ---- |
37 |
media-gfx/digikam/files/digikam-1.9.0-turbo.patch | 56 --- |
38 |
.../digikam/files/digikam-2.0.0_beta1-docs.patch | 41 --- |
39 |
.../digikam/files/digikam-2.0.0_beta4-docs.patch | 41 --- |
40 |
.../digikam/files/digikam-2.0.0_beta5-docs.patch | 42 --- |
41 |
.../files/digikam-2.0.0_rc-officialpgf.patch | 56 --- |
42 |
.../files/digikam-2.0.0_rc-officialpgf2.patch | 23 -- |
43 |
.../digikam/files/digikam-2.0.0_rc-oldpgf.patch | 26 -- |
44 |
media-gfx/digikam/metadata.xml | 17 - |
45 |
34 files changed, 0 insertions(+), 3290 deletions(-) |
46 |
|
47 |
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog |
48 |
deleted file mode 100644 |
49 |
index b6a2ada..0000000 |
50 |
--- a/media-gfx/digikam/ChangeLog |
51 |
+++ /dev/null |
52 |
@@ -1,369 +0,0 @@ |
53 |
-# ChangeLog for media-gfx/digikam |
54 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
55 |
-# $Header: $ |
56 |
- |
57 |
- 29 Jul 2011; Andreas K. Huettel <dilfridge@g.o> digikam-2.0.0.ebuild, |
58 |
- metadata.xml: |
59 |
- Finished for testing |
60 |
- |
61 |
-*digikam-2.0.0 (28 Jul 2011) |
62 |
- |
63 |
- 28 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
64 |
- -digikam-2.0.0_beta5.ebuild, -digikam-2.0.0_beta6.ebuild, |
65 |
- +digikam-2.0.0.ebuild: |
66 |
- Added work in progess, does not build yet |
67 |
- |
68 |
- 27 Jul 2011; Andreas K. Huettel <dilfridge@g.o> digikam-1.9.0.ebuild, |
69 |
- digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-newpgf.patch, |
70 |
- digikam-2.0.0_rc.ebuild: |
71 |
- Resync with main tree |
72 |
- |
73 |
- 27 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
74 |
- digikam-2.0.0_rc.ebuild: |
75 |
- Cleanup, re-add accidentally dropped useflag mysql, depend on kde-4.7 |
76 |
- |
77 |
- 06 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
78 |
- digikam-2.0.0_rc.ebuild: |
79 |
- Although not strictly required, it is probably safer to use libpgf-6.11.24 |
80 |
- |
81 |
- 05 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
82 |
- digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_rc-officialpgf2.patch: |
83 |
- Additional compile fix for libpgf-6.11.24 |
84 |
- |
85 |
- 05 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
86 |
- -files/digikam-2.0.0_officialpgf.patch, |
87 |
- +files/digikam-2.0.0_rc-officialpgf.patch: |
88 |
- Include build fix for new but unbundled libpgf |
89 |
- |
90 |
- 04 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
91 |
- digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_officialpgf.patch: |
92 |
- Add build fix for offical new libpgf |
93 |
- |
94 |
- 03 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
95 |
- digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_rc-oldpgf.patch: |
96 |
- Add build fix for older libpgf |
97 |
- |
98 |
-*digikam-2.0.0_rc (02 Jul 2011) |
99 |
- |
100 |
- 02 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
101 |
- +digikam-2.0.0_rc.ebuild, metadata.xml: |
102 |
- Version bump, does not build yet (kde bug 276969) |
103 |
- |
104 |
- 02 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
105 |
- -digikam-1.2.0-r4.ebuild: |
106 |
- Drop old |
107 |
- |
108 |
-*digikam-2.0.0_beta6 (02 Jul 2011) |
109 |
- |
110 |
- 02 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
111 |
- +digikam-2.0.0_beta6.ebuild: |
112 |
- Resync with kde overlay |
113 |
- |
114 |
- 20 May 2011; Andreas K. Huettel <dilfridge@g.o> |
115 |
- digikam-2.0.0_beta5.ebuild: |
116 |
- Backport build fix for libjpeg-turbo |
117 |
- |
118 |
- 20 May 2011; Andreas K. Huettel <dilfridge@g.o> |
119 |
- digikam-1.9.0-r1.ebuild: |
120 |
- Add upstream fix for libjpeg-turbo |
121 |
- |
122 |
- 11 May 2011; Andreas K. Huettel <dilfridge@g.o> |
123 |
- digikam-2.0.0_beta5.ebuild: |
124 |
- QA cleanups |
125 |
- |
126 |
- 11 May 2011; Andreas K. Huettel <dilfridge@g.o> |
127 |
- -digikam-2.0.0_beta2.ebuild, -digikam-2.0.0_beta3.ebuild, |
128 |
- -digikam-2.0.0_beta4.ebuild, digikam-2.0.0_beta5.ebuild: |
129 |
- Remove old; drop ppc keyword |
130 |
- |
131 |
-*digikam-1.9.0-r1 (11 May 2011) |
132 |
- |
133 |
- 11 May 2011; Andreas K. Huettel <dilfridge@g.o> digikam-1.9.0.ebuild, |
134 |
- +digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-nomysql.patch: |
135 |
- Resync with tree |
136 |
- |
137 |
-*digikam-2.0.0_beta5 (11 May 2011) |
138 |
- |
139 |
- 11 May 2011; Andreas K. Huettel <dilfridge@g.o> |
140 |
- +digikam-2.0.0_beta5.ebuild, +files/digikam-2.0.0_beta5-docs.patch: |
141 |
- Version bump |
142 |
- |
143 |
- 11 Apr 2011; Andreas K. Huettel <dilfridge@g.o> |
144 |
- digikam-2.0.0_beta4.ebuild: |
145 |
- Allow sci-libs/lapack-atlas as alternative to clapack |
146 |
- |
147 |
-*digikam-2.0.0_beta4 (01 Apr 2011) |
148 |
- |
149 |
- 01 Apr 2011; Andreas K. Huettel <dilfridge@g.o> |
150 |
- +digikam-2.0.0_beta4.ebuild, +files/digikam-2.0.0_beta4-docs.patch: |
151 |
- Version bump |
152 |
- |
153 |
- 01 Mar 2011; Andreas K. Huettel <dilfridge@g.o> |
154 |
- digikam-2.0.0_beta2.ebuild, digikam-2.0.0_beta3.ebuild: |
155 |
- Readd ~ppc in line with digikam-1.9.0 |
156 |
- |
157 |
- 01 Mar 2011; Andreas K. Huettel <dilfridge@g.o> |
158 |
- digikam-1.2.0-r4.ebuild, digikam-1.8.0.ebuild, |
159 |
- +files/digikam-1.8.0-gcc46.patch, digikam-1.9.0.ebuild: |
160 |
- Resync with main tree |
161 |
- |
162 |
-*digikam-2.0.0_beta3 (28 Feb 2011) |
163 |
- |
164 |
- 28 Feb 2011; Andreas K. Huettel <dilfridge@g.o> |
165 |
- +digikam-2.0.0_beta3.ebuild: |
166 |
- Version bump |
167 |
- |
168 |
-*digikam-1.9.0 (28 Feb 2011) |
169 |
- |
170 |
- 28 Feb 2011; Andreas K. Huettel <dilfridge@g.o> |
171 |
- +digikam-1.9.0.ebuild, +files/digikam-1.9.0-docs.patch: |
172 |
- Version bump |
173 |
- |
174 |
- 03 Feb 2011; Andreas K. Huettel <dilfridge@g.o> |
175 |
- digikam-2.0.0_beta2.ebuild: |
176 |
- New package locations |
177 |
- |
178 |
- 03 Feb 2011; Andreas K. Huettel <dilfridge@g.o> |
179 |
- digikam-2.0.0_beta2.ebuild: |
180 |
- More precise dependencies |
181 |
- |
182 |
- 02 Feb 2011; Andreas K. Huettel <dilfridge@g.o> |
183 |
- digikam-2.0.0_beta2.ebuild, metadata.xml: |
184 |
- Useflag geolocation makes no sense anymore (forced on) |
185 |
- |
186 |
- 02 Feb 2011; Andreas K. Huettel <dilfridge@g.o> |
187 |
- -digikam-2.0.0_beta1.ebuild: |
188 |
- Cleanup |
189 |
- |
190 |
- 01 Feb 2011; Andreas K. Huettel <dilfridge@g.o> |
191 |
- digikam-2.0.0_beta2.ebuild: |
192 |
- Fix typo |
193 |
- |
194 |
-*digikam-2.0.0_beta2 (01 Feb 2011) |
195 |
- |
196 |
- 01 Feb 2011; Andreas K. Huettel <dilfridge@g.o> |
197 |
- -digikam-1.1.0-r1.ebuild, -digikam-1.2.0-r2.ebuild, |
198 |
- -digikam-1.2.0-r3.ebuild, digikam-1.2.0-r4.ebuild, -digikam-1.4.0.ebuild, |
199 |
- -digikam-1.4.0-r1.ebuild, -digikam-1.5.0.ebuild, -digikam-1.6.0.ebuild, |
200 |
- -digikam-1.7.0.ebuild, +digikam-2.0.0_beta2.ebuild, -digikam-9999.ebuild: |
201 |
- Version bump; cleanup of EAPI=2 ebuilds |
202 |
- |
203 |
- 30 Jan 2011; Andreas K. Huettel <dilfridge@g.o> |
204 |
- digikam-2.0.0_beta1.ebuild, files/digikam-2.0.0_beta1-docs.patch: |
205 |
- Got it to configure |
206 |
- |
207 |
- 28 Jan 2011; Andreas K. Huettel <dilfridge@g.o> |
208 |
- digikam-1.8.0.ebuild, +files/digikam-1.8.0-tests.patch: |
209 |
- Fix building of the tests |
210 |
- |
211 |
-*digikam-1.8.0 (28 Jan 2011) |
212 |
- |
213 |
- 28 Jan 2011; Andreas K. Huettel <dilfridge@g.o> |
214 |
- +digikam-1.8.0.ebuild: |
215 |
- Version bump |
216 |
- |
217 |
- 28 Jan 2011; Andreas K. Huettel <dilfridge@g.o> |
218 |
- digikam-1.6.0.ebuild, digikam-1.7.0.ebuild: |
219 |
- Resync with tree |
220 |
- |
221 |
- 24 Jan 2011; Andreas K. Huettel <dilfridge@g.o> |
222 |
- digikam-2.0.0_beta1.ebuild, +files/digikam-2.0.0_beta1-docs.patch: |
223 |
- Updated docs patch |
224 |
- |
225 |
- 09 Jan 2011; Andreas K. Huettel <dilfridge@g.o> |
226 |
- digikam-2.0.0_beta1.ebuild, digikam-9999.ebuild: |
227 |
- Cleanups and unify with live ebuild |
228 |
- |
229 |
-*digikam-2.0.0_beta1 (09 Jan 2011) |
230 |
- |
231 |
- 09 Jan 2011; Andreas K. Huettel <dilfridge@g.o> |
232 |
- +digikam-2.0.0_beta1.ebuild: |
233 |
- Blind version bump |
234 |
- |
235 |
- 28 Dec 2010; Andreas K. Huettel <dilfridge@g.o> |
236 |
- digikam-1.7.0.ebuild, +files/digikam-1.7.0-docs.patch: |
237 |
- Updated docs patch |
238 |
- |
239 |
-*digikam-1.7.0 (25 Dec 2010) |
240 |
- |
241 |
- 25 Dec 2010; Andreas K. Huettel <dilfridge@g.o> |
242 |
- +digikam-1.7.0.ebuild: |
243 |
- Blind version bump |
244 |
- |
245 |
-*digikam-1.2.0-r4 (25 Nov 2010) |
246 |
- |
247 |
- 25 Nov 2010; Andreas K. Huettel <dilfridge@g.o> |
248 |
- digikam-1.2.0-r3.ebuild, +digikam-1.2.0-r4.ebuild, digikam-1.5.0.ebuild, |
249 |
- digikam-1.6.0.ebuild: |
250 |
- Resync with tree |
251 |
- |
252 |
-*digikam-1.6.0 (24 Nov 2010) |
253 |
- |
254 |
- 24 Nov 2010; Andreas K. Huettel <dilfridge@g.o> |
255 |
- +digikam-1.6.0.ebuild, +files/digikam-1.6.0-docs.patch: |
256 |
- Version bump |
257 |
- |
258 |
- 16 Oct 2010; Andreas K. Huettel <dilfridge@g.o> Manifest: |
259 |
- Remanifested after updating doc-showfoto distfile |
260 |
- |
261 |
-*digikam-1.5.0-r1 (16 Oct 2010) |
262 |
- |
263 |
- 16 Oct 2010; Andreas K. Huettel <dilfridge@g.o> |
264 |
- +digikam-1.5.0-r1.ebuild: |
265 |
- Added the showfoto handbook |
266 |
- |
267 |
- 15 Oct 2010; Andreas K. Huettel <dilfridge@g.o> |
268 |
- digikam-1.5.0.ebuild: |
269 |
- Resync with main tree; updated linguas |
270 |
- |
271 |
- 15 Oct 2010; Andreas K. Huettel <dilfridge@g.o> |
272 |
- digikam-1.5.0.ebuild: |
273 |
- Correct qt-sql dependency |
274 |
- |
275 |
- 15 Oct 2010; Andreas K. Huettel <dilfridge@g.o> |
276 |
- digikam-1.5.0.ebuild: |
277 |
- Force-enabled lensfun. |
278 |
- |
279 |
- 15 Oct 2010; Andreas K. Huettel <dilfridge@g.o> |
280 |
- digikam-1.5.0.ebuild, -files/digikam-1.5.0-pgf.patch, |
281 |
- +files/digikam-1.5.0-unbundle.patch: |
282 |
- Apply unbundle logic also to lensfun. Problem is, lensfun is not yet |
283 |
- found! |
284 |
- |
285 |
-*digikam-1.5.0 (12 Oct 2010) |
286 |
- |
287 |
- 12 Oct 2010; Andreas K. Huettel <dilfridge@g.o> |
288 |
- +digikam-1.5.0.ebuild, +files/digikam-1.5.0-pgf.patch: |
289 |
- Version bump. Builds and installs fine. The database dependencies and the |
290 |
- liblensfun detection still need some checking. |
291 |
- |
292 |
- 25 Sep 2010; Andreas K. Huettel <dilfridge@g.o> |
293 |
- -digikam-1.4.0-r51.ebuild: |
294 |
- Cleanup |
295 |
- |
296 |
- 25 Sep 2010; Andreas K. Huettel <dilfridge@g.o> |
297 |
- digikam-1.2.0-r3.ebuild: |
298 |
- Seems like api doc building needs latex. |
299 |
- |
300 |
- 25 Sep 2010; Andreas K. Huettel <dilfridge@g.o> |
301 |
- files/digikam-1.2.0-docs-r3.patch: |
302 |
- Fixed the docs patch. |
303 |
- |
304 |
- 25 Sep 2010; Andreas K. Huettel <dilfridge@g.o> |
305 |
- digikam-1.2.0-r3.ebuild: |
306 |
- Really move all doc files. |
307 |
- |
308 |
- 25 Sep 2010; Andreas K. Huettel <dilfridge@g.o> |
309 |
- digikam-1.2.0-r3.ebuild: |
310 |
- Fixed path of unpacked handbook files |
311 |
- |
312 |
-*digikam-1.2.0-r3 (25 Sep 2010) |
313 |
- |
314 |
- 25 Sep 2010; Andreas K. Huettel <dilfridge@g.o> |
315 |
- +digikam-1.2.0-r3.ebuild, +files/digikam-1.2.0-docs-r3.patch, |
316 |
- +files/digikam-1.2.0-libpgf-r3.patch: |
317 |
- Backported documentation additions to 1.2.0 |
318 |
- |
319 |
- 25 Sep 2010; Andreas K. Huettel <dilfridge@g.o> |
320 |
- digikam-1.4.0-r1.ebuild: |
321 |
- Added elog about api docs and installed readme-handbook.txt |
322 |
- |
323 |
- 24 Sep 2010; Andreas K. Huettel <dilfridge@g.o> |
324 |
- digikam-1.4.0-r1.ebuild, files/digikam-1.4.0-docs.patch: |
325 |
- Finished - now doc controls the building of the api documentation and |
326 |
- handbook controls the installation of a current handbook snapshot. |
327 |
- |
328 |
- 22 Sep 2010; Andreas K. Huettel <dilfridge@g.o> |
329 |
- digikam-1.4.0-r1.ebuild, +files/digikam-1.4.0-docs.patch: |
330 |
- Builds the docs now on request, but does not install them yet... |
331 |
- |
332 |
-*digikam-1.4.0-r51 (22 Sep 2010) |
333 |
- |
334 |
- 22 Sep 2010; Andreas K. Huettel <dilfridge@g.o> |
335 |
- digikam-1.4.0-r1.ebuild, +digikam-1.4.0-r51.ebuild: |
336 |
- Renamed -r1 to -r51 and copied -r0 to -r1 |
337 |
- |
338 |
- 18 Sep 2010; Andreas K. Huettel <dilfridge@g.o> |
339 |
- digikam-1.4.0.ebuild: |
340 |
- Even worse. We need both backends sqlite and mysql. |
341 |
- |
342 |
- 18 Sep 2010; Andreas K. Huettel <dilfridge@g.o> |
343 |
- digikam-1.4.0.ebuild: |
344 |
- It seems that we need not sqlite but mysql in qt-sql... |
345 |
- |
346 |
-*digikam-1.2.0-r2 (18 Sep 2010) |
347 |
-*digikam-1.1.0-r1 (18 Sep 2010) |
348 |
- |
349 |
- 18 Sep 2010; Andreas K. Huettel <dilfridge@g.o> |
350 |
- +digikam-1.1.0-r1.ebuild, +files/digikam-1.1.0-libpgf.patch, |
351 |
- +files/digikam-1.1.0-libpng14.patch, +digikam-1.2.0-r2.ebuild, |
352 |
- +files/digikam-1.2.0-lapack.patch, +files/digikam-1.2.0-libpgf.patch, |
353 |
- +files/digikam-1.2.0-ratingwidget.patch, +digikam-1.4.0.ebuild, |
354 |
- +files/digikam-1.4.0-clapack.patch, metadata.xml: |
355 |
- Synced files with main tree. |
356 |
- |
357 |
- 29 Aug 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de> |
358 |
- digikam-1.4.0.ebuild: |
359 |
- Change clapack and f2c headers from local to global in ebuild. |
360 |
- |
361 |
-*digikam-1.4.0 (28 Aug 2010) |
362 |
- |
363 |
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de> |
364 |
- +digikam-1.4.0.ebuild, digikam-9999.ebuild: |
365 |
- Version bump and update of live ebuild. |
366 |
- |
367 |
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de> |
368 |
- digikam-1.3.0-r2.ebuild: |
369 |
- Actually remove the unneeded Fortran dependency... |
370 |
- |
371 |
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de> |
372 |
- digikam-1.3.0-r2.ebuild, files/digikam-1.3.0-clapack.patch: |
373 |
- Introduce switch to completely disable the bundled libraries. |
374 |
- |
375 |
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de> |
376 |
- files/digikam-1.3.0-clapack.patch: |
377 |
- Removed explicit linking to f2c. |
378 |
- |
379 |
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de> |
380 |
- files/digikam-1.3.0-clapack.patch: |
381 |
- Removed explicit linking to blas. |
382 |
- |
383 |
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de> |
384 |
- files/digikam-1.3.0-clapack.patch: |
385 |
- Cleanup of experiments in the CMakeLists... |
386 |
- |
387 |
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de> |
388 |
- digikam-1.3.0-r2.ebuild, files/digikam-1.3.0-clapack.patch: |
389 |
- Works now with the new clapack ebuild. The f2c_ symbol prefix was the |
390 |
- problem. |
391 |
- |
392 |
- 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de> |
393 |
- files/digikam-1.3.0-clapack.patch: |
394 |
- Still linking problems. |
395 |
- |
396 |
- 27 Aug 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de> |
397 |
- digikam-1.3.0-r2.ebuild, files/digikam-1.3.0-clapack.patch: |
398 |
- Next try. Still missing a -lf2c somewhere. |
399 |
- |
400 |
-*digikam-1.3.0-r2 (27 Aug 2010) |
401 |
- |
402 |
- 27 Aug 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de> |
403 |
- -digikam-1.3.0-r1.ebuild, +digikam-1.3.0-r2.ebuild, |
404 |
- +files/digikam-1.3.0-clapack.patch, +files/digikam-1.3.0-docs.patch, |
405 |
- -files/digikam-1.3.0-lapack-r1.patch, +files/digikam-1.3.0-pgf.patch: |
406 |
- First refactoring that might be complete. |
407 |
- |
408 |
-*digikam-1.3.0-r1 (25 Aug 2010) |
409 |
- |
410 |
- 25 Aug 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de> |
411 |
- +digikam-1.3.0-r1.ebuild, +files/digikam-1.3.0-lapack-r1.patch: |
412 |
- First test of conditional lapack patch. |
413 |
- |
414 |
-*digikam-9999 (25 Aug 2010) |
415 |
-*digikam-1.3.0 (25 Aug 2010) |
416 |
- |
417 |
- 25 Aug 2010; Andreas K. Huettel (dilfridge) <mail@×××××××××.de> |
418 |
- +digikam-1.3.0.ebuild, +files/digikam-1.3.0-lapack.patch, |
419 |
- +files/digikam-1.3.0-libpgf.patch, +digikam-9999.ebuild, +metadata.xml: |
420 |
- Copied from kde overlay. |
421 |
- |
422 |
|
423 |
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest |
424 |
deleted file mode 100644 |
425 |
index 313f8ea..0000000 |
426 |
--- a/media-gfx/digikam/Manifest |
427 |
+++ /dev/null |
428 |
@@ -1,58 +0,0 @@ |
429 |
------BEGIN PGP SIGNED MESSAGE----- |
430 |
-Hash: SHA512 |
431 |
- |
432 |
-AUX digikam-1.1.0-libpgf.patch 8996 RMD160 4f1a7ad7b28c43b3fe2e454eb3351f27a14bde6f SHA1 fd2b98e23c31d880a2a32f28161f279abef82c22 SHA256 f2001099ee5538a31a9660c223e59a25a19eb7c36a191831b849e1b81c58856d |
433 |
-AUX digikam-1.1.0-libpng14.patch 1580 RMD160 769e9bf4030d795349cb260854e26c189471ccbc SHA1 9b3123dad7bd7530db6833296dc1de7ec240fd54 SHA256 0ae5e279aedc80857cb27ace7d1609b6cf632853513445896b88a7365b763fb9 |
434 |
-AUX digikam-1.2.0-docs-r3.patch 1926 RMD160 963f134c1bdb2e6b1a59b82efb7009733294ce6a SHA1 7cf403d5fd8f20142b7c1c6f6de225b5e66c28b9 SHA256 0687cd39780c1e40fec424f6ae5cce851e460681d02088eec763902c170ecb28 |
435 |
-AUX digikam-1.2.0-lapack.patch 6429 RMD160 e42b9600822fbd28b31c751fe6515a691db4cb0b SHA1 a495d7734c355419e4cba629354e4e9077f15782 SHA256 02169ca57f86f3f7d40dced07b7c54f612bd8fe3b03d2a5808184c47b5b360c0 |
436 |
-AUX digikam-1.2.0-libpgf-r3.patch 6824 RMD160 cf771745da65673a6783a3ed9d6d2a0e74c69923 SHA1 857589931a4c2acefcc822b664dd02ce324ea152 SHA256 0424234746611e2b75b74725e53705277308fc3596ac095013de985cc6a01622 |
437 |
-AUX digikam-1.2.0-libpgf.patch 8505 RMD160 524cfb182518f45e6d2a683642486eb84a3471d3 SHA1 d86fec9b63442f472d0ce7dd0d20939fe389eadc SHA256 8c603858103f056d17d4e8d9a3cb1d6464de6d174d82ff50882611e27564f465 |
438 |
-AUX digikam-1.2.0-ratingwidget.patch 413 RMD160 b7e86997019fa16590a565b8e18fb43c287c7e88 SHA1 aa90381903000f28c105677e12f4b6813363659a SHA256 48cf828b847cd4346b9f5512fa1a010565680d31996bf2492c7bf256caf04231 |
439 |
-AUX digikam-1.3.0-docs.patch 1910 RMD160 c4d644e91a0b492c8c9a8e53ed0ae19fa743dabc SHA1 6d3c6519e4d7351198f6275639afe448e09d92b7 SHA256 d8048791e9623fe99796d71bc835ac568786b4c5a643b3d02c6d80472e725b99 |
440 |
-AUX digikam-1.3.0-pgf.patch 6006 RMD160 bfda7c95a633f4967935545f66d850fd94db9566 SHA1 43295130d7a62dc27097ed9730b3b47e13f2ab3f SHA256 84c219c7238790288b90acdb255bce2e40e3c5f19476885a2d456698e2f57205 |
441 |
-AUX digikam-1.4.0-clapack.patch 7429 RMD160 a10cf8ff044e42cfbb3880ed543b3df0221655e6 SHA1 7cd6461ff474503124a3116b8dfd8bb264c5afb6 SHA256 1e2f1d11a612f1cff63acc46db5e5818a438d35d5aaef5b40ea6633b1f4b079e |
442 |
-AUX digikam-1.4.0-docs.patch 1953 RMD160 c90ab96aea6e08bca963a22bee5f7868de22a708 SHA1 dbdb4ff0d4697006a12b18be1b5cf5f903b3cb70 SHA256 d4f439b2b6d86833b82c0101ed1f34cd1fc8611a4917db8ca4611437757cdce6 |
443 |
-AUX digikam-1.5.0-unbundle.patch 11772 RMD160 a593a67bd5d1ea02f695dc51f6240917e4f7ccdc SHA1 b989dc93f5949b1d313234d28b24b4e024d82861 SHA256 28320a7d1beb3ad8caf7fd011a93ab3f6835191183477c673c2f27662417d8ad |
444 |
-AUX digikam-1.6.0-docs.patch 1438 RMD160 d4507c7aabe6eceb700ae8e3b76ac90c500c3326 SHA1 b6f477d6e6ceaef8947071a12cf07e188789fc81 SHA256 21286862bb1dc5893cec0b16cf563b75edb6fe952f6aad7add6f4f59a575d2b8 |
445 |
-AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf9202996907055 SHA1 281f7ad8644aa3f6c284cef7db40f330c8cec5d7 SHA256 7c32e5193a2ce168d10cdb3ea0bfa3a06774220013e51f61e8ba02fe65958ac6 |
446 |
-AUX digikam-1.8.0-gcc46.patch 512 RMD160 950c4744a8d4bfe88f0f19233bfd5aefb87ccbba SHA1 e3682e8af28233609c12817ec13a120c95a169be SHA256 088709ad10f71266957d237fabba9ee6f1de0f43ba2c5f63badbeb974d140241 |
447 |
-AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c |
448 |
-AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a931af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af |
449 |
-AUX digikam-1.9.0-newpgf.patch 3463 RMD160 4e5c506e81436aaafe5b789d79adcb1caee4407b SHA1 3bb97db282fbb0c50e03cd4ba6c5ac6821558620 SHA256 9ca068c87868b9709d75441795bfff2790d13957354b675a9aa94d5f3d55eca8 |
450 |
-AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c |
451 |
-AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310a2 SHA1 e9383e730b81348656c3482700dec59a3ba5a499 SHA256 765338d842b39622428c068d9e190cf0f97933cd66845fea2ff0b5f79ed7b2cc |
452 |
-AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c |
453 |
-AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac |
454 |
-AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964 |
455 |
-AUX digikam-2.0.0_rc-officialpgf.patch 2351 RMD160 a3be56a7377b013bfa2a3539a8bbe7cfc9d3a75d SHA1 883b79dca41f7c624de3a8dc85b02f2dcae363a9 SHA256 bf40b21501bb944993017fcc0f05411e100b88708b1560ddd00e7ca203db3bda |
456 |
-AUX digikam-2.0.0_rc-officialpgf2.patch 824 RMD160 54715604f3ca772253fee111f311028bc6dc9643 SHA1 8d170abfebddbf1d4f146d6c0b568f2a6262466a SHA256 0f3f010da6f7230ef865169db58f8595796354726b5599e975fde42af4fecbd5 |
457 |
-AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c |
458 |
-DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa |
459 |
-DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5 |
460 |
-DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 564354c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691 |
461 |
-DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234 |
462 |
-DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467 |
463 |
-EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4 |
464 |
-EBUILD digikam-1.9.0-r1.ebuild 3347 RMD160 3cdaf055dc0b801a3cd05ce5ebd91a7db10ff819 SHA1 29390bef0da866f1f914ba05e046f15f78297d4e SHA256 2b83becdcae58d502d977afe0551abf24b80365bb42be54144444b969d7342e2 |
465 |
-EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a342974c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75 |
466 |
-EBUILD digikam-2.0.0.ebuild 3616 RMD160 10830e6642d54e9438a172f662b83cd6f3e1dd97 SHA1 97d2aead3d64120088b86657c260806ac7c7e5da SHA256 574945446a4426360c4fe5e6598e03fe61feea0eea2ea76a4c7f8f20742e1f49 |
467 |
-EBUILD digikam-2.0.0_rc.ebuild 3500 RMD160 34a75d9a7b3aea4e5065cfc94d1674672a9a5ce3 SHA1 17abcd6e5996cc57a83fee9f9b0088aeaf1f4054 SHA256 2254955af12fb79aebdaec5dbaa6c3fe8e747ce47c42c22f2067ddddbf37f89a |
468 |
-MISC ChangeLog 12539 RMD160 4e62c096a9cfca3dba63c5b50bc7b3b7fc467994 SHA1 48e665e87f787aace2ba417c8e1e6290503a2064 SHA256 db71a82aa54bd1e9370fee3da6f48e9fdc980117539d1ffbbefaac5017071e40 |
469 |
-MISC metadata.xml 751 RMD160 b65e7816a03a284f440d296c1853aa913105129a SHA1 c6bf2cf0d471e4d4ffdbb5185889a0e9cd65af39 SHA256 4b8eced4b0649dc935acffac97119bb70862bebd51a686b32778745b407eb0cb |
470 |
------BEGIN PGP SIGNATURE----- |
471 |
-Version: GnuPG v2.0.17 (GNU/Linux) |
472 |
- |
473 |
-iQIcBAEBCgAGBQJOMot4AAoJEEb+UGWnxTyHRoYP/1eAmo0/jXC8YVFVZos1bpU4 |
474 |
-8eM0oUArsHkR/v26T1mJB+a9D+CgkP9fLO0OvQsg2LUgc0JjCXxG+9t9LZb1wKA3 |
475 |
-C9OF9vt7XSYccVtyT63p1R9uslhvLWiKiJLLmZt19AxqtMLDiaZy6xF7czBO1Hi4 |
476 |
-yXCYzTfn74hW3qHsaj/26Fh29J/3eD7qq5f4Zli1tE6bcaTGAAAs5eJZ+t63ChxU |
477 |
-ieK/IWM6Nw7wA01U+kvqLIxVl7SdZVFu5IMVAKj/aIVTybIUHexCR+7NZKsV/8Kl |
478 |
-FuyvRKe7zqg4Txwprb1ay9xxzr04oj5h13S6yjKQZYuzQ7X8jCMLx/KRdrvhpomv |
479 |
-FihdYFmmDFpBlCscGoAvMjdLP2G9HyeXIe1ixzNxEV69b5xoXUOqg0cXkNjQUOdT |
480 |
-EAFb1Z0934Xe804lqBZy1enn+crz02/0IGvnbCSfGvr+PSjz8Y8X20BpfbtUqkQb |
481 |
-1CLnncbZNGy7IJAnVsocE4D4Gk8tBISSo3NmSYQsjAF+D2MqphC52U7SXmlkP1SQ |
482 |
-LP3HnJH62vHvsb13WyZnAlYmYf1jkyr3m0v5F1LkXbHwDI31z0xC/HPeBxqNWTnF |
483 |
-vm0TNAdDaHNhSthVugP8Mk6tGD5J09txMGI/NIROSjjJ6Cu+ysIKIvaROMfZcCgh |
484 |
-52aEbnSUVNe16zwIgArv |
485 |
-=g+MZ |
486 |
------END PGP SIGNATURE----- |
487 |
|
488 |
diff --git a/media-gfx/digikam/digikam-1.8.0.ebuild b/media-gfx/digikam/digikam-1.8.0.ebuild |
489 |
deleted file mode 100644 |
490 |
index 0f4eca1..0000000 |
491 |
--- a/media-gfx/digikam/digikam-1.8.0.ebuild |
492 |
+++ /dev/null |
493 |
@@ -1,125 +0,0 @@ |
494 |
-# Copyright 1999-2011 Gentoo Foundation |
495 |
-# Distributed under the terms of the GNU General Public License v2 |
496 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.8.0.ebuild,v 1.4 2011/02/11 20:33:40 xarthisius Exp $ |
497 |
- |
498 |
-EAPI=3 |
499 |
- |
500 |
-KDE_LINGUAS="ar be bg ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl he hi hne hr hu is it ja km |
501 |
-ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW" |
502 |
-KMNAME="extragear/graphics" |
503 |
- |
504 |
-# needed for sufficiently new libkdcraw |
505 |
-KDE_MINIMAL="4.5" |
506 |
-inherit kde4-base |
507 |
- |
508 |
-MY_P="${PN}-${PV/_/-}" |
509 |
- |
510 |
-DESCRIPTION="A digital photo management application for KDE." |
511 |
-HOMEPAGE="http://www.digikam.org/" |
512 |
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 |
513 |
- handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )" |
514 |
- |
515 |
-LICENSE="GPL-2 |
516 |
- handbook? ( FDL-1.2 )" |
517 |
-KEYWORDS="~amd64 ~ppc ~x86" |
518 |
-SLOT="4" |
519 |
-IUSE="addressbook debug doc geolocation gphoto2 handbook semantic-desktop themedesigner +thumbnails video" |
520 |
- |
521 |
-CDEPEND=" |
522 |
- >=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?] |
523 |
- >=kde-base/libkdcraw-${KDE_MINIMAL} |
524 |
- >=kde-base/libkexiv2-${KDE_MINIMAL} |
525 |
- >=kde-base/libkipi-${KDE_MINIMAL} |
526 |
- >=kde-base/solid-${KDE_MINIMAL} |
527 |
- media-libs/jasper |
528 |
- virtual/jpeg |
529 |
- media-libs/lcms:0 |
530 |
- >=media-libs/lensfun-0.2.5 |
531 |
- media-libs/liblqr |
532 |
- media-libs/libpng |
533 |
- media-libs/tiff |
534 |
- media-libs/libpgf |
535 |
- >=media-plugins/kipi-plugins-1.2.0-r1 |
536 |
- >=sci-libs/clapack-3.2.1-r3 |
537 |
- virtual/mysql |
538 |
- x11-libs/qt-gui[qt3support] |
539 |
- || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) |
540 |
- addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} ) |
541 |
- geolocation? ( >=kde-base/marble-${KDE_MINIMAL}[plasma] ) |
542 |
- gphoto2? ( media-libs/libgphoto2 ) |
543 |
-" |
544 |
-RDEPEND="${CDEPEND} |
545 |
- >=kde-base/kreadconfig-${KDE_MINIMAL} |
546 |
- video? ( |
547 |
- || ( |
548 |
- >=kde-base/mplayerthumbs-${KDE_MINIMAL} |
549 |
- >=kde-base/ffmpegthumbs-${KDE_MINIMAL} |
550 |
- ) |
551 |
- ) |
552 |
-" |
553 |
-DEPEND="${CDEPEND} |
554 |
- sys-devel/gettext |
555 |
- doc? ( app-doc/doxygen ) |
556 |
-" |
557 |
- |
558 |
-S="${WORKDIR}/${MY_P}" |
559 |
- |
560 |
-PATCHES=( "${FILESDIR}/${PN}"-1.7.0-docs.patch |
561 |
- "${FILESDIR}/${P}"-{tests,gcc46}.patch ) |
562 |
- |
563 |
-src_prepare() { |
564 |
- if use handbook; then |
565 |
- mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die |
566 |
- else |
567 |
- mkdir doc || die |
568 |
- echo > doc/CMakeLists.txt || die |
569 |
- fi |
570 |
- |
571 |
- kde4-base_src_prepare |
572 |
-} |
573 |
- |
574 |
-src_configure() { |
575 |
- local backend |
576 |
- |
577 |
- use semantic-desktop && backend="Nepomuk" || backend="None" |
578 |
- # LQR = only allows to choose between bundled/external |
579 |
- mycmakeargs=( |
580 |
- -DFORCED_UNBUNDLE=ON |
581 |
- -DWITH_LQR=ON |
582 |
- -DWITH_LENSFUN=ON |
583 |
- -DGWENVIEW_SEMANTICINFO_BACKEND=${backend} |
584 |
- $(cmake-utils_use_with addressbook KdepimLibs) |
585 |
- $(cmake-utils_use_build doc) |
586 |
- $(cmake-utils_use_with geolocation MarbleWidget) |
587 |
- $(cmake-utils_use_enable gphoto2 GPHOTO2) |
588 |
- $(cmake-utils_use_with gphoto2) |
589 |
- $(cmake-utils_use_with semantic-desktop Soprano) |
590 |
- $(cmake-utils_use_enable themedesigner) |
591 |
- $(cmake-utils_use_enable thumbnails THUMBS_DB) |
592 |
- ) |
593 |
- |
594 |
- kde4-base_src_configure |
595 |
-} |
596 |
- |
597 |
-src_install() { |
598 |
- kde4-base_src_install |
599 |
- |
600 |
- if use doc; then |
601 |
- # install the api documentation |
602 |
- dodir /usr/share/doc/${PF}/html || die |
603 |
- insinto /usr/share/doc/${PF}/html |
604 |
- doins -r ${CMAKE_BUILD_DIR}/api/html/* || die |
605 |
- fi |
606 |
- |
607 |
- if use handbook; then |
608 |
- dodoc readme-handbook.txt || die |
609 |
- fi |
610 |
-} |
611 |
- |
612 |
-pkg_postinst() { |
613 |
- kde4-base_pkg_postinst |
614 |
- |
615 |
- if use doc; then |
616 |
- elog The digikam api documentation has been installed at /usr/share/doc/${PF}/html |
617 |
- fi |
618 |
-} |
619 |
|
620 |
diff --git a/media-gfx/digikam/digikam-1.9.0-r1.ebuild b/media-gfx/digikam/digikam-1.9.0-r1.ebuild |
621 |
deleted file mode 100644 |
622 |
index 5ef1230..0000000 |
623 |
--- a/media-gfx/digikam/digikam-1.9.0-r1.ebuild |
624 |
+++ /dev/null |
625 |
@@ -1,130 +0,0 @@ |
626 |
-# Copyright 1999-2011 Gentoo Foundation |
627 |
-# Distributed under the terms of the GNU General Public License v2 |
628 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0-r1.ebuild,v 1.5 2011/07/05 11:39:35 dilfridge Exp $ |
629 |
- |
630 |
-EAPI=4 |
631 |
- |
632 |
-KDE_LINGUAS="ar be bg ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl he hi hne hr hu is it ja km |
633 |
-ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW" |
634 |
-KMNAME="extragear/graphics" |
635 |
-KDE_HANDBOOK="optional" |
636 |
-# needed for sufficiently new libkdcraw |
637 |
-KDE_MINIMAL="4.5" |
638 |
-inherit kde4-base |
639 |
- |
640 |
-MY_P="${PN}-${PV/_/-}" |
641 |
- |
642 |
-DESCRIPTION="A digital photo management application for KDE." |
643 |
-HOMEPAGE="http://www.digikam.org/" |
644 |
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 |
645 |
- handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )" |
646 |
- |
647 |
-LICENSE="GPL-2 |
648 |
- handbook? ( FDL-1.2 )" |
649 |
-KEYWORDS="~amd64 ~ppc ~x86" |
650 |
-SLOT="4" |
651 |
-IUSE="addressbook debug doc geolocation gphoto2 mysql semantic-desktop themedesigner +thumbnails video" |
652 |
- |
653 |
-CDEPEND=" |
654 |
- $(add_kdebase_dep kdelibs 'semantic-desktop=') |
655 |
- $(add_kdebase_dep libkdcraw) |
656 |
- $(add_kdebase_dep libkexiv2) |
657 |
- $(add_kdebase_dep libkipi) |
658 |
- $(add_kdebase_dep solid) |
659 |
- media-libs/jasper |
660 |
- virtual/jpeg |
661 |
- media-libs/lcms:0 |
662 |
- >=media-libs/lensfun-0.2.5 |
663 |
- media-libs/liblqr |
664 |
- media-libs/libpng |
665 |
- media-libs/tiff |
666 |
- media-libs/libpgf |
667 |
- >=media-plugins/kipi-plugins-1.2.0-r1 |
668 |
- >=sci-libs/clapack-3.2.1-r3 |
669 |
- x11-libs/qt-gui[qt3support] |
670 |
- || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) |
671 |
- addressbook? ( $(add_kdebase_dep kdepimlibs) ) |
672 |
- geolocation? ( $(add_kdebase_dep marble 'plasma') ) |
673 |
- gphoto2? ( media-libs/libgphoto2 ) |
674 |
- mysql? ( virtual/mysql ) |
675 |
-" |
676 |
-RDEPEND="${CDEPEND} |
677 |
- $(add_kdebase_dep kreadconfig) |
678 |
- video? ( |
679 |
- || ( |
680 |
- ( $(add_kdebase_dep ffmpegthumbs) ) |
681 |
- ( $(add_kdebase_dep mplayerthumbs) ) |
682 |
- ) |
683 |
- ) |
684 |
-" |
685 |
-DEPEND="${CDEPEND} |
686 |
- sys-devel/gettext |
687 |
- doc? ( app-doc/doxygen ) |
688 |
-" |
689 |
- |
690 |
-S="${WORKDIR}/${MY_P}" |
691 |
- |
692 |
-PATCHES=( |
693 |
- "${FILESDIR}/${PN}"-1.9.0-docs.patch |
694 |
- "${FILESDIR}/${PN}"-1.8.0-tests.patch |
695 |
- "${FILESDIR}/${PN}"-1.9.0-nomysql.patch |
696 |
- "${FILESDIR}/${PN}"-1.9.0-turbo.patch |
697 |
- "${FILESDIR}/${PN}"-1.9.0-newpgf.patch |
698 |
-) |
699 |
- |
700 |
-src_prepare() { |
701 |
- if use handbook; then |
702 |
- mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die |
703 |
- else |
704 |
- mkdir doc || die |
705 |
- echo > doc/CMakeLists.txt || die |
706 |
- fi |
707 |
- |
708 |
- kde4-base_src_prepare |
709 |
-} |
710 |
- |
711 |
-src_configure() { |
712 |
- local backend |
713 |
- |
714 |
- use semantic-desktop && backend="Nepomuk" || backend="None" |
715 |
- # LQR = only allows to choose between bundled/external |
716 |
- local mycmakeargs=( |
717 |
- -DFORCED_UNBUNDLE=ON |
718 |
- -DWITH_LQR=ON |
719 |
- -DWITH_LENSFUN=ON |
720 |
- -DGWENVIEW_SEMANTICINFO_BACKEND=${backend} |
721 |
- $(cmake-utils_use_with addressbook KdepimLibs) |
722 |
- $(cmake-utils_use_build doc) |
723 |
- $(cmake-utils_use_with geolocation MarbleWidget) |
724 |
- $(cmake-utils_use_enable gphoto2 GPHOTO2) |
725 |
- $(cmake-utils_use_with gphoto2) |
726 |
- $(cmake-utils_use_with semantic-desktop Soprano) |
727 |
- $(cmake-utils_use_enable themedesigner) |
728 |
- $(cmake-utils_use_enable thumbnails THUMBS_DB) |
729 |
- $(cmake-utils_use_enable mysql MYSQL) |
730 |
- ) |
731 |
- |
732 |
- kde4-base_src_configure |
733 |
-} |
734 |
- |
735 |
-src_install() { |
736 |
- kde4-base_src_install |
737 |
- |
738 |
- if use doc; then |
739 |
- # install the api documentation |
740 |
- insinto /usr/share/doc/${PF}/html |
741 |
- doins -r ${CMAKE_BUILD_DIR}/api/html/* || die |
742 |
- fi |
743 |
- |
744 |
- if use handbook; then |
745 |
- dodoc readme-handbook.txt || die |
746 |
- fi |
747 |
-} |
748 |
- |
749 |
-pkg_postinst() { |
750 |
- kde4-base_pkg_postinst |
751 |
- |
752 |
- if use doc; then |
753 |
- elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html" |
754 |
- fi |
755 |
-} |
756 |
|
757 |
diff --git a/media-gfx/digikam/digikam-1.9.0.ebuild b/media-gfx/digikam/digikam-1.9.0.ebuild |
758 |
deleted file mode 100644 |
759 |
index 5d28d34..0000000 |
760 |
--- a/media-gfx/digikam/digikam-1.9.0.ebuild |
761 |
+++ /dev/null |
762 |
@@ -1,125 +0,0 @@ |
763 |
-# Copyright 1999-2011 Gentoo Foundation |
764 |
-# Distributed under the terms of the GNU General Public License v2 |
765 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0.ebuild,v 1.5 2011/06/07 02:51:21 abcd Exp $ |
766 |
- |
767 |
-EAPI=3 |
768 |
- |
769 |
-KDE_LINGUAS="ar be bg ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl he hi hne hr hu is it ja km |
770 |
-ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW" |
771 |
-KMNAME="extragear/graphics" |
772 |
- |
773 |
-# needed for sufficiently new libkdcraw |
774 |
-KDE_MINIMAL="4.5" |
775 |
-inherit kde4-base |
776 |
- |
777 |
-MY_P="${PN}-${PV/_/-}" |
778 |
- |
779 |
-DESCRIPTION="A digital photo management application for KDE." |
780 |
-HOMEPAGE="http://www.digikam.org/" |
781 |
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 |
782 |
- handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )" |
783 |
- |
784 |
-LICENSE="GPL-2 |
785 |
- handbook? ( FDL-1.2 )" |
786 |
-KEYWORDS="amd64 ~ppc x86" |
787 |
-SLOT="4" |
788 |
-IUSE="addressbook debug doc geolocation gphoto2 handbook semantic-desktop themedesigner +thumbnails video" |
789 |
- |
790 |
-CDEPEND=" |
791 |
- $(add_kdebase_dep kdelibs 'semantic-desktop?') |
792 |
- $(add_kdebase_dep libkdcraw) |
793 |
- $(add_kdebase_dep libkexiv2) |
794 |
- $(add_kdebase_dep libkipi) |
795 |
- $(add_kdebase_dep solid) |
796 |
- media-libs/jasper |
797 |
- virtual/jpeg |
798 |
- media-libs/lcms:0 |
799 |
- >=media-libs/lensfun-0.2.5 |
800 |
- media-libs/liblqr |
801 |
- media-libs/libpng |
802 |
- media-libs/tiff |
803 |
- media-libs/libpgf |
804 |
- >=media-plugins/kipi-plugins-1.2.0-r1 |
805 |
- >=sci-libs/clapack-3.2.1-r3 |
806 |
- virtual/mysql |
807 |
- x11-libs/qt-gui[qt3support] |
808 |
- || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) |
809 |
- addressbook? ( $(add_kdebase_dep kdepimlibs) ) |
810 |
- geolocation? ( $(add_kdebase_dep marble plasma) ) |
811 |
- gphoto2? ( media-libs/libgphoto2 ) |
812 |
-" |
813 |
-RDEPEND="${CDEPEND} |
814 |
- $(add_kdebase_dep kreadconfig) |
815 |
- video? ( |
816 |
- || ( |
817 |
- ( $(add_kdebase_dep mplayerthumbs) ) |
818 |
- ( $(add_kdebase_dep ffmpegthumbs) ) |
819 |
- ) |
820 |
- ) |
821 |
-" |
822 |
-DEPEND="${CDEPEND} |
823 |
- sys-devel/gettext |
824 |
- doc? ( app-doc/doxygen ) |
825 |
-" |
826 |
- |
827 |
-S="${WORKDIR}/${MY_P}" |
828 |
- |
829 |
-PATCHES=( "${FILESDIR}/${PN}"-1.9.0-docs.patch |
830 |
- "${FILESDIR}/${PN}"-1.8.0-tests.patch ) |
831 |
- |
832 |
-src_prepare() { |
833 |
- if use handbook; then |
834 |
- mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die |
835 |
- else |
836 |
- mkdir doc || die |
837 |
- echo > doc/CMakeLists.txt || die |
838 |
- fi |
839 |
- |
840 |
- kde4-base_src_prepare |
841 |
-} |
842 |
- |
843 |
-src_configure() { |
844 |
- local backend |
845 |
- |
846 |
- use semantic-desktop && backend="Nepomuk" || backend="None" |
847 |
- # LQR = only allows to choose between bundled/external |
848 |
- mycmakeargs=( |
849 |
- -DFORCED_UNBUNDLE=ON |
850 |
- -DWITH_LQR=ON |
851 |
- -DWITH_LENSFUN=ON |
852 |
- -DGWENVIEW_SEMANTICINFO_BACKEND=${backend} |
853 |
- $(cmake-utils_use_with addressbook KdepimLibs) |
854 |
- $(cmake-utils_use_build doc) |
855 |
- $(cmake-utils_use_with geolocation MarbleWidget) |
856 |
- $(cmake-utils_use_enable gphoto2 GPHOTO2) |
857 |
- $(cmake-utils_use_with gphoto2) |
858 |
- $(cmake-utils_use_with semantic-desktop Soprano) |
859 |
- $(cmake-utils_use_enable themedesigner) |
860 |
- $(cmake-utils_use_enable thumbnails THUMBS_DB) |
861 |
- ) |
862 |
- |
863 |
- kde4-base_src_configure |
864 |
-} |
865 |
- |
866 |
-src_install() { |
867 |
- kde4-base_src_install |
868 |
- |
869 |
- if use doc; then |
870 |
- # install the api documentation |
871 |
- dodir /usr/share/doc/${PF}/html || die |
872 |
- insinto /usr/share/doc/${PF}/html |
873 |
- doins -r ${CMAKE_BUILD_DIR}/api/html/* || die |
874 |
- fi |
875 |
- |
876 |
- if use handbook; then |
877 |
- dodoc readme-handbook.txt || die |
878 |
- fi |
879 |
-} |
880 |
- |
881 |
-pkg_postinst() { |
882 |
- kde4-base_pkg_postinst |
883 |
- |
884 |
- if use doc; then |
885 |
- elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html" |
886 |
- fi |
887 |
-} |
888 |
|
889 |
diff --git a/media-gfx/digikam/digikam-2.0.0.ebuild b/media-gfx/digikam/digikam-2.0.0.ebuild |
890 |
deleted file mode 100644 |
891 |
index 321f140..0000000 |
892 |
--- a/media-gfx/digikam/digikam-2.0.0.ebuild |
893 |
+++ /dev/null |
894 |
@@ -1,140 +0,0 @@ |
895 |
-# Copyright 1999-2011 Gentoo Foundation |
896 |
-# Distributed under the terms of the GNU General Public License v2 |
897 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0_rc.ebuild,v 1.1 2011/07/27 20:51:56 dilfridge Exp $ |
898 |
- |
899 |
-EAPI=4 |
900 |
- |
901 |
-KDE_LINGUAS="ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga |
902 |
-gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn |
903 |
-nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr ss sv ta te tg th tr tt uk uz ven vi wa xh |
904 |
-zh_CN zh_HK zh_TW zu" |
905 |
- |
906 |
-KDE_HANDBOOK="optional" |
907 |
-CMAKE_MIN_VERSION="2.8" |
908 |
-KDE_MINIMAL="4.7" |
909 |
- |
910 |
-inherit kde4-base |
911 |
- |
912 |
-MY_P="${PN}-${PV/_/-}" |
913 |
- |
914 |
-DESCRIPTION="Digital photo management application for KDE" |
915 |
-HOMEPAGE="http://www.digikam.org/" |
916 |
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" |
917 |
- |
918 |
-LICENSE="GPL-2 |
919 |
- handbook? ( FDL-1.2 )" |
920 |
-KEYWORDS="~amd64 ~x86" |
921 |
-SLOT="4" |
922 |
-IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video" |
923 |
- |
924 |
-CDEPEND=" |
925 |
- $(add_kdebase_dep kdelibs semantic-desktop) |
926 |
- $(add_kdebase_dep libkdcraw) |
927 |
- $(add_kdebase_dep libkexiv2) |
928 |
- $(add_kdebase_dep libkipi) |
929 |
- $(add_kdebase_dep marble plasma) |
930 |
- $(add_kdebase_dep solid) |
931 |
- media-libs/jasper |
932 |
- media-libs/lcms:0 |
933 |
- >=media-libs/lensfun-0.2.5 |
934 |
- >=media-libs/libkface-${PV} |
935 |
- >=media-libs/libkgeomap-${PV} |
936 |
- media-libs/liblqr |
937 |
- >=media-libs/libpgf-6.11.28 |
938 |
- media-libs/libpng |
939 |
- media-libs/tiff |
940 |
- virtual/jpeg |
941 |
- x11-libs/qt-gui[qt3support] |
942 |
- || ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas ) |
943 |
- || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) |
944 |
- addressbook? ( $(add_kdebase_dep kdepimlibs) ) |
945 |
- gphoto2? ( media-libs/libgphoto2 ) |
946 |
- mysql? ( virtual/mysql ) |
947 |
-" |
948 |
-RDEPEND="${CDEPEND} |
949 |
- $(add_kdebase_dep kreadconfig) |
950 |
- media-plugins/kipi-plugins |
951 |
- video? ( |
952 |
- || ( |
953 |
- $(add_kdebase_dep mplayerthumbs) |
954 |
- $(add_kdebase_dep ffmpegthumbs) |
955 |
- ) |
956 |
- ) |
957 |
-" |
958 |
-DEPEND="${CDEPEND} |
959 |
- sys-devel/gettext |
960 |
- doc? ( app-doc/doxygen ) |
961 |
-" |
962 |
- |
963 |
-S="${WORKDIR}/${MY_P}/core" |
964 |
- |
965 |
-src_prepare() { |
966 |
- # just to make absolutely sure |
967 |
- rm -rf "${WORKDIR}/${MY_P}/extra" || die |
968 |
- |
969 |
- # prepare the handbook |
970 |
- mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die |
971 |
- echo "add_subdirectory( digikam )" > doc/CMakeLists.txt |
972 |
- echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt |
973 |
- |
974 |
- # prepare the translations |
975 |
- mv "${WORKDIR}/${MY_P}/po" po || die |
976 |
- find po -name "kipiplugin_*.po" -exec rm {} + |
977 |
- |
978 |
- echo "add_subdirectory( po )" >> CMakeLists.txt |
979 |
- |
980 |
- kde4-base_src_prepare |
981 |
- |
982 |
- if use handbook; then |
983 |
- echo "add_subdirectory( doc )" >> CMakeLists.txt |
984 |
- fi |
985 |
-} |
986 |
- |
987 |
-src_configure() { |
988 |
- local backend |
989 |
- |
990 |
- use semantic-desktop && backend="Nepomuk" || backend="None" |
991 |
- # LQR = only allows to choose between bundled/external |
992 |
- local mycmakeargs=( |
993 |
- -DFORCED_UNBUNDLE=ON |
994 |
- -DWITH_LQR=ON |
995 |
- -DWITH_LENSFUN=ON |
996 |
- -DGWENVIEW_SEMANTICINFO_BACKEND=${backend} |
997 |
- $(cmake-utils_use_with addressbook KdepimLibs) |
998 |
- -DWITH_MarbleWidget=ON |
999 |
- $(cmake-utils_use_enable gphoto2 GPHOTO2) |
1000 |
- $(cmake-utils_use_with gphoto2) |
1001 |
- $(cmake-utils_use_with semantic-desktop Soprano) |
1002 |
- $(cmake-utils_use_enable themedesigner) |
1003 |
- $(cmake-utils_use_enable thumbnails THUMBS_DB) |
1004 |
- $(cmake-utils_use_enable mysql INTERNALMYSQL) |
1005 |
- $(cmake-utils_use_enable debug DEBUG_MESSAGES) |
1006 |
- ) |
1007 |
- |
1008 |
- kde4-base_src_configure |
1009 |
-} |
1010 |
- |
1011 |
-src_compile() { |
1012 |
- local mytargets="all" |
1013 |
- use doc && mytargets+=" doc" |
1014 |
- |
1015 |
- kde4-base_src_compile ${mytargets} |
1016 |
-} |
1017 |
- |
1018 |
-src_install() { |
1019 |
- kde4-base_src_install |
1020 |
- |
1021 |
- if use doc; then |
1022 |
- # install the api documentation |
1023 |
- insinto /usr/share/doc/${PF}/html |
1024 |
- doins -r ${CMAKE_BUILD_DIR}/api/html/* |
1025 |
- fi |
1026 |
-} |
1027 |
- |
1028 |
-pkg_postinst() { |
1029 |
- kde4-base_pkg_postinst |
1030 |
- |
1031 |
- if use doc; then |
1032 |
- elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html" |
1033 |
- fi |
1034 |
-} |
1035 |
|
1036 |
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild |
1037 |
deleted file mode 100644 |
1038 |
index 706304c..0000000 |
1039 |
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild |
1040 |
+++ /dev/null |
1041 |
@@ -1,139 +0,0 @@ |
1042 |
-# Copyright 1999-2011 Gentoo Foundation |
1043 |
-# Distributed under the terms of the GNU General Public License v2 |
1044 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0_rc.ebuild,v 1.1 2011/07/27 20:51:56 dilfridge Exp $ |
1045 |
- |
1046 |
-EAPI=4 |
1047 |
- |
1048 |
-KDE_LINGUAS="" |
1049 |
-#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km |
1050 |
-# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW" |
1051 |
-#the release candidate has no internationalization |
1052 |
- |
1053 |
-KDE_HANDBOOK="optional" |
1054 |
-CMAKE_MIN_VERSION="2.8" |
1055 |
-KDE_MINIMAL="4.7" |
1056 |
- |
1057 |
-inherit kde4-base |
1058 |
- |
1059 |
-MY_P="${PN}-${PV/_/-}" |
1060 |
- |
1061 |
-DESCRIPTION="Digital photo management application for KDE" |
1062 |
-HOMEPAGE="http://www.digikam.org/" |
1063 |
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" |
1064 |
- |
1065 |
-LICENSE="GPL-2 |
1066 |
- handbook? ( FDL-1.2 )" |
1067 |
-KEYWORDS="~amd64 ~x86" |
1068 |
-SLOT="4" |
1069 |
-IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video" |
1070 |
- |
1071 |
-CDEPEND=" |
1072 |
- $(add_kdebase_dep kdelibs semantic-desktop) |
1073 |
- $(add_kdebase_dep libkdcraw) |
1074 |
- $(add_kdebase_dep libkexiv2) |
1075 |
- $(add_kdebase_dep libkipi) |
1076 |
- $(add_kdebase_dep marble plasma) |
1077 |
- $(add_kdebase_dep solid) |
1078 |
- media-libs/jasper |
1079 |
- media-libs/lcms:0 |
1080 |
- >=media-libs/lensfun-0.2.5 |
1081 |
- >=media-libs/libkface-${PV} |
1082 |
- >=media-libs/libkmap-${PV} |
1083 |
- media-libs/liblqr |
1084 |
- >=media-libs/libpgf-6.11.24 |
1085 |
- media-libs/libpng |
1086 |
- media-libs/tiff |
1087 |
- media-plugins/kipi-plugins |
1088 |
- virtual/jpeg |
1089 |
- x11-libs/qt-gui[qt3support] |
1090 |
- || ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas ) |
1091 |
- || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) |
1092 |
- addressbook? ( $(add_kdebase_dep kdepimlibs) ) |
1093 |
- gphoto2? ( media-libs/libgphoto2 ) |
1094 |
- mysql? ( virtual/mysql ) |
1095 |
-" |
1096 |
-RDEPEND="${CDEPEND} |
1097 |
- $(add_kdebase_dep kreadconfig) |
1098 |
- video? ( |
1099 |
- || ( |
1100 |
- $(add_kdebase_dep mplayerthumbs) |
1101 |
- $(add_kdebase_dep ffmpegthumbs) |
1102 |
- ) |
1103 |
- ) |
1104 |
-" |
1105 |
-DEPEND="${CDEPEND} |
1106 |
- sys-devel/gettext |
1107 |
- doc? ( app-doc/doxygen ) |
1108 |
-" |
1109 |
- |
1110 |
-PATCHES=( |
1111 |
- "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" |
1112 |
- "${FILESDIR}/${PN}-2.0.0_rc-officialpgf.patch" |
1113 |
- "${FILESDIR}/${PN}-2.0.0_rc-officialpgf2.patch" |
1114 |
-) |
1115 |
- |
1116 |
-S="${WORKDIR}/${MY_P}/core" |
1117 |
- |
1118 |
-src_prepare() { |
1119 |
- # just to make absolutely sure |
1120 |
- rm -rf "${WORKDIR}/${MY_P}/extra" || die |
1121 |
- |
1122 |
- mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die |
1123 |
- echo "add_subdirectory( digikam )" > doc/CMakeLists.txt |
1124 |
- echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt |
1125 |
- |
1126 |
- kde4-base_src_prepare |
1127 |
- |
1128 |
- if use handbook; then |
1129 |
- echo "add_subdirectory( doc )" >> CMakeLists.txt |
1130 |
- fi |
1131 |
-} |
1132 |
- |
1133 |
-src_configure() { |
1134 |
- local backend |
1135 |
- |
1136 |
- use semantic-desktop && backend="Nepomuk" || backend="None" |
1137 |
- # LQR = only allows to choose between bundled/external |
1138 |
- local mycmakeargs=( |
1139 |
- -DFORCED_UNBUNDLE=ON |
1140 |
- -DWITH_LQR=ON |
1141 |
- -DWITH_LENSFUN=ON |
1142 |
- -DGWENVIEW_SEMANTICINFO_BACKEND=${backend} |
1143 |
- $(cmake-utils_use_with addressbook KdepimLibs) |
1144 |
- -DWITH_MarbleWidget=ON |
1145 |
- $(cmake-utils_use_enable gphoto2 GPHOTO2) |
1146 |
- $(cmake-utils_use_with gphoto2) |
1147 |
- $(cmake-utils_use_with semantic-desktop Soprano) |
1148 |
- $(cmake-utils_use_enable themedesigner) |
1149 |
- $(cmake-utils_use_enable thumbnails THUMBS_DB) |
1150 |
- $(cmake-utils_use_enable mysql INTERNALMYSQL) |
1151 |
- $(cmake-utils_use_enable debug DEBUG_MESSAGES) |
1152 |
- ) |
1153 |
- |
1154 |
- kde4-base_src_configure |
1155 |
-} |
1156 |
- |
1157 |
-src_compile() { |
1158 |
- local mytargets="all" |
1159 |
- use doc && mytargets+=" doc" |
1160 |
- |
1161 |
- kde4-base_src_compile ${mytargets} |
1162 |
-} |
1163 |
- |
1164 |
-src_install() { |
1165 |
- kde4-base_src_install |
1166 |
- |
1167 |
- if use doc; then |
1168 |
- # install the api documentation |
1169 |
- insinto /usr/share/doc/${PF}/html |
1170 |
- doins -r ${CMAKE_BUILD_DIR}/api/html/* |
1171 |
- fi |
1172 |
-} |
1173 |
- |
1174 |
-pkg_postinst() { |
1175 |
- kde4-base_pkg_postinst |
1176 |
- |
1177 |
- if use doc; then |
1178 |
- elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html" |
1179 |
- fi |
1180 |
-} |
1181 |
|
1182 |
diff --git a/media-gfx/digikam/files/digikam-1.1.0-libpgf.patch b/media-gfx/digikam/files/digikam-1.1.0-libpgf.patch |
1183 |
deleted file mode 100644 |
1184 |
index 47b2c72..0000000 |
1185 |
--- a/media-gfx/digikam/files/digikam-1.1.0-libpgf.patch |
1186 |
+++ /dev/null |
1187 |
@@ -1,232 +0,0 @@ |
1188 |
-From 0e5ebb56e3b0ca85b8ca74ae3577b06a4795cad6 Mon Sep 17 00:00:00 2001 |
1189 |
-From: Ronan Arraes Jardim Chagas <ronisbr@×××××.com> |
1190 |
-Date: Thu, 4 Feb 2010 11:09:22 -0200 |
1191 |
-Subject: [PATCH] Initial approach to unbundled libpgf from Digikam 1.1.0 |
1192 |
- |
1193 |
-Changes to be committed: |
1194 |
- |
1195 |
- modified: CMakeLists.txt |
1196 |
- new file: cmake/modules/FindPGF.cmake |
1197 |
- modified: digikam/CMakeLists.txt |
1198 |
- modified: libs/CMakeLists.txt |
1199 |
---- |
1200 |
- CMakeLists.txt | 70 ++++++++++++++++++++++++++++++------------ |
1201 |
- cmake/modules/FindPGF.cmake | 15 +++++++++ |
1202 |
- digikam/CMakeLists.txt | 8 ++--- |
1203 |
- libs/CMakeLists.txt | 1 + |
1204 |
- 4 files changed, 69 insertions(+), 25 deletions(-) |
1205 |
- create mode 100644 cmake/modules/FindPGF.cmake |
1206 |
- |
1207 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
1208 |
-index 3cf296a..329e410 100644 |
1209 |
---- a/CMakeLists.txt |
1210 |
-+++ b/CMakeLists.txt |
1211 |
-@@ -34,6 +34,13 @@ SET(DIGIKAM_VERSION_STRING |
1212 |
- "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}" |
1213 |
- ) |
1214 |
- |
1215 |
-+# Path to find FindPGF.cmake script. |
1216 |
-+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules") |
1217 |
-+ |
1218 |
-+# ================================================================================================= |
1219 |
-+# Project options |
1220 |
-+OPTION(BUILD_DOC "Set ON to install documentation files" OFF) |
1221 |
-+ |
1222 |
- # ================================================================================================== |
1223 |
- # Debug area codes |
1224 |
- # These codes will be set for every project specific path automatically, so |
1225 |
-@@ -115,6 +122,11 @@ FIND_PACKAGE(LCMS) |
1226 |
- FIND_PACKAGE(JPEG) |
1227 |
- FIND_PACKAGE(PNG) |
1228 |
- FIND_PACKAGE(TIFF) |
1229 |
-+ |
1230 |
-+# Included to unbundle libpgf that is on portage tree. |
1231 |
-+# This function call the script cmake/modules/FindPGF.cmake |
1232 |
-+FIND_PACKAGE(PGF) |
1233 |
-+ |
1234 |
- FIND_PACKAGE(Jasper) |
1235 |
- FIND_PACKAGE(Kdcraw) |
1236 |
- FIND_PACKAGE(Kexiv2) |
1237 |
-@@ -197,6 +209,7 @@ MESSAGE(STATUS "") |
1238 |
- |
1239 |
- PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND) |
1240 |
- PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND) |
1241 |
-+PRINT_LIBRARY_STATUS("libpgf" "http://www.libpgf.org" "" PGF_FOUND) |
1242 |
- PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND) |
1243 |
- PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND) |
1244 |
- PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND) |
1245 |
-@@ -298,13 +311,13 @@ ELSE(DOXYGEN_FOUND) |
1246 |
- MESSAGE(STATUS "") |
1247 |
- ENDIF(DOXYGEN_FOUND) |
1248 |
- |
1249 |
--IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1250 |
-+IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1251 |
- MESSAGE(STATUS " digiKam will be compiled................. YES") |
1252 |
- SET(DIGIKAM_CAN_BE_COMPILED true) |
1253 |
--ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1254 |
-+ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1255 |
- MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)") |
1256 |
- SET(DIGIKAM_CAN_BE_COMPILED false) |
1257 |
--ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1258 |
-+ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1259 |
- |
1260 |
- MESSAGE(STATUS "----------------------------------------------------------------------------------") |
1261 |
- MESSAGE(STATUS "") |
1262 |
-@@ -889,14 +902,7 @@ IF(DIGIKAM_CAN_BE_COMPILED) |
1263 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp |
1264 |
- ) |
1265 |
- |
1266 |
-- SET(libpgf_SRCS |
1267 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp |
1268 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp |
1269 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp |
1270 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp |
1271 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp |
1272 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp |
1273 |
-- ) |
1274 |
-+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) |
1275 |
- |
1276 |
- SET(libsqlite2_SRCS |
1277 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c |
1278 |
-@@ -1176,18 +1182,42 @@ ENDIF(DIGIKAM_CAN_BE_COMPILED) |
1279 |
- # ================================================================================================== |
1280 |
- # API documentation generation |
1281 |
- |
1282 |
--IF(DOXYGEN_FOUND) |
1283 |
- |
1284 |
-- SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
1285 |
-- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
1286 |
-- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
1287 |
-- SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) |
1288 |
-+# Checks if user ask to build documentation. |
1289 |
-+IF(BUILD_DOC) |
1290 |
-+ IF(DOXYGEN_FOUND) |
1291 |
- |
1292 |
-- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
1293 |
-+ MESSAGE(STATUS "") |
1294 |
-+ MESSAGE(STATUS "Documentation will be installed") |
1295 |
-+ MESSAGE(STATUS "") |
1296 |
- |
1297 |
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
1298 |
-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
1299 |
-+ SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
1300 |
-+ SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
1301 |
-+ SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
1302 |
-+ SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) |
1303 |
-+ |
1304 |
-+ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
1305 |
-+ |
1306 |
-+ ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
1307 |
-+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
1308 |
-+ |
1309 |
-+ ELSE(DOXYGEN_FOUND) |
1310 |
-+ |
1311 |
-+ MESSAGE(STATUS "") |
1312 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
1313 |
-+ MESSAGE(STATUS "Doxygen wasn't found on the system") |
1314 |
-+ MESSAGE(STATUS "") |
1315 |
-+ |
1316 |
-+ ENDIF(DOXYGEN_FOUND) |
1317 |
-+ |
1318 |
-+ELSE(BUILD_DOC) |
1319 |
-+ |
1320 |
-+ MESSAGE(STATUS "") |
1321 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
1322 |
-+ MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake") |
1323 |
-+ MESSAGE(STATUS "") |
1324 |
-+ |
1325 |
-+ENDIF(BUILD_DOC) |
1326 |
- |
1327 |
--ENDIF(DOXYGEN_FOUND) |
1328 |
- include(MacroOptionalAddSubdirectory) |
1329 |
- macro_optional_add_subdirectory( po ) |
1330 |
-diff --git a/cmake/modules/FindPGF.cmake b/cmake/modules/FindPGF.cmake |
1331 |
-new file mode 100644 |
1332 |
-index 0000000..60aeacc |
1333 |
---- /dev/null |
1334 |
-+++ b/cmake/modules/FindPGF.cmake |
1335 |
-@@ -0,0 +1,15 @@ |
1336 |
-+# - Try to find libpgf |
1337 |
-+# Once done this will define |
1338 |
-+# |
1339 |
-+# PGF_FOUND - system has libgf |
1340 |
-+# PGF_INCLUDE_DIRS - the libpgf include directory |
1341 |
-+# PGF_LIBRARIES - Link these to use libpgf |
1342 |
-+ |
1343 |
-+# PKG-CONFIG is required. |
1344 |
-+INCLUDE(FindPkgConfig REQUIRED) |
1345 |
-+ |
1346 |
-+IF(PKG_CONFIG_FOUND) |
1347 |
-+ INCLUDE(FindPkgConfig) |
1348 |
-+ |
1349 |
-+ PKG_CHECK_MODULES(PGF libpgf) |
1350 |
-+ENDIF(PKG_CONFIG_FOUND) |
1351 |
-diff --git a/digikam/CMakeLists.txt b/digikam/CMakeLists.txt |
1352 |
-index 445e24f..e6839f7 100644 |
1353 |
---- a/digikam/CMakeLists.txt |
1354 |
-+++ b/digikam/CMakeLists.txt |
1355 |
-@@ -73,6 +73,7 @@ INCLUDE_DIRECTORIES( |
1356 |
- ${JPEG_INCLUDE_DIR} |
1357 |
- ${PNG_PNG_INCLUDE_DIR} |
1358 |
- ${TIFF_INCLUDE_DIR} |
1359 |
-+ ${PGF_INCLUDE_DIRS} |
1360 |
- ) |
1361 |
- |
1362 |
- |
1363 |
-@@ -81,9 +82,6 @@ INCLUDE_DIRECTORIES( |
1364 |
- # Disable Clapack C code warnings. |
1365 |
- SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
1366 |
- |
1367 |
--# Disable libpgf warnings. |
1368 |
--SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
1369 |
-- |
1370 |
- SET(digikamcore_LIB_SRCS |
1371 |
- # basic libs |
1372 |
- ${libdimg_SRCS} |
1373 |
-@@ -100,7 +98,6 @@ SET(digikamcore_LIB_SRCS |
1374 |
- ${libgreycstoration_SRCS} |
1375 |
- ${libthreadimageio_SRCS} |
1376 |
- ${libthemeengine_SRCS} |
1377 |
-- ${libpgf_SRCS} |
1378 |
- ${pgfutils_SRCS} |
1379 |
- ${libdigikamhelpers_SRCS} |
1380 |
- |
1381 |
-@@ -150,6 +147,7 @@ TARGET_LINK_LIBRARIES(digikamcore |
1382 |
- ${JPEG_LIBRARIES} |
1383 |
- ${TIFF_LIBRARIES} |
1384 |
- ${PNG_LIBRARIES} |
1385 |
-+ ${PGF_LIBRARIES} |
1386 |
- ${LCMS_LIBRARIES} |
1387 |
- ${JASPER_LIBRARIES} |
1388 |
- |
1389 |
-@@ -193,7 +191,6 @@ SET(digikamdatabase_LIB_SRCS ${libdatabase_SRCS} |
1390 |
- ${libhaar_SRCS} |
1391 |
- ${libdatabasemodels_SRCS} |
1392 |
- ${libsqlite2_SRCS} |
1393 |
-- ${libpgf_SRCS} |
1394 |
- ${pgfutils_SRCS} |
1395 |
- ) |
1396 |
- |
1397 |
-@@ -208,6 +205,7 @@ TARGET_LINK_LIBRARIES(digikamdatabase |
1398 |
- ${QT_QTCORE_LIBRARY} |
1399 |
- ${QT_QTGUI_LIBRARY} |
1400 |
- ${QT_QTSQL_LIBRARY} |
1401 |
-+ ${PGF_LIBRARIES} |
1402 |
- ) |
1403 |
- |
1404 |
- SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 ) |
1405 |
-diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt |
1406 |
-index b66da1c..f0a6aab 100644 |
1407 |
---- a/libs/CMakeLists.txt |
1408 |
-+++ b/libs/CMakeLists.txt |
1409 |
-@@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES( dimg |
1410 |
- ${JPEG_INCLUDE_DIR} |
1411 |
- ${TIFF_INCLUDE_DIR} |
1412 |
- ${PNG_INCLUDE_DIR} |
1413 |
-+ ${PGF_INCLUDE_DIRS} |
1414 |
- ${JASPER_INCLUDE_DIR} |
1415 |
- ) |
1416 |
- ADD_SUBDIRECTORY( curves ) |
1417 |
--- |
1418 |
-1.6.4.4 |
1419 |
- |
1420 |
|
1421 |
diff --git a/media-gfx/digikam/files/digikam-1.1.0-libpng14.patch b/media-gfx/digikam/files/digikam-1.1.0-libpng14.patch |
1422 |
deleted file mode 100644 |
1423 |
index e7a161d..0000000 |
1424 |
--- a/media-gfx/digikam/files/digikam-1.1.0-libpng14.patch |
1425 |
+++ /dev/null |
1426 |
@@ -1,42 +0,0 @@ |
1427 |
-http://repos.archlinux.org/wsvn/packages/digikam/trunk/libpng14.patch |
1428 |
- |
1429 |
---- libs/dimg/loaders/pngloader.cpp |
1430 |
-+++ libs/dimg/loaders/pngloader.cpp |
1431 |
-@@ -105,7 +105,7 @@ |
1432 |
- unsigned char buf[PNG_BYTES_TO_CHECK]; |
1433 |
- |
1434 |
- size_t membersRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f); |
1435 |
-- if ((membersRead != PNG_BYTES_TO_CHECK) || !png_check_sig(buf, PNG_BYTES_TO_CHECK)) |
1436 |
-+ if ((membersRead != PNG_BYTES_TO_CHECK) || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK)) |
1437 |
- { |
1438 |
- kDebug() << "Not a PNG image file."; |
1439 |
- fclose(f); |
1440 |
-@@ -322,7 +322,7 @@ |
1441 |
- #ifdef ENABLE_DEBUG_MESSAGES |
1442 |
- kDebug() << "PNG in PNG_COLOR_TYPE_GRAY"; |
1443 |
- #endif |
1444 |
-- png_set_gray_1_2_4_to_8(png_ptr); |
1445 |
-+ png_set_expand_gray_1_2_4_to_8(png_ptr); |
1446 |
- png_set_gray_to_rgb(png_ptr); |
1447 |
- |
1448 |
- if (QSysInfo::ByteOrder == QSysInfo::LittleEndian) // Intel |
1449 |
---- libs/threadimageio/thumbnailbasic.cpp |
1450 |
-+++ libs/threadimageio/thumbnailbasic.cpp |
1451 |
-@@ -137,7 +137,7 @@ |
1452 |
- unsigned char buf[PNG_BYTES_TO_CHECK]; |
1453 |
- |
1454 |
- size_t itemsRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f); |
1455 |
-- if (itemsRead != 1 || !png_check_sig(buf, PNG_BYTES_TO_CHECK)) |
1456 |
-+ if (itemsRead != 1 || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK)) |
1457 |
- { |
1458 |
- fclose(f); |
1459 |
- return qimage; |
1460 |
-@@ -232,7 +232,7 @@ |
1461 |
- { |
1462 |
- png_set_gray_to_rgb(png_ptr); |
1463 |
- if (png_get_bit_depth(png_ptr, info_ptr) < 8) |
1464 |
-- png_set_gray_1_2_4_to_8(png_ptr); |
1465 |
-+ png_set_expand_gray_1_2_4_to_8(png_ptr); |
1466 |
- } |
1467 |
- |
1468 |
- int sizeOfUint = sizeof(unsigned int); |
1469 |
|
1470 |
diff --git a/media-gfx/digikam/files/digikam-1.2.0-docs-r3.patch b/media-gfx/digikam/files/digikam-1.2.0-docs-r3.patch |
1471 |
deleted file mode 100644 |
1472 |
index ff9f1a3..0000000 |
1473 |
--- a/media-gfx/digikam/files/digikam-1.2.0-docs-r3.patch |
1474 |
+++ /dev/null |
1475 |
@@ -1,56 +0,0 @@ |
1476 |
-diff -u -r -N digikam-1.2.0-2/CMakeLists.txt digikam-1.2.0/CMakeLists.txt |
1477 |
---- digikam-1.2.0-2/CMakeLists.txt 2010-09-25 18:01:53.000000000 +0200 |
1478 |
-+++ digikam-1.2.0/CMakeLists.txt 2010-09-25 18:05:16.000000000 +0200 |
1479 |
-@@ -1260,18 +1260,43 @@ |
1480 |
- # ================================================================================================== |
1481 |
- # API documentation generation |
1482 |
- |
1483 |
--IF(DOXYGEN_FOUND) |
1484 |
-+# Checks if user ask to build documentation. |
1485 |
-+IF(BUILD_DOC) |
1486 |
-+ IF(DOXYGEN_FOUND) |
1487 |
- |
1488 |
-- SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
1489 |
-- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
1490 |
-- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
1491 |
-- SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) |
1492 |
-+ MESSAGE(STATUS "") |
1493 |
-+ MESSAGE(STATUS "Documentation will be installed") |
1494 |
-+ MESSAGE(STATUS "") |
1495 |
- |
1496 |
-- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
1497 |
-+ SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
1498 |
-+ SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
1499 |
-+ SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
1500 |
-+ SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) |
1501 |
- |
1502 |
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
1503 |
-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
1504 |
-+ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
1505 |
-+ |
1506 |
-+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
1507 |
-+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
1508 |
-+ |
1509 |
-+ ELSE(DOXYGEN_FOUND) |
1510 |
-+ |
1511 |
-+ MESSAGE(STATUS "") |
1512 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
1513 |
-+ MESSAGE(STATUS "Doxygen wasn't found on the system") |
1514 |
-+ MESSAGE(STATUS "") |
1515 |
-+ |
1516 |
-+ ENDIF(DOXYGEN_FOUND) |
1517 |
-+ |
1518 |
-+ELSE(BUILD_DOC) |
1519 |
-+ |
1520 |
-+ MESSAGE(STATUS "") |
1521 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
1522 |
-+ MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake") |
1523 |
-+ MESSAGE(STATUS "") |
1524 |
-+ |
1525 |
-+ENDIF(BUILD_DOC) |
1526 |
- |
1527 |
--ENDIF(DOXYGEN_FOUND) |
1528 |
- include(MacroOptionalAddSubdirectory) |
1529 |
- macro_optional_add_subdirectory( po ) |
1530 |
-+ |
1531 |
-+add_subdirectory( doc ) |
1532 |
|
1533 |
diff --git a/media-gfx/digikam/files/digikam-1.2.0-lapack.patch b/media-gfx/digikam/files/digikam-1.2.0-lapack.patch |
1534 |
deleted file mode 100644 |
1535 |
index f731078..0000000 |
1536 |
--- a/media-gfx/digikam/files/digikam-1.2.0-lapack.patch |
1537 |
+++ /dev/null |
1538 |
@@ -1,126 +0,0 @@ |
1539 |
-diff -r -u digikam-1.2.0.orig/CMakeLists.txt digikam-1.2.0/CMakeLists.txt |
1540 |
---- digikam-1.2.0.orig/CMakeLists.txt 2010-05-30 21:38:14.189946492 +0200 |
1541 |
-+++ digikam-1.2.0/CMakeLists.txt 2010-05-30 21:39:46.679946458 +0200 |
1542 |
-@@ -3,6 +3,8 @@ |
1543 |
- #OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=OFF)" OFF) |
1544 |
- OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON) |
1545 |
- |
1546 |
-+ENABLE_LANGUAGE(Fortran) |
1547 |
-+ |
1548 |
- # ================================================================================================== |
1549 |
- # Information to update before to release this package. |
1550 |
- |
1551 |
-@@ -123,6 +125,9 @@ |
1552 |
- # This function call the script cmake/modules/FindPGF.cmake |
1553 |
- FIND_PACKAGE(PGF) |
1554 |
- |
1555 |
-+# Included to unbundle lapack that is in portage tree. |
1556 |
-+FIND_PACKAGE(LAPACK) |
1557 |
-+ |
1558 |
- FIND_PACKAGE(Jasper) |
1559 |
- FIND_PACKAGE(Kdcraw) |
1560 |
- FIND_PACKAGE(Kexiv2) |
1561 |
-@@ -320,13 +325,13 @@ |
1562 |
- MESSAGE(STATUS "") |
1563 |
- ENDIF(DOXYGEN_FOUND) |
1564 |
- |
1565 |
--IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1566 |
-+IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND AND LAPACK_FOUND) |
1567 |
- MESSAGE(STATUS " digiKam will be compiled................. YES") |
1568 |
- SET(DIGIKAM_CAN_BE_COMPILED true) |
1569 |
--ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1570 |
-+ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND AND LAPACK_FOUND) |
1571 |
- MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)") |
1572 |
- SET(DIGIKAM_CAN_BE_COMPILED false) |
1573 |
--ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1574 |
-+ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND AND LAPACK_FOUND) |
1575 |
- |
1576 |
- MESSAGE(STATUS "----------------------------------------------------------------------------------") |
1577 |
- MESSAGE(STATUS "") |
1578 |
-@@ -484,39 +489,7 @@ |
1579 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp |
1580 |
- ) |
1581 |
- |
1582 |
-- SET(libclapack_SRCS |
1583 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/abort_.c |
1584 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgesv.c |
1585 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dlaswp.c |
1586 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/endfile.c |
1587 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/idamax.c |
1588 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/open.c |
1589 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sig_die.c |
1590 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wref.c |
1591 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/close.c |
1592 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetf2.c |
1593 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dscal.c |
1594 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/err.c |
1595 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ieeeck.c |
1596 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_cmp.c |
1597 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_stop.c |
1598 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wrtfmt.c |
1599 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgemm.c |
1600 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrf.c |
1601 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dswap.c |
1602 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmt.c |
1603 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ilaenv.c |
1604 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_copy.c |
1605 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wsfe.c |
1606 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dger.c |
1607 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrs.c |
1608 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dtrsm.c |
1609 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmtlib.c |
1610 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/lsame.c |
1611 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sfe.c |
1612 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c |
1613 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c |
1614 |
-- ) |
1615 |
-+ INCLUDE_DIRECTORIES(${LAPACK_INCLUDE_DIRS}) |
1616 |
- |
1617 |
- SET(libdimgfilters_SRCS |
1618 |
- ${libclapack_SRCS} |
1619 |
-Nur in digikam-1.2.0: CMakeLists.txt.orig. |
1620 |
-diff -r -u digikam-1.2.0.orig/digikam/CMakeLists.txt digikam-1.2.0/digikam/CMakeLists.txt |
1621 |
---- digikam-1.2.0.orig/digikam/CMakeLists.txt 2010-05-30 21:38:14.191892532 +0200 |
1622 |
-+++ digikam-1.2.0/digikam/CMakeLists.txt 2010-05-30 21:39:46.680979177 +0200 |
1623 |
-@@ -89,6 +89,7 @@ |
1624 |
- ${PNG_PNG_INCLUDE_DIR} |
1625 |
- ${TIFF_INCLUDE_DIR} |
1626 |
- ${PGF_INCLUDE_DIRS} |
1627 |
-+ ${LAPACK_INCLUDE_DIRS} |
1628 |
- ) |
1629 |
- |
1630 |
- IF(LENSFUN_LIBRARY) |
1631 |
-@@ -172,6 +173,7 @@ |
1632 |
- ${PGF_LIBRARIES} |
1633 |
- ${LCMS_LIBRARIES} |
1634 |
- ${JASPER_LIBRARIES} |
1635 |
-+ ${LAPACK_LIBRARIES} |
1636 |
- |
1637 |
- # Require by CImg library which use pthread internally. |
1638 |
- ${CMAKE_THREAD_LIBS_INIT} |
1639 |
-@@ -237,6 +239,7 @@ |
1640 |
- ${QT_QTGUI_LIBRARY} |
1641 |
- ${QT_QTSQL_LIBRARY} |
1642 |
- ${PGF_LIBRARIES} |
1643 |
-+ ${LAPACK_LIBRARIES} |
1644 |
- ) |
1645 |
- |
1646 |
- SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 ) |
1647 |
-Nur in digikam-1.2.0/digikam: CMakeLists.txt.orig. |
1648 |
-diff -r -u digikam-1.2.0.orig/libs/CMakeLists.txt digikam-1.2.0/libs/CMakeLists.txt |
1649 |
---- digikam-1.2.0.orig/libs/CMakeLists.txt 2010-05-30 21:38:14.191892532 +0200 |
1650 |
-+++ digikam-1.2.0/libs/CMakeLists.txt 2010-05-30 21:41:20.226778777 +0200 |
1651 |
-@@ -14,12 +14,12 @@ |
1652 |
- imageproperties |
1653 |
- dialogs |
1654 |
- 3rdparty/cimg |
1655 |
-- 3rdparty/clapack |
1656 |
- ${JPEG_INCLUDE_DIR} |
1657 |
- ${TIFF_INCLUDE_DIR} |
1658 |
- ${PNG_INCLUDE_DIR} |
1659 |
- ${PGF_INCLUDE_DIRS} |
1660 |
- ${JASPER_INCLUDE_DIR} |
1661 |
-+ ${LAPACK_INCLUDE_DIRS} |
1662 |
- ) |
1663 |
- ADD_SUBDIRECTORY( histogram ) |
1664 |
- ADD_SUBDIRECTORY( dmetadata ) |
1665 |
|
1666 |
diff --git a/media-gfx/digikam/files/digikam-1.2.0-libpgf-r3.patch b/media-gfx/digikam/files/digikam-1.2.0-libpgf-r3.patch |
1667 |
deleted file mode 100644 |
1668 |
index ebfb85d..0000000 |
1669 |
--- a/media-gfx/digikam/files/digikam-1.2.0-libpgf-r3.patch |
1670 |
+++ /dev/null |
1671 |
@@ -1,157 +0,0 @@ |
1672 |
-diff -ruN old/cmake/modules/FindPGF.cmake new/cmake/modules/FindPGF.cmake |
1673 |
---- old/cmake/modules/FindPGF.cmake 1969-12-31 21:00:00.000000000 -0300 |
1674 |
-+++ new/cmake/modules/FindPGF.cmake 2010-03-30 13:54:13.520854878 -0300 |
1675 |
-@@ -0,0 +1,15 @@ |
1676 |
-+# - Try to find libpgf |
1677 |
-+# Once done this will define |
1678 |
-+# |
1679 |
-+# PGF_FOUND - system has libgf |
1680 |
-+# PGF_INCLUDE_DIRS - the libpgf include directory |
1681 |
-+# PGF_LIBRARIES - Link these to use libpgf |
1682 |
-+ |
1683 |
-+# PKG-CONFIG is required. |
1684 |
-+INCLUDE(FindPkgConfig REQUIRED) |
1685 |
-+ |
1686 |
-+IF(PKG_CONFIG_FOUND) |
1687 |
-+ INCLUDE(FindPkgConfig) |
1688 |
-+ |
1689 |
-+ PKG_CHECK_MODULES(PGF libpgf) |
1690 |
-+ENDIF(PKG_CONFIG_FOUND) |
1691 |
-diff -ruN old/CMakeLists.txt new/CMakeLists.txt |
1692 |
---- old/CMakeLists.txt 2010-03-28 19:26:06.000000000 -0300 |
1693 |
-+++ new/CMakeLists.txt 2010-03-30 19:50:55.537108644 -0300 |
1694 |
-@@ -34,6 +34,9 @@ |
1695 |
- "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}" |
1696 |
- ) |
1697 |
- |
1698 |
-+# Path to find FindPGF.cmake script. |
1699 |
-+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules") |
1700 |
-+ |
1701 |
- # ================================================================================================== |
1702 |
- # Debug area codes |
1703 |
- # These codes will be set for every project specific path automatically, so |
1704 |
-@@ -115,6 +118,11 @@ |
1705 |
- FIND_PACKAGE(JPEG) |
1706 |
- FIND_PACKAGE(PNG) |
1707 |
- FIND_PACKAGE(TIFF) |
1708 |
-+ |
1709 |
-+# Included to unbundle libpgf that is on portage tree. |
1710 |
-+# This function call the script cmake/modules/FindPGF.cmake |
1711 |
-+FIND_PACKAGE(PGF) |
1712 |
-+ |
1713 |
- FIND_PACKAGE(Jasper) |
1714 |
- FIND_PACKAGE(Kdcraw) |
1715 |
- FIND_PACKAGE(Kexiv2) |
1716 |
-@@ -210,6 +218,7 @@ |
1717 |
- |
1718 |
- PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND) |
1719 |
- PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND) |
1720 |
-+PRINT_LIBRARY_STATUS("libpgf" "http://www.libpgf.org" "" PGF_FOUND) |
1721 |
- PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND) |
1722 |
- PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND) |
1723 |
- PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND) |
1724 |
-@@ -311,13 +320,13 @@ |
1725 |
- MESSAGE(STATUS "") |
1726 |
- ENDIF(DOXYGEN_FOUND) |
1727 |
- |
1728 |
--IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1729 |
-+IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1730 |
- MESSAGE(STATUS " digiKam will be compiled................. YES") |
1731 |
- SET(DIGIKAM_CAN_BE_COMPILED true) |
1732 |
--ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1733 |
-+ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1734 |
- MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)") |
1735 |
- SET(DIGIKAM_CAN_BE_COMPILED false) |
1736 |
--ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1737 |
-+ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1738 |
- |
1739 |
- MESSAGE(STATUS "----------------------------------------------------------------------------------") |
1740 |
- MESSAGE(STATUS "") |
1741 |
-@@ -952,14 +961,7 @@ |
1742 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp |
1743 |
- ) |
1744 |
- |
1745 |
-- SET(libpgf_SRCS |
1746 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp |
1747 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp |
1748 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp |
1749 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp |
1750 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp |
1751 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp |
1752 |
-- ) |
1753 |
-+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) |
1754 |
- |
1755 |
- SET(libsqlite2_SRCS |
1756 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c |
1757 |
-diff -ruN old/digikam/CMakeLists.txt new/digikam/CMakeLists.txt |
1758 |
---- old/digikam/CMakeLists.txt 2010-03-28 19:19:21.000000000 -0300 |
1759 |
-+++ new/digikam/CMakeLists.txt 2010-03-30 19:44:00.296860646 -0300 |
1760 |
-@@ -52,7 +52,6 @@ |
1761 |
- # specific libs and utilities |
1762 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof |
1763 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2 |
1764 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf |
1765 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack |
1766 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg |
1767 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine |
1768 |
-@@ -89,6 +88,7 @@ |
1769 |
- ${JPEG_INCLUDE_DIR} |
1770 |
- ${PNG_PNG_INCLUDE_DIR} |
1771 |
- ${TIFF_INCLUDE_DIR} |
1772 |
-+ ${PGF_INCLUDE_DIRS} |
1773 |
- ) |
1774 |
- |
1775 |
- IF(LENSFUN_LIBRARY) |
1776 |
-@@ -100,9 +100,6 @@ |
1777 |
- # Disable Clapack C code warnings. |
1778 |
- SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
1779 |
- |
1780 |
--# Disable libpgf warnings. |
1781 |
--SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
1782 |
-- |
1783 |
- # Disable liblqr C code warnings. |
1784 |
- SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
1785 |
- |
1786 |
-@@ -121,7 +118,6 @@ |
1787 |
- ${libjpegutils_SRCS} |
1788 |
- ${libthreadimageio_SRCS} |
1789 |
- ${libthemeengine_SRCS} |
1790 |
-- ${libpgf_SRCS} |
1791 |
- ${pgfutils_SRCS} |
1792 |
- ${libdigikamhelpers_SRCS} |
1793 |
- |
1794 |
-@@ -173,6 +169,7 @@ |
1795 |
- ${JPEG_LIBRARIES} |
1796 |
- ${TIFF_LIBRARIES} |
1797 |
- ${PNG_LIBRARIES} |
1798 |
-+ ${PGF_LIBRARIES} |
1799 |
- ${LCMS_LIBRARIES} |
1800 |
- ${JASPER_LIBRARIES} |
1801 |
- |
1802 |
-@@ -225,7 +222,6 @@ |
1803 |
- ${libhaar_SRCS} |
1804 |
- ${libdatabasemodels_SRCS} |
1805 |
- ${libsqlite2_SRCS} |
1806 |
-- ${libpgf_SRCS} |
1807 |
- ${pgfutils_SRCS} |
1808 |
- ) |
1809 |
- |
1810 |
-@@ -240,6 +236,7 @@ |
1811 |
- ${QT_QTCORE_LIBRARY} |
1812 |
- ${QT_QTGUI_LIBRARY} |
1813 |
- ${QT_QTSQL_LIBRARY} |
1814 |
-+ ${PGF_LIBRARIES} |
1815 |
- ) |
1816 |
- |
1817 |
- SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 ) |
1818 |
-diff -ruN old/libs/CMakeLists.txt new/libs/CMakeLists.txt |
1819 |
---- old/libs/CMakeLists.txt 2010-03-28 19:19:02.000000000 -0300 |
1820 |
-+++ new/libs/CMakeLists.txt 2010-03-30 14:03:07.365604017 -0300 |
1821 |
-@@ -18,6 +18,7 @@ |
1822 |
- ${JPEG_INCLUDE_DIR} |
1823 |
- ${TIFF_INCLUDE_DIR} |
1824 |
- ${PNG_INCLUDE_DIR} |
1825 |
-+ ${PGF_INCLUDE_DIRS} |
1826 |
- ${JASPER_INCLUDE_DIR} |
1827 |
- ) |
1828 |
- ADD_SUBDIRECTORY( histogram ) |
1829 |
|
1830 |
diff --git a/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch b/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch |
1831 |
deleted file mode 100644 |
1832 |
index e788cf0..0000000 |
1833 |
--- a/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch |
1834 |
+++ /dev/null |
1835 |
@@ -1,208 +0,0 @@ |
1836 |
-diff -ruN old/cmake/modules/FindPGF.cmake new/cmake/modules/FindPGF.cmake |
1837 |
---- old/cmake/modules/FindPGF.cmake 1969-12-31 21:00:00.000000000 -0300 |
1838 |
-+++ new/cmake/modules/FindPGF.cmake 2010-03-30 13:54:13.520854878 -0300 |
1839 |
-@@ -0,0 +1,15 @@ |
1840 |
-+# - Try to find libpgf |
1841 |
-+# Once done this will define |
1842 |
-+# |
1843 |
-+# PGF_FOUND - system has libgf |
1844 |
-+# PGF_INCLUDE_DIRS - the libpgf include directory |
1845 |
-+# PGF_LIBRARIES - Link these to use libpgf |
1846 |
-+ |
1847 |
-+# PKG-CONFIG is required. |
1848 |
-+INCLUDE(FindPkgConfig REQUIRED) |
1849 |
-+ |
1850 |
-+IF(PKG_CONFIG_FOUND) |
1851 |
-+ INCLUDE(FindPkgConfig) |
1852 |
-+ |
1853 |
-+ PKG_CHECK_MODULES(PGF libpgf) |
1854 |
-+ENDIF(PKG_CONFIG_FOUND) |
1855 |
-diff -ruN old/CMakeLists.txt new/CMakeLists.txt |
1856 |
---- old/CMakeLists.txt 2010-03-28 19:26:06.000000000 -0300 |
1857 |
-+++ new/CMakeLists.txt 2010-03-30 19:50:55.537108644 -0300 |
1858 |
-@@ -34,6 +34,9 @@ |
1859 |
- "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}" |
1860 |
- ) |
1861 |
- |
1862 |
-+# Path to find FindPGF.cmake script. |
1863 |
-+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules") |
1864 |
-+ |
1865 |
- # ================================================================================================== |
1866 |
- # Debug area codes |
1867 |
- # These codes will be set for every project specific path automatically, so |
1868 |
-@@ -115,6 +118,11 @@ |
1869 |
- FIND_PACKAGE(JPEG) |
1870 |
- FIND_PACKAGE(PNG) |
1871 |
- FIND_PACKAGE(TIFF) |
1872 |
-+ |
1873 |
-+# Included to unbundle libpgf that is on portage tree. |
1874 |
-+# This function call the script cmake/modules/FindPGF.cmake |
1875 |
-+FIND_PACKAGE(PGF) |
1876 |
-+ |
1877 |
- FIND_PACKAGE(Jasper) |
1878 |
- FIND_PACKAGE(Kdcraw) |
1879 |
- FIND_PACKAGE(Kexiv2) |
1880 |
-@@ -210,6 +218,7 @@ |
1881 |
- |
1882 |
- PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND) |
1883 |
- PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND) |
1884 |
-+PRINT_LIBRARY_STATUS("libpgf" "http://www.libpgf.org" "" PGF_FOUND) |
1885 |
- PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND) |
1886 |
- PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND) |
1887 |
- PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND) |
1888 |
-@@ -311,13 +320,13 @@ |
1889 |
- MESSAGE(STATUS "") |
1890 |
- ENDIF(DOXYGEN_FOUND) |
1891 |
- |
1892 |
--IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1893 |
-+IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1894 |
- MESSAGE(STATUS " digiKam will be compiled................. YES") |
1895 |
- SET(DIGIKAM_CAN_BE_COMPILED true) |
1896 |
--ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1897 |
-+ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1898 |
- MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)") |
1899 |
- SET(DIGIKAM_CAN_BE_COMPILED false) |
1900 |
--ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1901 |
-+ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND) |
1902 |
- |
1903 |
- MESSAGE(STATUS "----------------------------------------------------------------------------------") |
1904 |
- MESSAGE(STATUS "") |
1905 |
-@@ -952,14 +961,7 @@ |
1906 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp |
1907 |
- ) |
1908 |
- |
1909 |
-- SET(libpgf_SRCS |
1910 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp |
1911 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp |
1912 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp |
1913 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp |
1914 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp |
1915 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp |
1916 |
-- ) |
1917 |
-+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) |
1918 |
- |
1919 |
- SET(libsqlite2_SRCS |
1920 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c |
1921 |
-@@ -1258,18 +1260,41 @@ |
1922 |
- # ================================================================================================== |
1923 |
- # API documentation generation |
1924 |
- |
1925 |
--IF(DOXYGEN_FOUND) |
1926 |
-+# Checks if user ask to build documentation. |
1927 |
-+IF(BUILD_DOC) |
1928 |
-+ IF(DOXYGEN_FOUND) |
1929 |
-+ |
1930 |
-+ MESSAGE(STATUS "") |
1931 |
-+ MESSAGE(STATUS "Documentation will be installed") |
1932 |
-+ MESSAGE(STATUS "") |
1933 |
- |
1934 |
-- SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
1935 |
-- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
1936 |
-- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
1937 |
-- SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) |
1938 |
-+ SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
1939 |
-+ SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
1940 |
-+ SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
1941 |
-+ SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) |
1942 |
- |
1943 |
-- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
1944 |
-+ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
1945 |
- |
1946 |
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
1947 |
-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
1948 |
-+ ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
1949 |
-+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
1950 |
-+ |
1951 |
-+ ELSE(DOXYGEN_FOUND) |
1952 |
-+ |
1953 |
-+ MESSAGE(STATUS "") |
1954 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
1955 |
-+ MESSAGE(STATUS "Doxygen wasn't found on the system") |
1956 |
-+ MESSAGE(STATUS "") |
1957 |
-+ |
1958 |
-+ ENDIF(DOXYGEN_FOUND) |
1959 |
-+ |
1960 |
-+ELSE(BUILD_DOC) |
1961 |
-+ |
1962 |
-+ MESSAGE(STATUS "") |
1963 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
1964 |
-+ MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake") |
1965 |
-+ MESSAGE(STATUS "") |
1966 |
-+ |
1967 |
-+ENDIF(BUILD_DOC) |
1968 |
- |
1969 |
--ENDIF(DOXYGEN_FOUND) |
1970 |
- include(MacroOptionalAddSubdirectory) |
1971 |
- macro_optional_add_subdirectory( po ) |
1972 |
-diff -ruN old/digikam/CMakeLists.txt new/digikam/CMakeLists.txt |
1973 |
---- old/digikam/CMakeLists.txt 2010-03-28 19:19:21.000000000 -0300 |
1974 |
-+++ new/digikam/CMakeLists.txt 2010-03-30 19:44:00.296860646 -0300 |
1975 |
-@@ -52,7 +52,6 @@ |
1976 |
- # specific libs and utilities |
1977 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof |
1978 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2 |
1979 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf |
1980 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack |
1981 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg |
1982 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine |
1983 |
-@@ -89,6 +88,7 @@ |
1984 |
- ${JPEG_INCLUDE_DIR} |
1985 |
- ${PNG_PNG_INCLUDE_DIR} |
1986 |
- ${TIFF_INCLUDE_DIR} |
1987 |
-+ ${PGF_INCLUDE_DIRS} |
1988 |
- ) |
1989 |
- |
1990 |
- IF(LENSFUN_LIBRARY) |
1991 |
-@@ -100,9 +100,6 @@ |
1992 |
- # Disable Clapack C code warnings. |
1993 |
- SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
1994 |
- |
1995 |
--# Disable libpgf warnings. |
1996 |
--SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
1997 |
-- |
1998 |
- # Disable liblqr C code warnings. |
1999 |
- SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
2000 |
- |
2001 |
-@@ -121,7 +118,6 @@ |
2002 |
- ${libjpegutils_SRCS} |
2003 |
- ${libthreadimageio_SRCS} |
2004 |
- ${libthemeengine_SRCS} |
2005 |
-- ${libpgf_SRCS} |
2006 |
- ${pgfutils_SRCS} |
2007 |
- ${libdigikamhelpers_SRCS} |
2008 |
- |
2009 |
-@@ -173,6 +169,7 @@ |
2010 |
- ${JPEG_LIBRARIES} |
2011 |
- ${TIFF_LIBRARIES} |
2012 |
- ${PNG_LIBRARIES} |
2013 |
-+ ${PGF_LIBRARIES} |
2014 |
- ${LCMS_LIBRARIES} |
2015 |
- ${JASPER_LIBRARIES} |
2016 |
- |
2017 |
-@@ -225,7 +222,6 @@ |
2018 |
- ${libhaar_SRCS} |
2019 |
- ${libdatabasemodels_SRCS} |
2020 |
- ${libsqlite2_SRCS} |
2021 |
-- ${libpgf_SRCS} |
2022 |
- ${pgfutils_SRCS} |
2023 |
- ) |
2024 |
- |
2025 |
-@@ -240,6 +236,7 @@ |
2026 |
- ${QT_QTCORE_LIBRARY} |
2027 |
- ${QT_QTGUI_LIBRARY} |
2028 |
- ${QT_QTSQL_LIBRARY} |
2029 |
-+ ${PGF_LIBRARIES} |
2030 |
- ) |
2031 |
- |
2032 |
- SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 ) |
2033 |
-diff -ruN old/libs/CMakeLists.txt new/libs/CMakeLists.txt |
2034 |
---- old/libs/CMakeLists.txt 2010-03-28 19:19:02.000000000 -0300 |
2035 |
-+++ new/libs/CMakeLists.txt 2010-03-30 14:03:07.365604017 -0300 |
2036 |
-@@ -18,6 +18,7 @@ |
2037 |
- ${JPEG_INCLUDE_DIR} |
2038 |
- ${TIFF_INCLUDE_DIR} |
2039 |
- ${PNG_INCLUDE_DIR} |
2040 |
-+ ${PGF_INCLUDE_DIRS} |
2041 |
- ${JASPER_INCLUDE_DIR} |
2042 |
- ) |
2043 |
- ADD_SUBDIRECTORY( histogram ) |
2044 |
|
2045 |
diff --git a/media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch b/media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch |
2046 |
deleted file mode 100644 |
2047 |
index 02d4cce..0000000 |
2048 |
--- a/media-gfx/digikam/files/digikam-1.2.0-ratingwidget.patch |
2049 |
+++ /dev/null |
2050 |
@@ -1,11 +0,0 @@ |
2051 |
---- trunk/extragear/graphics/digikam/digikam/ratingwidget.cpp 2010/03/30 18:15:12 1109176 |
2052 |
-+++ trunk/extragear/graphics/digikam/digikam/ratingwidget.cpp 2010/03/30 18:15:25 1109177 |
2053 |
-@@ -165,7 +165,7 @@ |
2054 |
- void RatingWidget::setFadingValue(int value) |
2055 |
- { |
2056 |
- d->fadingValue = value; |
2057 |
-- if (d->fadingValue >= 255) |
2058 |
-+ if (d->fadingValue >= 255 && d->fadingTimeLine) |
2059 |
- { |
2060 |
- d->fadingTimeLine->stop(); |
2061 |
- } |
2062 |
|
2063 |
diff --git a/media-gfx/digikam/files/digikam-1.3.0-docs.patch b/media-gfx/digikam/files/digikam-1.3.0-docs.patch |
2064 |
deleted file mode 100644 |
2065 |
index 63af639..0000000 |
2066 |
--- a/media-gfx/digikam/files/digikam-1.3.0-docs.patch |
2067 |
+++ /dev/null |
2068 |
@@ -1,54 +0,0 @@ |
2069 |
-diff -r -u -N digikam-1.3.0.orig/CMakeLists.txt digikam-1.3.0/CMakeLists.txt |
2070 |
---- digikam-1.3.0.orig/CMakeLists.txt 2010-06-07 23:23:08.000000000 +0200 |
2071 |
-+++ digikam-1.3.0/CMakeLists.txt 2010-07-06 21:26:53.163356449 +0200 |
2072 |
-@@ -1334,18 +1336,41 @@ |
2073 |
- # ================================================================================================== |
2074 |
- # API documentation generation |
2075 |
- |
2076 |
--IF(DOXYGEN_FOUND) |
2077 |
-+# Checks if user ask to build documentation. |
2078 |
-+IF(BUILD_DOC) |
2079 |
-+ IF(DOXYGEN_FOUND) |
2080 |
-+ |
2081 |
-+ MESSAGE(STATUS "") |
2082 |
-+ MESSAGE(STATUS "Documentation will be installed") |
2083 |
-+ MESSAGE(STATUS "") |
2084 |
- |
2085 |
-- SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
2086 |
-- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
2087 |
-- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
2088 |
-- SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) |
2089 |
-+ SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
2090 |
-+ SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
2091 |
-+ SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
2092 |
-+ SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) |
2093 |
- |
2094 |
-- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
2095 |
-+ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
2096 |
- |
2097 |
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
2098 |
-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
2099 |
-+ ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
2100 |
-+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
2101 |
-+ |
2102 |
-+ ELSE(DOXYGEN_FOUND) |
2103 |
-+ |
2104 |
-+ MESSAGE(STATUS "") |
2105 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
2106 |
-+ MESSAGE(STATUS "Doxygen wasn't found on the system") |
2107 |
-+ MESSAGE(STATUS "") |
2108 |
-+ |
2109 |
-+ ENDIF(DOXYGEN_FOUND) |
2110 |
-+ |
2111 |
-+ELSE(BUILD_DOC) |
2112 |
-+ |
2113 |
-+ MESSAGE(STATUS "") |
2114 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
2115 |
-+ MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake") |
2116 |
-+ MESSAGE(STATUS "") |
2117 |
-+ |
2118 |
-+ENDIF(BUILD_DOC) |
2119 |
- |
2120 |
--ENDIF(DOXYGEN_FOUND) |
2121 |
- include(MacroOptionalAddSubdirectory) |
2122 |
- macro_optional_add_subdirectory( po ) |
2123 |
|
2124 |
diff --git a/media-gfx/digikam/files/digikam-1.3.0-pgf.patch b/media-gfx/digikam/files/digikam-1.3.0-pgf.patch |
2125 |
deleted file mode 100644 |
2126 |
index c965a84..0000000 |
2127 |
--- a/media-gfx/digikam/files/digikam-1.3.0-pgf.patch |
2128 |
+++ /dev/null |
2129 |
@@ -1,153 +0,0 @@ |
2130 |
-diff -u -r -N digikam-1.3.0-1-docs/CMakeLists.txt digikam-1.3.0/CMakeLists.txt |
2131 |
---- digikam-1.3.0-1-docs/CMakeLists.txt 2010-08-26 23:24:35.000000000 +0200 |
2132 |
-+++ digikam-1.3.0/CMakeLists.txt 2010-08-26 23:44:46.000000000 +0200 |
2133 |
-@@ -34,6 +34,9 @@ |
2134 |
- "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}" |
2135 |
- ) |
2136 |
- |
2137 |
-+# Path to find FindPGF.cmake script. |
2138 |
-+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules") |
2139 |
-+ |
2140 |
- # ================================================================================================== |
2141 |
- # Debug area codes |
2142 |
- # These codes will be set for every project specific path automatically, so |
2143 |
-@@ -133,6 +136,7 @@ |
2144 |
- FIND_PACKAGE(JPEG) |
2145 |
- FIND_PACKAGE(PNG) |
2146 |
- FIND_PACKAGE(TIFF) |
2147 |
-+FIND_PACKAGE(PGF) |
2148 |
- FIND_PACKAGE(Jasper) |
2149 |
- FIND_PACKAGE(Kdcraw) |
2150 |
- FIND_PACKAGE(Kexiv2) |
2151 |
-@@ -267,6 +271,13 @@ |
2152 |
- PRINT_LIBRARY_STATUS("libkexiv2" "http://www.digikam.org/sharedlibs" " (version >= 1.1.0)" KEXIV2_FOR_DIGIKAM) |
2153 |
- PRINT_LIBRARY_STATUS("libkdcraw" "http://www.digikam.org/sharedlibs" " (version >= 1.1.0)" KDCRAW_FOR_DIGIKAM) |
2154 |
- |
2155 |
-+IF(PGF_FOUND) |
2156 |
-+ MESSAGE(STATUS " libpgf library found..................... YES (optional)") |
2157 |
-+ELSE(PGF_FOUND) |
2158 |
-+ MESSAGE(STATUS " libpgf library found..................... NO (optional - internal version used instead)") |
2159 |
-+ENDIF(GPHOTO2_FOUND) |
2160 |
-+ |
2161 |
-+ |
2162 |
- # ================================================================ |
2163 |
- |
2164 |
- IF(GPHOTO2_FOUND) |
2165 |
-@@ -1018,14 +1029,18 @@ |
2166 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp |
2167 |
- ) |
2168 |
- |
2169 |
-- SET(libpgf_SRCS |
2170 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp |
2171 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp |
2172 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp |
2173 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp |
2174 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp |
2175 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp |
2176 |
-+ IF(PGF_FOUND) |
2177 |
-+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) |
2178 |
-+ ELSE(PGF_FOUND) |
2179 |
-+ SET(libpgf_SRCS |
2180 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp |
2181 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp |
2182 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp |
2183 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp |
2184 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp |
2185 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp |
2186 |
- ) |
2187 |
-+ ENDIF(PGF_FOUND) |
2188 |
- |
2189 |
- SET(libsqlite2_SRCS |
2190 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c |
2191 |
-diff -u -r -N digikam-1.3.0-1-docs/cmake/modules/FindPGF.cmake digikam-1.3.0/cmake/modules/FindPGF.cmake |
2192 |
---- digikam-1.3.0-1-docs/cmake/modules/FindPGF.cmake 1970-01-01 01:00:00.000000000 +0100 |
2193 |
-+++ digikam-1.3.0/cmake/modules/FindPGF.cmake 2010-08-26 23:25:18.000000000 +0200 |
2194 |
-@@ -0,0 +1,15 @@ |
2195 |
-+# - Try to find libpgf |
2196 |
-+# Once done this will define |
2197 |
-+# |
2198 |
-+# PGF_FOUND - system has libgf |
2199 |
-+# PGF_INCLUDE_DIRS - the libpgf include directory |
2200 |
-+# PGF_LIBRARIES - Link these to use libpgf |
2201 |
-+ |
2202 |
-+# PKG-CONFIG is required. |
2203 |
-+INCLUDE(FindPkgConfig REQUIRED) |
2204 |
-+ |
2205 |
-+IF(PKG_CONFIG_FOUND) |
2206 |
-+ INCLUDE(FindPkgConfig) |
2207 |
-+ |
2208 |
-+ PKG_CHECK_MODULES(PGF libpgf) |
2209 |
-+ENDIF(PKG_CONFIG_FOUND) |
2210 |
-diff -u -r -N digikam-1.3.0-1-docs/digikam/CMakeLists.txt digikam-1.3.0/digikam/CMakeLists.txt |
2211 |
---- digikam-1.3.0-1-docs/digikam/CMakeLists.txt 2010-06-07 23:16:45.000000000 +0200 |
2212 |
-+++ digikam-1.3.0/digikam/CMakeLists.txt 2010-08-26 23:39:47.000000000 +0200 |
2213 |
-@@ -53,7 +53,6 @@ |
2214 |
- # specific libs and utilities |
2215 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof |
2216 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2 |
2217 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf |
2218 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack |
2219 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg |
2220 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine |
2221 |
-@@ -94,6 +93,12 @@ |
2222 |
- ${TIFF_INCLUDE_DIR} |
2223 |
- ) |
2224 |
- |
2225 |
-+IF(PGF_FOUND) |
2226 |
-+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) |
2227 |
-+ELSE(PGF_FOUND) |
2228 |
-+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf) |
2229 |
-+ENDIF(PGF_FOUND) |
2230 |
-+ |
2231 |
- IF(LENSFUN_LIBRARY) |
2232 |
- INCLUDE_DIRECTORIES(${LENSFUN_INCLUDE_DIR}) |
2233 |
- ENDIF(LENSFUN_LIBRARY) |
2234 |
-@@ -103,8 +108,10 @@ |
2235 |
- # Disable Clapack C code warnings. |
2236 |
- SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
2237 |
- |
2238 |
--# Disable libpgf warnings. |
2239 |
--SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
2240 |
-+IF(NOT PGF_FOUND) |
2241 |
-+ # Disable libpgf warnings. |
2242 |
-+ SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
2243 |
-+ENDIF(NOT PGF_FOUND) |
2244 |
- |
2245 |
- # Disable liblqr C code warnings. |
2246 |
- SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
2247 |
-@@ -188,6 +195,10 @@ |
2248 |
- ${KIPI_LIBRARIES} |
2249 |
- ) |
2250 |
- |
2251 |
-+IF(PGF_FOUND) |
2252 |
-+ TARGET_LINK_LIBRARIES(digikamcore ${PGF_LIBRARIES}) |
2253 |
-+ENDIF(PGF_FOUND) |
2254 |
-+ |
2255 |
- IF(MARBLEWIDGET_FOUND) |
2256 |
- TARGET_LINK_LIBRARIES(digikamcore ${LIBMARBLEWIDGET_LIBRARY}) |
2257 |
- ENDIF(MARBLEWIDGET_FOUND) |
2258 |
-@@ -246,6 +257,10 @@ |
2259 |
- ${QT_QTSQL_LIBRARY} |
2260 |
- ) |
2261 |
- |
2262 |
-+IF(PGF_FOUND) |
2263 |
-+ TARGET_LINK_LIBRARIES(digikamdatabase ${PGF_LIBRARIES}) |
2264 |
-+ENDIF(PGF_FOUND) |
2265 |
-+ |
2266 |
- SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 ) |
2267 |
- INSTALL(TARGETS digikamdatabase ${INSTALL_TARGETS_DEFAULT_ARGS} ) |
2268 |
- |
2269 |
-diff -u -r -N digikam-1.3.0-1-docs/libs/CMakeLists.txt digikam-1.3.0/libs/CMakeLists.txt |
2270 |
---- digikam-1.3.0-1-docs/libs/CMakeLists.txt 2010-06-07 23:16:40.000000000 +0200 |
2271 |
-+++ digikam-1.3.0/libs/CMakeLists.txt 2010-08-26 23:43:35.000000000 +0200 |
2272 |
-@@ -21,6 +21,10 @@ |
2273 |
- ${JASPER_INCLUDE_DIR} |
2274 |
- ) |
2275 |
- |
2276 |
-+IF(PGF_FOUND) |
2277 |
-+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) |
2278 |
-+ENDIF(PGF_FOUND) |
2279 |
-+ |
2280 |
- ADD_SUBDIRECTORY( histogram ) |
2281 |
- ADD_SUBDIRECTORY( dmetadata ) |
2282 |
- ADD_SUBDIRECTORY( dimg ) |
2283 |
|
2284 |
diff --git a/media-gfx/digikam/files/digikam-1.4.0-clapack.patch b/media-gfx/digikam/files/digikam-1.4.0-clapack.patch |
2285 |
deleted file mode 100644 |
2286 |
index 2fb1f5e..0000000 |
2287 |
--- a/media-gfx/digikam/files/digikam-1.4.0-clapack.patch |
2288 |
+++ /dev/null |
2289 |
@@ -1,181 +0,0 @@ |
2290 |
-diff -r -u -N digikam-1.4.0.1pgf/CMakeLists.txt digikam-1.4.0/CMakeLists.txt |
2291 |
---- digikam-1.4.0.1pgf/CMakeLists.txt 2010-08-31 23:39:20.000000000 +0200 |
2292 |
-+++ digikam-1.4.0/CMakeLists.txt 2010-08-31 23:39:47.000000000 +0200 |
2293 |
-@@ -141,6 +141,7 @@ |
2294 |
- FIND_PACKAGE(Kdcraw) |
2295 |
- FIND_PACKAGE(Kexiv2) |
2296 |
- FIND_PACKAGE(Kipi) |
2297 |
-+FIND_PACKAGE(CLAPACK) |
2298 |
- |
2299 |
- # Extract version of libjpeg so that we can use the appropriate dir |
2300 |
- # See bug #227313, #228483 |
2301 |
-@@ -278,7 +279,13 @@ |
2302 |
- MESSAGE(STATUS " libpgf library found..................... YES (optional)") |
2303 |
- ELSE(PGF_FOUND) |
2304 |
- MESSAGE(STATUS " libpgf library found..................... NO (optional - internal version used instead)") |
2305 |
--ENDIF(GPHOTO2_FOUND) |
2306 |
-+ENDIF(PGF_FOUND) |
2307 |
-+ |
2308 |
-+IF(CLAPACK_FOUND) |
2309 |
-+ MESSAGE(STATUS " libclapack library found................. YES (optional)") |
2310 |
-+ELSE(CLAPACK_FOUND) |
2311 |
-+ MESSAGE(STATUS " libclapack library found................. NO (optional - internal version used instead)") |
2312 |
-+ENDIF(CLAPACK_FOUND) |
2313 |
- |
2314 |
- |
2315 |
- # ================================================================ |
2316 |
-@@ -377,13 +384,19 @@ |
2317 |
- ENDIF(DOXYGEN_FOUND) |
2318 |
- |
2319 |
- IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND) |
2320 |
-- MESSAGE(STATUS " digiKam will be compiled................. YES") |
2321 |
-+ MESSAGE(STATUS " digiKam can be compiled.................. YES") |
2322 |
- SET(DIGIKAM_CAN_BE_COMPILED true) |
2323 |
- ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND) |
2324 |
- MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)") |
2325 |
- SET(DIGIKAM_CAN_BE_COMPILED false) |
2326 |
- ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND) |
2327 |
- |
2328 |
-+IF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR (NOT CLAPACK_FOUND))) |
2329 |
-+ MESSAGE(STATUS "") |
2330 |
-+ MESSAGE(FATAL_ERROR " BUNDLED LIBRARIES HAVE BEEN FORCE-DISABLED IN THIS BUILD. Aborting.") |
2331 |
-+ SET(DIGIKAM_CAN_BE_COMPILED false) |
2332 |
-+ENDIF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR (NOT CLAPACK_FOUND))) |
2333 |
-+ |
2334 |
- MESSAGE(STATUS "----------------------------------------------------------------------------------") |
2335 |
- MESSAGE(STATUS "") |
2336 |
- |
2337 |
-@@ -541,7 +554,8 @@ |
2338 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp |
2339 |
- ) |
2340 |
- |
2341 |
-- SET(libclapack_SRCS |
2342 |
-+ if(NOT CLAPACK_FOUND) |
2343 |
-+ SET(libclapack_SRCS |
2344 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/abort_.c |
2345 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgesv.c |
2346 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dlaswp.c |
2347 |
-@@ -574,6 +588,7 @@ |
2348 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c |
2349 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c |
2350 |
- ) |
2351 |
-+ endif(NOT CLAPACK_FOUND) |
2352 |
- |
2353 |
- SET(libdimgfilters_SRCS |
2354 |
- ${libclapack_SRCS} |
2355 |
-diff -r -u -N digikam-1.4.0.1pgf/cmake/modules/FindCLAPACK.cmake digikam-1.4.0/cmake/modules/FindCLAPACK.cmake |
2356 |
---- digikam-1.4.0.1pgf/cmake/modules/FindCLAPACK.cmake 1970-01-01 01:00:00.000000000 +0100 |
2357 |
-+++ digikam-1.4.0/cmake/modules/FindCLAPACK.cmake 2010-08-31 23:43:20.000000000 +0200 |
2358 |
-@@ -0,0 +1,44 @@ |
2359 |
-+# - Try to find clapack library |
2360 |
-+# Once done this will define |
2361 |
-+# |
2362 |
-+# CLAPACK_FOUND - system has CLAPACK library |
2363 |
-+# CLAPACK_INCLUDE_DIR - the CLAPACK include directory |
2364 |
-+# CLAPACK_LIBRARY - the marblewidget library |
2365 |
-+# |
2366 |
-+# copyright 2008 by Patrick Spendrin <ps_ml@×××.de> |
2367 |
-+# copyright 2010 by Andreas K. Huettel <mail@×××××××××.de> |
2368 |
-+# use this file as you like |
2369 |
-+# |
2370 |
-+ |
2371 |
-+if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) |
2372 |
-+ |
2373 |
-+ # Already in cache |
2374 |
-+ set(CLAPACK_FOUND TRUE) |
2375 |
-+ |
2376 |
-+else(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) |
2377 |
-+ |
2378 |
-+ find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack NO_DEFAULT_PATH) |
2379 |
-+ if(CLAPACK_INCLUDE_DIR) |
2380 |
-+ message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}") |
2381 |
-+ else(CLAPACK_INCLUDE_DIR) |
2382 |
-+ find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack) |
2383 |
-+ if(CLAPACK_INCLUDE_DIR) |
2384 |
-+ message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}") |
2385 |
-+ endif(CLAPACK_INCLUDE_DIR) |
2386 |
-+ endif(CLAPACK_INCLUDE_DIR) |
2387 |
-+ |
2388 |
-+ find_library(CLAPACK_LIBRARY clapack) |
2389 |
-+ if(CLAPACK_LIBRARY) |
2390 |
-+ message(STATUS "Found clapack library: ${CLAPACK_LIBRARY}") |
2391 |
-+ endif(CLAPACK_LIBRARY) |
2392 |
-+ |
2393 |
-+ if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) |
2394 |
-+ set(CLAPACK_FOUND TRUE) |
2395 |
-+ endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) |
2396 |
-+ |
2397 |
-+ if(NOT CLAPACK_FOUND) |
2398 |
-+ message(STATUS "Could NOT find any working clapack installation") |
2399 |
-+ endif(NOT CLAPACK_FOUND) |
2400 |
-+ |
2401 |
-+ mark_as_advanced(CLAPACK_INCLUDE_DIR CLAPACK_LIBRARY) |
2402 |
-+endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) |
2403 |
-diff -r -u -N digikam-1.4.0.1pgf/digikam/CMakeLists.txt digikam-1.4.0/digikam/CMakeLists.txt |
2404 |
---- digikam-1.4.0.1pgf/digikam/CMakeLists.txt 2010-08-31 23:39:20.000000000 +0200 |
2405 |
-+++ digikam-1.4.0/digikam/CMakeLists.txt 2010-08-31 23:39:47.000000000 +0200 |
2406 |
-@@ -53,7 +53,6 @@ |
2407 |
- # specific libs and utilities |
2408 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof |
2409 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2 |
2410 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack |
2411 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg |
2412 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine |
2413 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/kipiiface |
2414 |
-@@ -103,10 +102,18 @@ |
2415 |
- INCLUDE_DIRECTORIES(${LENSFUN_INCLUDE_DIR}) |
2416 |
- ENDIF(LENSFUN_LIBRARY) |
2417 |
- |
2418 |
-+IF(CLAPACK_FOUND) |
2419 |
-+ INCLUDE_DIRECTORIES(${CLAPACK_INCLUDE_DIR}) |
2420 |
-+ELSE(CLAPACK_FOUND) |
2421 |
-+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack) |
2422 |
-+ENDIF(CLAPACK_FOUND) |
2423 |
-+ |
2424 |
- # Shared libdigikamcore ################################################################ |
2425 |
- |
2426 |
--# Disable Clapack C code warnings. |
2427 |
--SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
2428 |
-+IF(NOT CLAPACK_FOUND) |
2429 |
-+ # Disable Clapack C code warnings. |
2430 |
-+ SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
2431 |
-+ENDIF(NOT CLAPACK_FOUND) |
2432 |
- |
2433 |
- IF(NOT PGF_FOUND) |
2434 |
- # Disable libpgf warnings. |
2435 |
-@@ -203,6 +210,10 @@ |
2436 |
- TARGET_LINK_LIBRARIES(digikamcore ${LIBMARBLEWIDGET_LIBRARY}) |
2437 |
- ENDIF(MARBLEWIDGET_FOUND) |
2438 |
- |
2439 |
-+IF(CLAPACK_FOUND) |
2440 |
-+ TARGET_LINK_LIBRARIES(digikamcore ${CLAPACK_LIBRARY}) |
2441 |
-+ENDIF(CLAPACK_FOUND) |
2442 |
-+ |
2443 |
- IF(Q_WS_X11) |
2444 |
- TARGET_LINK_LIBRARIES(digikamcore ${X11_LIBRARIES}) |
2445 |
- ENDIF(Q_WS_X11) |
2446 |
-@@ -359,6 +370,10 @@ |
2447 |
- TARGET_LINK_LIBRARIES(digikam ${LIBMARBLEWIDGET_LIBRARY}) |
2448 |
- ENDIF(MARBLEWIDGET_FOUND) |
2449 |
- |
2450 |
-+IF(CLAPACK_FOUND) |
2451 |
-+ TARGET_LINK_LIBRARIES(digikam ${CLAPACK_LIBRARY}) |
2452 |
-+ENDIF(CLAPACK_FOUND) |
2453 |
-+ |
2454 |
- INSTALL(TARGETS digikam ${INSTALL_TARGETS_DEFAULT_ARGS}) |
2455 |
- |
2456 |
- # Others Files to install ####################################################### |
2457 |
-diff -r -u -N digikam-1.4.0.1pgf/showfoto/CMakeLists.txt digikam-1.4.0/showfoto/CMakeLists.txt |
2458 |
---- digikam-1.4.0.1pgf/showfoto/CMakeLists.txt 2010-08-22 10:53:39.000000000 +0200 |
2459 |
-+++ digikam-1.4.0/showfoto/CMakeLists.txt 2010-08-31 23:39:47.000000000 +0200 |
2460 |
-@@ -65,6 +65,10 @@ |
2461 |
- |
2462 |
- KDE4_ADD_EXECUTABLE(showfoto ${showfoto_SRCS}) |
2463 |
- |
2464 |
-+IF(CLAPACK_FOUND) |
2465 |
-+ TARGET_LINK_LIBRARIES(showfoto ${CLAPACK_LIBRARY}) |
2466 |
-+ENDIF(CLAPACK_FOUND) |
2467 |
-+ |
2468 |
- TARGET_LINK_LIBRARIES(showfoto |
2469 |
- digikamcore |
2470 |
- ${KEXIV2_LIBRARIES} |
2471 |
|
2472 |
diff --git a/media-gfx/digikam/files/digikam-1.4.0-docs.patch b/media-gfx/digikam/files/digikam-1.4.0-docs.patch |
2473 |
deleted file mode 100644 |
2474 |
index 2cc2791..0000000 |
2475 |
--- a/media-gfx/digikam/files/digikam-1.4.0-docs.patch |
2476 |
+++ /dev/null |
2477 |
@@ -1,58 +0,0 @@ |
2478 |
-diff -r -u digikam-1.4.0.orig/CMakeLists.txt digikam-1.4.0/CMakeLists.txt |
2479 |
---- digikam-1.4.0.orig/CMakeLists.txt 2010-08-22 10:59:50.000000000 +0200 |
2480 |
-+++ digikam-1.4.0/CMakeLists.txt 2010-09-24 23:48:11.557561663 +0200 |
2481 |
-@@ -1340,18 +1340,45 @@ |
2482 |
- # ================================================================================================== |
2483 |
- # API documentation generation |
2484 |
- |
2485 |
--IF(DOXYGEN_FOUND) |
2486 |
-+# Checks if user ask to build documentation. |
2487 |
-+IF(BUILD_DOC) |
2488 |
-+ IF(DOXYGEN_FOUND) |
2489 |
- |
2490 |
-- SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
2491 |
-- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
2492 |
-- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
2493 |
-- SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) |
2494 |
-+ MESSAGE(STATUS "") |
2495 |
-+ MESSAGE(STATUS "Documentation will be installed") |
2496 |
-+ MESSAGE(STATUS "") |
2497 |
- |
2498 |
-- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
2499 |
-+ SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
2500 |
-+ SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
2501 |
-+ SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
2502 |
-+ SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log) |
2503 |
- |
2504 |
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
2505 |
-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
2506 |
-+ CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
2507 |
-+ |
2508 |
-+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
2509 |
-+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
2510 |
-+ |
2511 |
-+ ELSE(DOXYGEN_FOUND) |
2512 |
-+ |
2513 |
-+ MESSAGE(STATUS "") |
2514 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
2515 |
-+ MESSAGE(STATUS "Doxygen wasn't found on the system") |
2516 |
-+ MESSAGE(STATUS "") |
2517 |
-+ |
2518 |
-+ ENDIF(DOXYGEN_FOUND) |
2519 |
-+ |
2520 |
-+ELSE(BUILD_DOC) |
2521 |
-+ |
2522 |
-+ MESSAGE(STATUS "") |
2523 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
2524 |
-+ MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake") |
2525 |
-+ MESSAGE(STATUS "") |
2526 |
-+ |
2527 |
-+ENDIF(BUILD_DOC) |
2528 |
- |
2529 |
--ENDIF(DOXYGEN_FOUND) |
2530 |
- include(MacroOptionalAddSubdirectory) |
2531 |
- macro_optional_add_subdirectory( po ) |
2532 |
-+ |
2533 |
-+# Build the handbook |
2534 |
-+add_subdirectory( doc ) |
2535 |
-+ |
2536 |
|
2537 |
diff --git a/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch b/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch |
2538 |
deleted file mode 100644 |
2539 |
index 6d1470b..0000000 |
2540 |
--- a/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch |
2541 |
+++ /dev/null |
2542 |
@@ -1,294 +0,0 @@ |
2543 |
-diff -r -u -N digikam-1.5.0-1-docs/CMakeLists.txt digikam-1.5.0/CMakeLists.txt |
2544 |
---- digikam-1.5.0-1-docs/CMakeLists.txt 2010-10-12 21:14:36.000000000 +0200 |
2545 |
-+++ digikam-1.5.0/CMakeLists.txt 2010-10-15 23:07:49.000000000 +0200 |
2546 |
-@@ -34,6 +34,9 @@ |
2547 |
- "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}" |
2548 |
- ) |
2549 |
- |
2550 |
-+# Path to find FindPGF.cmake script. |
2551 |
-+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules") |
2552 |
-+ |
2553 |
- # ================================================================================================== |
2554 |
- # Debug area codes |
2555 |
- # These codes will be set for every project specific path automatically, so |
2556 |
-@@ -133,10 +136,12 @@ |
2557 |
- FIND_PACKAGE(JPEG) |
2558 |
- FIND_PACKAGE(PNG) |
2559 |
- FIND_PACKAGE(TIFF) |
2560 |
-+FIND_PACKAGE(PGF) |
2561 |
- FIND_PACKAGE(Jasper) |
2562 |
- FIND_PACKAGE(Kdcraw) |
2563 |
- FIND_PACKAGE(Kexiv2) |
2564 |
- FIND_PACKAGE(Kipi) |
2565 |
-+FIND_PACKAGE(CLAPACK) |
2566 |
- |
2567 |
- # Extract version of libjpeg so that we can use the appropriate dir |
2568 |
- # See bug #227313, #228483 |
2569 |
-@@ -273,6 +278,19 @@ |
2570 |
- PRINT_LIBRARY_STATUS("libkexiv2" "http://www.digikam.org/sharedlibs" " (version >= 1.1.0)" KEXIV2_FOR_DIGIKAM) |
2571 |
- PRINT_LIBRARY_STATUS("libkdcraw" "http://www.digikam.org/sharedlibs" " (version >= 1.1.0)" KDCRAW_FOR_DIGIKAM) |
2572 |
- |
2573 |
-+IF(PGF_FOUND) |
2574 |
-+ MESSAGE(STATUS " libpgf library found..................... YES (optional)") |
2575 |
-+ELSE(PGF_FOUND) |
2576 |
-+ MESSAGE(STATUS " libpgf library found..................... NO (optional - internal version used instead)") |
2577 |
-+ENDIF(PGF_FOUND) |
2578 |
-+ |
2579 |
-+IF(CLAPACK_FOUND) |
2580 |
-+ MESSAGE(STATUS " libclapack library found................. YES (optional)") |
2581 |
-+ELSE(CLAPACK_FOUND) |
2582 |
-+ MESSAGE(STATUS " libclapack library found................. NO (optional - internal version used instead)") |
2583 |
-+ENDIF(CLAPACK_FOUND) |
2584 |
-+ |
2585 |
-+ |
2586 |
- # ================================================================ |
2587 |
- |
2588 |
- IF(GPHOTO2_FOUND) |
2589 |
-@@ -367,13 +385,19 @@ |
2590 |
- ENDIF(DOXYGEN_FOUND) |
2591 |
- |
2592 |
- IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND) |
2593 |
-- MESSAGE(STATUS " digiKam will be compiled................. YES") |
2594 |
-+ MESSAGE(STATUS " digiKam can be compiled.................. YES") |
2595 |
- SET(DIGIKAM_CAN_BE_COMPILED true) |
2596 |
- ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND) |
2597 |
- MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)") |
2598 |
- SET(DIGIKAM_CAN_BE_COMPILED false) |
2599 |
- ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND) |
2600 |
- |
2601 |
-+IF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR (NOT CLAPACK_FOUND) OR (NOT LENSFUN_FOUND))) |
2602 |
-+ MESSAGE(STATUS "") |
2603 |
-+ MESSAGE(FATAL_ERROR " BUNDLED LIBRARIES HAVE BEEN FORCE-DISABLED IN THIS BUILD. Aborting.") |
2604 |
-+ SET(DIGIKAM_CAN_BE_COMPILED false) |
2605 |
-+ENDIF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR (NOT CLAPACK_FOUND) OR (NOT LENSFUN_FOUND))) |
2606 |
-+ |
2607 |
- MESSAGE(STATUS "----------------------------------------------------------------------------------") |
2608 |
- MESSAGE(STATUS "") |
2609 |
- |
2610 |
-@@ -585,7 +609,8 @@ |
2611 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp |
2612 |
- ) |
2613 |
- |
2614 |
-- SET(libclapack_SRCS |
2615 |
-+ if(NOT CLAPACK_FOUND) |
2616 |
-+ SET(libclapack_SRCS |
2617 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/abort_.c |
2618 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgesv.c |
2619 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dlaswp.c |
2620 |
-@@ -618,6 +643,7 @@ |
2621 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c |
2622 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c |
2623 |
- ) |
2624 |
-+ endif(NOT CLAPACK_FOUND) |
2625 |
- |
2626 |
- SET(libdimgfilters_SRCS |
2627 |
- ${libclapack_SRCS} |
2628 |
-@@ -1076,14 +1102,18 @@ |
2629 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp |
2630 |
- ) |
2631 |
- |
2632 |
-- SET(libpgf_SRCS |
2633 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp |
2634 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp |
2635 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp |
2636 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp |
2637 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp |
2638 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp |
2639 |
-+ IF(PGF_FOUND) |
2640 |
-+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) |
2641 |
-+ ELSE(PGF_FOUND) |
2642 |
-+ SET(libpgf_SRCS |
2643 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp |
2644 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp |
2645 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp |
2646 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp |
2647 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp |
2648 |
-+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp |
2649 |
- ) |
2650 |
-+ ENDIF(PGF_FOUND) |
2651 |
- |
2652 |
- SET(libsqlite2_SRCS |
2653 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c |
2654 |
-diff -r -u -N digikam-1.5.0-1-docs/cmake/modules/FindCLAPACK.cmake digikam-1.5.0/cmake/modules/FindCLAPACK.cmake |
2655 |
---- digikam-1.5.0-1-docs/cmake/modules/FindCLAPACK.cmake 1970-01-01 01:00:00.000000000 +0100 |
2656 |
-+++ digikam-1.5.0/cmake/modules/FindCLAPACK.cmake 2010-10-15 23:06:08.000000000 +0200 |
2657 |
-@@ -0,0 +1,44 @@ |
2658 |
-+# - Try to find clapack library |
2659 |
-+# Once done this will define |
2660 |
-+# |
2661 |
-+# CLAPACK_FOUND - system has CLAPACK library |
2662 |
-+# CLAPACK_INCLUDE_DIR - the CLAPACK include directory |
2663 |
-+# CLAPACK_LIBRARY - the marblewidget library |
2664 |
-+# |
2665 |
-+# copyright 2008 by Patrick Spendrin <ps_ml@×××.de> |
2666 |
-+# copyright 2010 by Andreas K. Huettel <mail@×××××××××.de> |
2667 |
-+# use this file as you like |
2668 |
-+# |
2669 |
-+ |
2670 |
-+if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) |
2671 |
-+ |
2672 |
-+ # Already in cache |
2673 |
-+ set(CLAPACK_FOUND TRUE) |
2674 |
-+ |
2675 |
-+else(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) |
2676 |
-+ |
2677 |
-+ find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack NO_DEFAULT_PATH) |
2678 |
-+ if(CLAPACK_INCLUDE_DIR) |
2679 |
-+ message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}") |
2680 |
-+ else(CLAPACK_INCLUDE_DIR) |
2681 |
-+ find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack) |
2682 |
-+ if(CLAPACK_INCLUDE_DIR) |
2683 |
-+ message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}") |
2684 |
-+ endif(CLAPACK_INCLUDE_DIR) |
2685 |
-+ endif(CLAPACK_INCLUDE_DIR) |
2686 |
-+ |
2687 |
-+ find_library(CLAPACK_LIBRARY clapack) |
2688 |
-+ if(CLAPACK_LIBRARY) |
2689 |
-+ message(STATUS "Found clapack library: ${CLAPACK_LIBRARY}") |
2690 |
-+ endif(CLAPACK_LIBRARY) |
2691 |
-+ |
2692 |
-+ if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) |
2693 |
-+ set(CLAPACK_FOUND TRUE) |
2694 |
-+ endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) |
2695 |
-+ |
2696 |
-+ if(NOT CLAPACK_FOUND) |
2697 |
-+ message(STATUS "Could NOT find any working clapack installation") |
2698 |
-+ endif(NOT CLAPACK_FOUND) |
2699 |
-+ |
2700 |
-+ mark_as_advanced(CLAPACK_INCLUDE_DIR CLAPACK_LIBRARY) |
2701 |
-+endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY) |
2702 |
-diff -r -u -N digikam-1.5.0-1-docs/cmake/modules/FindPGF.cmake digikam-1.5.0/cmake/modules/FindPGF.cmake |
2703 |
---- digikam-1.5.0-1-docs/cmake/modules/FindPGF.cmake 1970-01-01 01:00:00.000000000 +0100 |
2704 |
-+++ digikam-1.5.0/cmake/modules/FindPGF.cmake 2010-10-15 23:05:52.000000000 +0200 |
2705 |
-@@ -0,0 +1,15 @@ |
2706 |
-+# - Try to find libpgf |
2707 |
-+# Once done this will define |
2708 |
-+# |
2709 |
-+# PGF_FOUND - system has libgf |
2710 |
-+# PGF_INCLUDE_DIRS - the libpgf include directory |
2711 |
-+# PGF_LIBRARIES - Link these to use libpgf |
2712 |
-+ |
2713 |
-+# PKG-CONFIG is required. |
2714 |
-+INCLUDE(FindPkgConfig REQUIRED) |
2715 |
-+ |
2716 |
-+IF(PKG_CONFIG_FOUND) |
2717 |
-+ INCLUDE(FindPkgConfig) |
2718 |
-+ |
2719 |
-+ PKG_CHECK_MODULES(PGF libpgf) |
2720 |
-+ENDIF(PKG_CONFIG_FOUND) |
2721 |
-diff -r -u -N digikam-1.5.0-1-docs/digikam/CMakeLists.txt digikam-1.5.0/digikam/CMakeLists.txt |
2722 |
---- digikam-1.5.0-1-docs/digikam/CMakeLists.txt 2010-10-10 21:37:09.000000000 +0200 |
2723 |
-+++ digikam-1.5.0/digikam/CMakeLists.txt 2010-10-15 23:06:08.000000000 +0200 |
2724 |
-@@ -53,8 +53,6 @@ |
2725 |
- # specific libs and utilities |
2726 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof |
2727 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2 |
2728 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf |
2729 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack |
2730 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg |
2731 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine |
2732 |
- ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/kipiiface |
2733 |
-@@ -94,13 +92,29 @@ |
2734 |
- ${TIFF_INCLUDE_DIR} |
2735 |
- ) |
2736 |
- |
2737 |
--# Shared libdigikamcore ################################################################ |
2738 |
-+IF(PGF_FOUND) |
2739 |
-+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) |
2740 |
-+ELSE(PGF_FOUND) |
2741 |
-+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf) |
2742 |
-+ENDIF(PGF_FOUND) |
2743 |
-+ |
2744 |
-+IF(CLAPACK_FOUND) |
2745 |
-+ INCLUDE_DIRECTORIES(${CLAPACK_INCLUDE_DIR}) |
2746 |
-+ELSE(CLAPACK_FOUND) |
2747 |
-+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack) |
2748 |
-+ENDIF(CLAPACK_FOUND) |
2749 |
- |
2750 |
--# Disable Clapack C code warnings. |
2751 |
--SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
2752 |
-+# Shared libdigikamcore ################################################################ |
2753 |
- |
2754 |
--# Disable libpgf warnings. |
2755 |
--SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
2756 |
-+IF(NOT CLAPACK_FOUND) |
2757 |
-+ # Disable Clapack C code warnings. |
2758 |
-+ SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
2759 |
-+ENDIF(NOT CLAPACK_FOUND) |
2760 |
-+ |
2761 |
-+IF(NOT PGF_FOUND) |
2762 |
-+ # Disable libpgf warnings. |
2763 |
-+ SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
2764 |
-+ENDIF(NOT PGF_FOUND) |
2765 |
- |
2766 |
- # Disable liblqr C code warnings. |
2767 |
- SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w") |
2768 |
-@@ -187,10 +201,18 @@ |
2769 |
- ${KIPI_LIBRARIES} |
2770 |
- ) |
2771 |
- |
2772 |
-+IF(PGF_FOUND) |
2773 |
-+ TARGET_LINK_LIBRARIES(digikamcore ${PGF_LIBRARIES}) |
2774 |
-+ENDIF(PGF_FOUND) |
2775 |
-+ |
2776 |
- IF(MARBLEWIDGET_FOUND) |
2777 |
- TARGET_LINK_LIBRARIES(digikamcore ${LIBMARBLEWIDGET_LIBRARY}) |
2778 |
- ENDIF(MARBLEWIDGET_FOUND) |
2779 |
- |
2780 |
-+IF(CLAPACK_FOUND) |
2781 |
-+ TARGET_LINK_LIBRARIES(digikamcore ${CLAPACK_LIBRARY}) |
2782 |
-+ENDIF(CLAPACK_FOUND) |
2783 |
-+ |
2784 |
- IF(Q_WS_X11) |
2785 |
- TARGET_LINK_LIBRARIES(digikamcore ${X11_LIBRARIES}) |
2786 |
- ENDIF(Q_WS_X11) |
2787 |
-@@ -241,6 +263,10 @@ |
2788 |
- ${QT_QTSQL_LIBRARY} |
2789 |
- ) |
2790 |
- |
2791 |
-+IF(PGF_FOUND) |
2792 |
-+ TARGET_LINK_LIBRARIES(digikamdatabase ${PGF_LIBRARIES}) |
2793 |
-+ENDIF(PGF_FOUND) |
2794 |
-+ |
2795 |
- SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 ) |
2796 |
- INSTALL(TARGETS digikamdatabase ${INSTALL_TARGETS_DEFAULT_ARGS} ) |
2797 |
- |
2798 |
-@@ -339,6 +365,10 @@ |
2799 |
- TARGET_LINK_LIBRARIES(digikam ${LIBMARBLEWIDGET_LIBRARY}) |
2800 |
- ENDIF(MARBLEWIDGET_FOUND) |
2801 |
- |
2802 |
-+IF(CLAPACK_FOUND) |
2803 |
-+ TARGET_LINK_LIBRARIES(digikam ${CLAPACK_LIBRARY}) |
2804 |
-+ENDIF(CLAPACK_FOUND) |
2805 |
-+ |
2806 |
- INSTALL(TARGETS digikam ${INSTALL_TARGETS_DEFAULT_ARGS}) |
2807 |
- |
2808 |
- # Others Files to install ####################################################### |
2809 |
-diff -r -u -N digikam-1.5.0-1-docs/libs/CMakeLists.txt digikam-1.5.0/libs/CMakeLists.txt |
2810 |
---- digikam-1.5.0-1-docs/libs/CMakeLists.txt 2010-10-10 21:36:54.000000000 +0200 |
2811 |
-+++ digikam-1.5.0/libs/CMakeLists.txt 2010-10-15 23:05:52.000000000 +0200 |
2812 |
-@@ -21,6 +21,10 @@ |
2813 |
- ${JASPER_INCLUDE_DIR} |
2814 |
- ) |
2815 |
- |
2816 |
-+IF(PGF_FOUND) |
2817 |
-+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) |
2818 |
-+ENDIF(PGF_FOUND) |
2819 |
-+ |
2820 |
- ADD_SUBDIRECTORY( histogram ) |
2821 |
- ADD_SUBDIRECTORY( dmetadata ) |
2822 |
- ADD_SUBDIRECTORY( dimg ) |
2823 |
-diff -r -u -N digikam-1.5.0-1-docs/showfoto/CMakeLists.txt digikam-1.5.0/showfoto/CMakeLists.txt |
2824 |
---- digikam-1.5.0-1-docs/showfoto/CMakeLists.txt 2010-10-10 21:37:10.000000000 +0200 |
2825 |
-+++ digikam-1.5.0/showfoto/CMakeLists.txt 2010-10-15 23:06:09.000000000 +0200 |
2826 |
-@@ -65,6 +65,10 @@ |
2827 |
- |
2828 |
- KDE4_ADD_EXECUTABLE(showfoto ${showfoto_SRCS}) |
2829 |
- |
2830 |
-+IF(CLAPACK_FOUND) |
2831 |
-+ TARGET_LINK_LIBRARIES(showfoto ${CLAPACK_LIBRARY}) |
2832 |
-+ENDIF(CLAPACK_FOUND) |
2833 |
-+ |
2834 |
- TARGET_LINK_LIBRARIES(showfoto |
2835 |
- digikamcore |
2836 |
- ${KEXIV2_LIBRARIES} |
2837 |
|
2838 |
diff --git a/media-gfx/digikam/files/digikam-1.6.0-docs.patch b/media-gfx/digikam/files/digikam-1.6.0-docs.patch |
2839 |
deleted file mode 100644 |
2840 |
index 66376b0..0000000 |
2841 |
--- a/media-gfx/digikam/files/digikam-1.6.0-docs.patch |
2842 |
+++ /dev/null |
2843 |
@@ -1,49 +0,0 @@ |
2844 |
-diff -ru digikam-1.6.0.orig/CMakeLists.txt digikam-1.6.0/CMakeLists.txt |
2845 |
---- digikam-1.6.0.orig/CMakeLists.txt 2010-11-22 18:50:48.000000000 +0100 |
2846 |
-+++ digikam-1.6.0/CMakeLists.txt 2010-11-25 00:16:54.000000000 +0100 |
2847 |
-@@ -1423,7 +1423,14 @@ |
2848 |
- # ================================================================================================== |
2849 |
- # API documentation generation |
2850 |
- |
2851 |
--IF(DOXYGEN_FOUND) |
2852 |
-+# Checks if user ask to build documentation. |
2853 |
-+IF(BUILD_DOC) |
2854 |
-+ |
2855 |
-+ IF(DOXYGEN_FOUND) |
2856 |
-+ |
2857 |
-+ MESSAGE(STATUS "") |
2858 |
-+ MESSAGE(STATUS "API documentation will be installed") |
2859 |
-+ MESSAGE(STATUS "") |
2860 |
- |
2861 |
- SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
2862 |
- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
2863 |
-@@ -1432,8 +1439,27 @@ |
2864 |
- |
2865 |
- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
2866 |
- |
2867 |
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
2868 |
-+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
2869 |
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
2870 |
--ENDIF(DOXYGEN_FOUND) |
2871 |
-+ |
2872 |
-+ ELSE(DOXYGEN_FOUND) |
2873 |
-+ |
2874 |
-+ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found") |
2875 |
-+ |
2876 |
-+ ENDIF(DOXYGEN_FOUND) |
2877 |
-+ |
2878 |
-+ELSE(BUILD_DOC) |
2879 |
-+ |
2880 |
-+ MESSAGE(STATUS "") |
2881 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
2882 |
-+ MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake") |
2883 |
-+ MESSAGE(STATUS "") |
2884 |
-+ |
2885 |
-+ENDIF(BUILD_DOC) |
2886 |
-+ |
2887 |
-+ |
2888 |
- include(MacroOptionalAddSubdirectory) |
2889 |
- macro_optional_add_subdirectory( po ) |
2890 |
-+ |
2891 |
-+# Build the handbook |
2892 |
-+add_subdirectory( doc ) |
2893 |
|
2894 |
diff --git a/media-gfx/digikam/files/digikam-1.7.0-docs.patch b/media-gfx/digikam/files/digikam-1.7.0-docs.patch |
2895 |
deleted file mode 100644 |
2896 |
index 4d4edea..0000000 |
2897 |
--- a/media-gfx/digikam/files/digikam-1.7.0-docs.patch |
2898 |
+++ /dev/null |
2899 |
@@ -1,49 +0,0 @@ |
2900 |
-diff -ruN digikam-1.7.0.orig/CMakeLists.txt digikam-1.7.0/CMakeLists.txt |
2901 |
---- digikam-1.7.0.orig/CMakeLists.txt 2010-12-19 11:31:26.000000000 +0100 |
2902 |
-+++ digikam-1.7.0/CMakeLists.txt 2010-12-26 18:57:13.000000000 +0100 |
2903 |
-@@ -1423,8 +1423,15 @@ |
2904 |
- # ================================================================================================== |
2905 |
- # API documentation generation |
2906 |
- |
2907 |
-+# Checks if user ask to build documentation. |
2908 |
-+IF(BUILD_DOC) |
2909 |
-+ |
2910 |
- IF(DOXYGEN_FOUND) |
2911 |
- |
2912 |
-+ MESSAGE(STATUS "") |
2913 |
-+ MESSAGE(STATUS "API documentation will be installed") |
2914 |
-+ MESSAGE(STATUS "") |
2915 |
-+ |
2916 |
- SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
2917 |
- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
2918 |
- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
2919 |
-@@ -1432,9 +1439,28 @@ |
2920 |
- |
2921 |
- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
2922 |
- |
2923 |
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
2924 |
-+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
2925 |
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
2926 |
-+ |
2927 |
-+ELSE(DOXYGEN_FOUND) |
2928 |
-+ |
2929 |
-+ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found") |
2930 |
-+ |
2931 |
- ENDIF(DOXYGEN_FOUND) |
2932 |
-+ |
2933 |
-+ELSE(BUILD_DOC) |
2934 |
-+ |
2935 |
-+ MESSAGE(STATUS "") |
2936 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
2937 |
-+ MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake") |
2938 |
-+ MESSAGE(STATUS "") |
2939 |
-+ |
2940 |
-+ENDIF(BUILD_DOC) |
2941 |
-+ |
2942 |
- find_package(Msgfmt REQUIRED) |
2943 |
- find_package(Gettext REQUIRED) |
2944 |
- add_subdirectory( po ) |
2945 |
-+ |
2946 |
-+# Build the handbook |
2947 |
-+add_subdirectory( doc ) |
2948 |
-+ |
2949 |
|
2950 |
diff --git a/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch b/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch |
2951 |
deleted file mode 100644 |
2952 |
index d958102..0000000 |
2953 |
--- a/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch |
2954 |
+++ /dev/null |
2955 |
@@ -1,15 +0,0 @@ |
2956 |
---- trunk/extragear/graphics/digikam/libs/threads/dynamicthread.cpp 2011/02/06 10:48:24 1219102 |
2957 |
-+++ trunk/extragear/graphics/digikam/libs/threads/dynamicthread.cpp 2011/02/06 11:02:50 1219103 |
2958 |
-@@ -257,6 +257,12 @@ |
2959 |
- kDebug() << "Transition to Running: Invalid Inactive state" << q; |
2960 |
- return false; |
2961 |
- } |
2962 |
-+ default: |
2963 |
-+ { |
2964 |
-+ kDebug() << "libs/threads/dynanamicthread.cpp : Should never reach here: assert?" << q; |
2965 |
-+ return false; |
2966 |
-+ } |
2967 |
-+ |
2968 |
- } |
2969 |
- } |
2970 |
- |
2971 |
|
2972 |
diff --git a/media-gfx/digikam/files/digikam-1.8.0-tests.patch b/media-gfx/digikam/files/digikam-1.8.0-tests.patch |
2973 |
deleted file mode 100644 |
2974 |
index ce03d2e..0000000 |
2975 |
--- a/media-gfx/digikam/files/digikam-1.8.0-tests.patch |
2976 |
+++ /dev/null |
2977 |
@@ -1,15 +0,0 @@ |
2978 |
-diff -ruN digikam-1.8.0.orig/tests/CMakeLists.txt digikam-1.8.0/tests/CMakeLists.txt |
2979 |
---- digikam-1.8.0.orig/tests/CMakeLists.txt 2011-01-23 20:24:49.000000000 +0100 |
2980 |
-+++ digikam-1.8.0/tests/CMakeLists.txt 2011-01-28 19:56:04.000000000 +0100 |
2981 |
-@@ -176,9 +176,9 @@ |
2982 |
- |
2983 |
- SET(qtpgftest_SRCS qtpgftest.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) |
2984 |
- KDE4_ADD_EXECUTABLE(qtpgftest NOGUI ${qtpgftest_SRCS}) |
2985 |
--TARGET_LINK_LIBRARIES(qtpgftest ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) |
2986 |
-+TARGET_LINK_LIBRARIES(qtpgftest ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PGF_LIBRARIES}) |
2987 |
- |
2988 |
- SET(pgfscaled_SRCS pgfscaled.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) |
2989 |
- KDE4_ADD_EXECUTABLE(pgfscaled NOGUI ${pgfscaled_SRCS}) |
2990 |
--TARGET_LINK_LIBRARIES(pgfscaled ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) |
2991 |
-+TARGET_LINK_LIBRARIES(pgfscaled ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PGF_LIBRARIES}) |
2992 |
- |
2993 |
|
2994 |
diff --git a/media-gfx/digikam/files/digikam-1.9.0-docs.patch b/media-gfx/digikam/files/digikam-1.9.0-docs.patch |
2995 |
deleted file mode 100644 |
2996 |
index 588cfb9..0000000 |
2997 |
--- a/media-gfx/digikam/files/digikam-1.9.0-docs.patch |
2998 |
+++ /dev/null |
2999 |
@@ -1,50 +0,0 @@ |
3000 |
-diff -ruN digikam-1.9.0-vanilla/CMakeLists.txt digikam-1.9.0/CMakeLists.txt |
3001 |
---- digikam-1.9.0-vanilla/CMakeLists.txt 2011-02-27 21:16:18.000000000 +0100 |
3002 |
-+++ digikam-1.9.0/CMakeLists.txt 2011-02-28 18:56:39.000000000 +0100 |
3003 |
-@@ -1421,8 +1421,15 @@ |
3004 |
- # ================================================================================================== |
3005 |
- # API documentation generation |
3006 |
- |
3007 |
-+# Checks if user ask to build documentation. |
3008 |
-+IF(BUILD_DOC) |
3009 |
-+ |
3010 |
- IF(DOXYGEN_FOUND) |
3011 |
- |
3012 |
-+ MESSAGE(STATUS "") |
3013 |
-+ MESSAGE(STATUS "API documentation will be installed") |
3014 |
-+ MESSAGE(STATUS "") |
3015 |
-+ |
3016 |
- SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
3017 |
- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
3018 |
- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
3019 |
-@@ -1430,10 +1437,29 @@ |
3020 |
- |
3021 |
- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
3022 |
- |
3023 |
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
3024 |
-+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
3025 |
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
3026 |
-+ |
3027 |
-+ELSE(DOXYGEN_FOUND) |
3028 |
-+ |
3029 |
-+ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found") |
3030 |
-+ |
3031 |
- ENDIF(DOXYGEN_FOUND) |
3032 |
-+ |
3033 |
-+ELSE(BUILD_DOC) |
3034 |
-+ |
3035 |
-+ MESSAGE(STATUS "") |
3036 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
3037 |
-+ MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake") |
3038 |
-+ MESSAGE(STATUS "") |
3039 |
-+ |
3040 |
-+ENDIF(BUILD_DOC) |
3041 |
-+ |
3042 |
- find_package(Msgfmt REQUIRED) |
3043 |
- find_package(Gettext REQUIRED) |
3044 |
- add_subdirectory( po ) |
3045 |
- |
3046 |
-+# Build the handbook |
3047 |
-+add_subdirectory( doc ) |
3048 |
-+ |
3049 |
-+ |
3050 |
|
3051 |
diff --git a/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch b/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch |
3052 |
deleted file mode 100644 |
3053 |
index ed5c1bd..0000000 |
3054 |
--- a/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch |
3055 |
+++ /dev/null |
3056 |
@@ -1,92 +0,0 @@ |
3057 |
-diff -ruN digikam-1.9.0.prepared/cmake/modules/FindPGF.cmake digikam-1.9.0/cmake/modules/FindPGF.cmake |
3058 |
---- digikam-1.9.0.prepared/cmake/modules/FindPGF.cmake 2011-02-27 19:58:23.000000000 +0100 |
3059 |
-+++ digikam-1.9.0/cmake/modules/FindPGF.cmake 2011-07-05 12:03:41.000000000 +0200 |
3060 |
-@@ -1,9 +1,10 @@ |
3061 |
- # - Try to find libpgf |
3062 |
- # Once done this will define |
3063 |
- # |
3064 |
--# PGF_FOUND - system has libgf |
3065 |
--# PGF_INCLUDE_DIRS - the libpgf include directory |
3066 |
--# PGF_LIBRARIES - Link these to use libpgf |
3067 |
-+# PGF_FOUND - system has libgf |
3068 |
-+# PGF_INCLUDE_DIRS - the libpgf include directory |
3069 |
-+# PGF_LIBRARIES - Link these to use libpgf |
3070 |
-+# PGF_CODEC_VERSION_ID - PGF codec version ID. |
3071 |
- |
3072 |
- # PKG-CONFIG is required. |
3073 |
- INCLUDE(FindPkgConfig REQUIRED) |
3074 |
-@@ -12,4 +13,15 @@ |
3075 |
- INCLUDE(FindPkgConfig) |
3076 |
- |
3077 |
- PKG_CHECK_MODULES(PGF libpgf) |
3078 |
-+ |
3079 |
-+ MESSAGE(STATUS "PGF_INCLUDE_DIRS = ${PGF_INCLUDE_DIRS}") |
3080 |
-+ MESSAGE(STATUS "PGF_INCLUDEDIR = ${PGF_INCLUDEDIR}") |
3081 |
-+ MESSAGE(STATUS "PGF_LIBRARIES = ${PGF_LIBRARIES}") |
3082 |
-+ MESSAGE(STATUS "PGF_LDFLAGS = ${PGF_LDFLAGS}") |
3083 |
-+ MESSAGE(STATUS "PGF_CFLAGS = ${PGF_CFLAGS}") |
3084 |
-+ MESSAGE(STATUS "PGF_VERSION = ${PGF_VERSION}") |
3085 |
-+ |
3086 |
-+ STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}") |
3087 |
-+ MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}") |
3088 |
-+ |
3089 |
- ENDIF(PKG_CONFIG_FOUND) |
3090 |
-diff -ruN digikam-1.9.0.prepared/config-digikam.h.cmake digikam-1.9.0/config-digikam.h.cmake |
3091 |
---- digikam-1.9.0.prepared/config-digikam.h.cmake 2011-02-27 19:58:07.000000000 +0100 |
3092 |
-+++ digikam-1.9.0/config-digikam.h.cmake 2011-07-05 12:05:59.000000000 +0200 |
3093 |
-@@ -54,6 +54,8 @@ |
3094 |
- /* Define to 1 if you have Nepomuk shared libraries installed */ |
3095 |
- #cmakedefine HAVE_NEPOMUK 1 |
3096 |
- |
3097 |
-+#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID} |
3098 |
-+ |
3099 |
- #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}" |
3100 |
- |
3101 |
- #endif /* CONFIG_DIGIKAM_H */ |
3102 |
-diff -ruN digikam-1.9.0.prepared/libs/dimg/loaders/pgfloader.cpp digikam-1.9.0/libs/dimg/loaders/pgfloader.cpp |
3103 |
---- digikam-1.9.0.prepared/libs/dimg/loaders/pgfloader.cpp 2011-02-27 19:58:08.000000000 +0100 |
3104 |
-+++ digikam-1.9.0/libs/dimg/loaders/pgfloader.cpp 2011-07-05 12:22:56.000000000 +0200 |
3105 |
-@@ -29,6 +29,7 @@ |
3106 |
- //#define ENABLE_DEBUG_MESSAGES |
3107 |
- |
3108 |
- #include "pgfloader.h" |
3109 |
-+#include "config-digikam.h" |
3110 |
- |
3111 |
- // C Ansi includes |
3112 |
- |
3113 |
-@@ -435,7 +436,11 @@ |
3114 |
- CallbackForLibPGF, this); |
3115 |
- |
3116 |
- UINT32 nWrittenBytes = 0; |
3117 |
-+#if PGFCodecVersionID >= 0x061124 |
3118 |
-+ pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this); |
3119 |
-+#else |
3120 |
- pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this); |
3121 |
-+#endif |
3122 |
- |
3123 |
- #ifdef ENABLE_DEBUG_MESSAGES |
3124 |
- kDebug() << "PGF width = " << header.width; |
3125 |
-diff -ruN digikam-1.9.0.prepared/libs/threadimageio/pgfutils.cpp digikam-1.9.0/libs/threadimageio/pgfutils.cpp |
3126 |
---- digikam-1.9.0.prepared/libs/threadimageio/pgfutils.cpp 2011-02-27 19:58:07.000000000 +0100 |
3127 |
-+++ digikam-1.9.0/libs/threadimageio/pgfutils.cpp 2011-07-05 12:19:15.000000000 +0200 |
3128 |
-@@ -46,6 +46,7 @@ |
3129 |
- // LibPGF includes |
3130 |
- |
3131 |
- #include "PGFimage.h" |
3132 |
-+#include "config-digikam.h" |
3133 |
- |
3134 |
- namespace Digikam |
3135 |
- { |
3136 |
-@@ -136,7 +137,12 @@ |
3137 |
- // TODO : optimize memory allocation... |
3138 |
- CPGFMemoryStream stream(256000); |
3139 |
- UINT32 nWrittenBytes = 0; |
3140 |
-+ |
3141 |
-+#if PGFCodecVersionID >= 0x061124 |
3142 |
-+ pgfImg.Write(&stream, &nWrittenBytes); |
3143 |
-+#else |
3144 |
- pgfImg.Write(&stream, 0, NULL, &nWrittenBytes); |
3145 |
-+#endif |
3146 |
- |
3147 |
- data = QByteArray((const char*)stream.GetBuffer(), nWrittenBytes); |
3148 |
- } |
3149 |
|
3150 |
diff --git a/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch b/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch |
3151 |
deleted file mode 100644 |
3152 |
index 50dec54..0000000 |
3153 |
--- a/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch |
3154 |
+++ /dev/null |
3155 |
@@ -1,60 +0,0 @@ |
3156 |
---- digikam-1.9.0-vanilla/CMakeLists.txt 2011-02-28 02:16:18.000000000 +0600 |
3157 |
-+++ digikam-1.9.0-vanilla/CMakeLists.txt 2011-05-09 19:45:02.000000000 +0700 |
3158 |
-@@ -2,6 +2,7 @@ |
3159 |
- |
3160 |
- OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=OFF)" OFF) |
3161 |
- OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON) |
3162 |
-+OPTION(ENABLE_MYSQL "Build digiKam with MySQL database support (default=ON)" ON) |
3163 |
- |
3164 |
- # ================================================================================================== |
3165 |
- # Information to update before to release this package. |
3166 |
-@@ -189,20 +190,22 @@ |
3167 |
- SET(KEXIV2_FOR_DIGIKAM TRUE) |
3168 |
- ENDIF(NOT WIN32) |
3169 |
- |
3170 |
-+IF (ENABLE_MYSQL) |
3171 |
- # Check MySQL executables |
3172 |
--FIND_PROGRAM( SERVERCMD_MYSQL mysqld |
3173 |
-- PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/local/libexec |
3174 |
-- /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin ${MYSQLD_PATH} |
3175 |
-- ENV MYSQLD_PATH ) |
3176 |
--MESSAGE(STATUS "Found MySQL server executable at: ${SERVERCMD_MYSQL}") |
3177 |
-+ FIND_PROGRAM( SERVERCMD_MYSQL mysqld |
3178 |
-+ PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/local/libexec |
3179 |
-+ /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin ${MYSQLD_PATH} |
3180 |
-+ ENV MYSQLD_PATH ) |
3181 |
-+ MESSAGE(STATUS "Found MySQL server executable at: ${SERVERCMD_MYSQL}") |
3182 |
- |
3183 |
- # NOTE: under windows, mysql_install_db PERL script is named "mysql_install_db.pl" |
3184 |
- # under MACOS-X, through macports project, mysql_install_db PERL script is named "mysql_install_db5" |
3185 |
--FIND_PROGRAM( INITCMD_MYSQL mysql_install_db mysql_install_db5 mysql_install_db.pl |
3186 |
-- PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec |
3187 |
-- /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin ${MYSQL_TOOLS_PATH} |
3188 |
-- ENV MYSQL_TOOLS_PATH ) |
3189 |
--MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}") |
3190 |
-+ FIND_PROGRAM( INITCMD_MYSQL mysql_install_db mysql_install_db5 mysql_install_db.pl |
3191 |
-+ PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec |
3192 |
-+ /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin ${MYSQL_TOOLS_PATH} |
3193 |
-+ ENV MYSQL_TOOLS_PATH ) |
3194 |
-+ MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}") |
3195 |
-+ENDIF (ENABLE_MYSQL) |
3196 |
- |
3197 |
- # ================================================================================================== |
3198 |
- # Optional dependencies |
3199 |
-@@ -274,10 +277,12 @@ |
3200 |
- MESSAGE(STATUS "") |
3201 |
- |
3202 |
- PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND) |
3203 |
--PRINT_EXECUTABLE_STATUS("MySQL Server" mysqld MYSQLD_PATH SERVERCMD_MYSQL) |
3204 |
--IF (NOT WIN32) |
3205 |
-- PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MYSQL_TOOLS_PATH INITCMD_MYSQL) |
3206 |
--ENDIF (NOT WIN32) |
3207 |
-+IF (ENABLE_MYSQL) |
3208 |
-+ PRINT_EXECUTABLE_STATUS("MySQL Server" mysqld MYSQLD_PATH SERVERCMD_MYSQL) |
3209 |
-+ IF (NOT WIN32) |
3210 |
-+ PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MYSQL_TOOLS_PATH INITCMD_MYSQL) |
3211 |
-+ ENDIF (NOT WIN32) |
3212 |
-+ENDIF (ENABLE_MYSQL) |
3213 |
- PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND) |
3214 |
- PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND) |
3215 |
- PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND) |
3216 |
|
3217 |
diff --git a/media-gfx/digikam/files/digikam-1.9.0-turbo.patch b/media-gfx/digikam/files/digikam-1.9.0-turbo.patch |
3218 |
deleted file mode 100644 |
3219 |
index bd10552..0000000 |
3220 |
--- a/media-gfx/digikam/files/digikam-1.9.0-turbo.patch |
3221 |
+++ /dev/null |
3222 |
@@ -1,56 +0,0 @@ |
3223 |
-From 1ad9ae102ea1a82a72e31401fe840954a791219f Mon Sep 17 00:00:00 2001 |
3224 |
-From: Riccardo Iaconelli <riccardo@×××.org> |
3225 |
-Date: Sun, 15 May 2011 16:18:44 +0200 |
3226 |
-Subject: [PATCH] Don't fail CMake check: compile with libjpeg-turbo |
3227 |
- |
3228 |
-Patch by Rex Dieter |
3229 |
- |
3230 |
-BUG: 265431 |
3231 |
- |
3232 |
-Signed-off-by: Riccardo Iaconelli <riccardo@×××.org> |
3233 |
---- |
3234 |
- CMakeLists.txt | 28 +++++++++++++++++----------- |
3235 |
- 1 files changed, 17 insertions(+), 11 deletions(-) |
3236 |
- |
3237 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
3238 |
-index 43293ef..63402e9 100644 |
3239 |
---- a/CMakeLists.txt |
3240 |
-+++ b/CMakeLists.txt |
3241 |
-@@ -166,17 +166,23 @@ ELSE(NOT APPLE) |
3242 |
- SET(CLAPACK_FOUND FALSE) |
3243 |
- ENDIF(NOT APPLE) |
3244 |
- |
3245 |
--# Extract version of libjpeg so that we can use the appropriate dir |
3246 |
--# See bug #227313, #228483 |
3247 |
--FILE(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content) |
3248 |
--STRING(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}") |
3249 |
--MESSAGE(STATUS "Identified libjpeg version: ${jpeglib_version}") |
3250 |
-- |
3251 |
--IF ("${jpeglib_version}" LESS 80) |
3252 |
-- SET(DIGIKAM_LIBJPEG_DIR libjpeg-62) |
3253 |
--ELSE ("${jpeglib_version}" LESS 80) |
3254 |
-- SET(DIGIKAM_LIBJPEG_DIR libjpeg-80) |
3255 |
--ENDIF ("${jpeglib_version}" LESS 80) |
3256 |
-+# check version of libjpeg so that we can use the appropriate dir |
3257 |
-+# See bug #227313 |
3258 |
-+set(_jpeglib_version_source "#include <stddef.h>\n#include<stdio.h>\n#include <jpeglib.h>\n int main()\n {\n #if (JPEG_LIB_VERSION >= 80) \n #error JPEG_LIB_VERSION >= 80 found \n #endif \n }\n") |
3259 |
-+set(_jpeglib_version_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/cmake_jpeglib_version_check.cpp) |
3260 |
-+file(WRITE "${_jpeglib_version_source_file}" "${_jpeglib_version_source}") |
3261 |
-+set(_jpeglib_version_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${JPEG_INCLUDE_DIR}") |
3262 |
-+ |
3263 |
-+try_compile(_jpeglib_version_compile_result ${CMAKE_BINARY_DIR} ${_jpeglib_version_source_file} CMAKE_FLAGS "${_jpeglib_version_include_dirs}" COMPILE_OUTPUT_VARIABLE _jpeglib_version_compile_output_var) |
3264 |
-+ |
3265 |
-+if(_jpeglib_version_compile_result) |
3266 |
-+MESSAGE(STATUS "Identified libjpeg version: 62") |
3267 |
-+set(DIGIKAM_LIBJPEG_DIR libjpeg-62) |
3268 |
-+else(_jpeglib_version_compile_result) |
3269 |
-+MESSAGE(STATUS "Identified libjpeg version: 80+") |
3270 |
-+set(DIGIKAM_LIBJPEG_DIR libjpeg-80) |
3271 |
-+endif(_jpeglib_version_compile_result) |
3272 |
-+ |
3273 |
- |
3274 |
- IF (ENABLE_INTERNALMYSQL) |
3275 |
- # Check MySQL executables |
3276 |
--- |
3277 |
-1.7.3.4 |
3278 |
- |
3279 |
|
3280 |
diff --git a/media-gfx/digikam/files/digikam-2.0.0_beta1-docs.patch b/media-gfx/digikam/files/digikam-2.0.0_beta1-docs.patch |
3281 |
deleted file mode 100644 |
3282 |
index 991f35f..0000000 |
3283 |
--- a/media-gfx/digikam/files/digikam-2.0.0_beta1-docs.patch |
3284 |
+++ /dev/null |
3285 |
@@ -1,41 +0,0 @@ |
3286 |
-diff -ruN digikam-2.0.0-beta1.orig/core/CMakeLists.txt digikam-2.0.0-beta1/core/CMakeLists.txt |
3287 |
---- digikam-2.0.0-beta1.orig/core/CMakeLists.txt 2011-01-03 15:05:12.000000000 +0100 |
3288 |
-+++ digikam-2.0.0-beta1/core/CMakeLists.txt 2011-01-30 17:39:44.000000000 +0100 |
3289 |
-@@ -1488,8 +1488,15 @@ |
3290 |
- # ================================================================================================== |
3291 |
- # API documentation generation |
3292 |
- |
3293 |
-+# Checks if user ask to build documentation. |
3294 |
-+IF(BUILD_DOC) |
3295 |
-+ |
3296 |
- IF(DOXYGEN_FOUND) |
3297 |
- |
3298 |
-+ MESSAGE(STATUS "") |
3299 |
-+ MESSAGE(STATUS "API documentation will be installed") |
3300 |
-+ MESSAGE(STATUS "") |
3301 |
-+ |
3302 |
- SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
3303 |
- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
3304 |
- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
3305 |
-@@ -1497,6 +1504,20 @@ |
3306 |
- |
3307 |
- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
3308 |
- |
3309 |
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
3310 |
-+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
3311 |
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
3312 |
-+ |
3313 |
-+ELSE(DOXYGEN_FOUND) |
3314 |
-+ |
3315 |
-+ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found") |
3316 |
-+ |
3317 |
- ENDIF(DOXYGEN_FOUND) |
3318 |
-+ |
3319 |
-+ELSE(BUILD_DOC) |
3320 |
-+ |
3321 |
-+ MESSAGE(STATUS "") |
3322 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
3323 |
-+ MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake") |
3324 |
-+ MESSAGE(STATUS "") |
3325 |
-+ |
3326 |
-+ENDIF(BUILD_DOC) |
3327 |
|
3328 |
diff --git a/media-gfx/digikam/files/digikam-2.0.0_beta4-docs.patch b/media-gfx/digikam/files/digikam-2.0.0_beta4-docs.patch |
3329 |
deleted file mode 100644 |
3330 |
index 4abadd6..0000000 |
3331 |
--- a/media-gfx/digikam/files/digikam-2.0.0_beta4-docs.patch |
3332 |
+++ /dev/null |
3333 |
@@ -1,41 +0,0 @@ |
3334 |
-diff -ruN digikam-2.0.0-beta4.orig/core/CMakeLists.txt digikam-2.0.0-beta4/core/CMakeLists.txt |
3335 |
---- digikam-2.0.0-beta4.orig/core/CMakeLists.txt 2011-03-28 10:54:32.000000000 +0200 |
3336 |
-+++ digikam-2.0.0-beta4/core/CMakeLists.txt 2011-04-02 00:51:08.000000000 +0200 |
3337 |
-@@ -1558,8 +1558,15 @@ |
3338 |
- # ================================================================================================== |
3339 |
- # API documentation generation |
3340 |
- |
3341 |
-+# Checks if user ask to build documentation. |
3342 |
-+IF(BUILD_DOC) |
3343 |
-+ |
3344 |
- IF(DOXYGEN_FOUND) |
3345 |
- |
3346 |
-+ MESSAGE(STATUS "") |
3347 |
-+ MESSAGE(STATUS "API documentation will be installed") |
3348 |
-+ MESSAGE(STATUS "") |
3349 |
-+ |
3350 |
- SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
3351 |
- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
3352 |
- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
3353 |
-@@ -1567,6 +1574,20 @@ |
3354 |
- |
3355 |
- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
3356 |
- |
3357 |
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
3358 |
-+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
3359 |
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
3360 |
-+ |
3361 |
-+ELSE(DOXYGEN_FOUND) |
3362 |
-+ |
3363 |
-+ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found") |
3364 |
-+ |
3365 |
- ENDIF(DOXYGEN_FOUND) |
3366 |
-+ |
3367 |
-+ELSE(BUILD_DOC) |
3368 |
-+ |
3369 |
-+ MESSAGE(STATUS "") |
3370 |
-+ MESSAGE(STATUS "Documentation will NOT be installed") |
3371 |
-+ MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake") |
3372 |
-+ MESSAGE(STATUS "") |
3373 |
-+ |
3374 |
-+ENDIF(BUILD_DOC) |
3375 |
|
3376 |
diff --git a/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch b/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch |
3377 |
deleted file mode 100644 |
3378 |
index a5bc184..0000000 |
3379 |
--- a/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch |
3380 |
+++ /dev/null |
3381 |
@@ -1,42 +0,0 @@ |
3382 |
-diff -ruN digikam-2.0.0-beta5.orig/core/CMakeLists.txt digikam-2.0.0-beta5/core/CMakeLists.txt |
3383 |
---- digikam-2.0.0-beta5.orig/core/CMakeLists.txt 2011-05-04 10:52:35.000000000 +0200 |
3384 |
-+++ digikam-2.0.0-beta5/core/CMakeLists.txt 2011-05-11 22:40:30.000000000 +0200 |
3385 |
-@@ -1560,8 +1560,15 @@ |
3386 |
- # ================================================================================================== |
3387 |
- # API documentation generation |
3388 |
- |
3389 |
-+# Checks if user ask to build documentation. |
3390 |
-+IF(BUILD_DOC) |
3391 |
-+ |
3392 |
- IF(DOXYGEN_FOUND) |
3393 |
- |
3394 |
-+ MESSAGE(STATUS "") |
3395 |
-+ MESSAGE(STATUS "API documentation will be installed") |
3396 |
-+ MESSAGE(STATUS "") |
3397 |
-+ |
3398 |
- SET(API_DIR ${CMAKE_BINARY_DIR}/api) |
3399 |
- SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
3400 |
- SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) |
3401 |
-@@ -1569,7 +1576,21 @@ |
3402 |
- |
3403 |
- CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) |
3404 |
- |
3405 |
-- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
3406 |
-+ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} |
3407 |
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) |
3408 |
-+ |
3409 |
-+ELSE(DOXYGEN_FOUND) |
3410 |
-+ |
3411 |
-+ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found") |
3412 |
-+ |
3413 |
- ENDIF(DOXYGEN_FOUND) |
3414 |
- |
3415 |
-+ELSE(BUILD_DOC) |
3416 |
-+ |
3417 |
-+ |
3418 |
-+ MESSAGE(STATUS "") |
3419 |
-+ MESSAGE(STATUS "Documentation will NOT be installed, because") |
3420 |
-+ MESSAGE(STATUS "the option -DBUILD_DOC=ON wasn't passed to cmake") |
3421 |
-+ MESSAGE(STATUS "") |
3422 |
-+ |
3423 |
-+ENDIF(BUILD_DOC) |
3424 |
|
3425 |
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch |
3426 |
deleted file mode 100644 |
3427 |
index 78f7770..0000000 |
3428 |
--- a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch |
3429 |
+++ /dev/null |
3430 |
@@ -1,56 +0,0 @@ |
3431 |
-diff -ruN digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake |
3432 |
---- digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake 2011-06-28 16:38:50.000000000 +0200 |
3433 |
-+++ digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake 2011-07-04 15:32:50.000000000 +0200 |
3434 |
-@@ -1,9 +1,10 @@ |
3435 |
- # - Try to find libpgf |
3436 |
- # Once done this will define |
3437 |
- # |
3438 |
--# PGF_FOUND - system has libgf |
3439 |
--# PGF_INCLUDE_DIRS - the libpgf include directory |
3440 |
--# PGF_LIBRARIES - Link these to use libpgf |
3441 |
-+# PGF_FOUND - system has libgf |
3442 |
-+# PGF_INCLUDE_DIRS - the libpgf include directory |
3443 |
-+# PGF_LIBRARIES - Link these to use libpgf |
3444 |
-+# PGF_CODEC_VERSION_ID - PGF codec version ID. |
3445 |
- |
3446 |
- # PKG-CONFIG is required. |
3447 |
- INCLUDE(FindPkgConfig REQUIRED) |
3448 |
-@@ -12,4 +13,15 @@ |
3449 |
- INCLUDE(FindPkgConfig) |
3450 |
- |
3451 |
- PKG_CHECK_MODULES(PGF libpgf) |
3452 |
-+ |
3453 |
-+ MESSAGE(STATUS "PGF_INCLUDE_DIRS = ${PGF_INCLUDE_DIRS}") |
3454 |
-+ MESSAGE(STATUS "PGF_INCLUDEDIR = ${PGF_INCLUDEDIR}") |
3455 |
-+ MESSAGE(STATUS "PGF_LIBRARIES = ${PGF_LIBRARIES}") |
3456 |
-+ MESSAGE(STATUS "PGF_LDFLAGS = ${PGF_LDFLAGS}") |
3457 |
-+ MESSAGE(STATUS "PGF_CFLAGS = ${PGF_CFLAGS}") |
3458 |
-+ MESSAGE(STATUS "PGF_VERSION = ${PGF_VERSION}") |
3459 |
-+ |
3460 |
-+ STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}") |
3461 |
-+ MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}") |
3462 |
-+ |
3463 |
- ENDIF(PKG_CONFIG_FOUND) |
3464 |
-diff -ruN digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake |
3465 |
---- digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake 2011-06-28 16:38:50.000000000 +0200 |
3466 |
-+++ digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake 2011-07-04 15:29:24.000000000 +0200 |
3467 |
-@@ -57,6 +57,8 @@ |
3468 |
- /* Define to 1 if we know how to start mysqld */ |
3469 |
- #cmakedefine HAVE_INTERNALMYSQL 1 |
3470 |
- |
3471 |
-+#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID} |
3472 |
-+ |
3473 |
- #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}" |
3474 |
- |
3475 |
- /* |
3476 |
-diff -ruN digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp |
3477 |
---- digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp 2011-06-28 16:38:44.000000000 +0200 |
3478 |
-+++ digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp 2011-07-04 15:29:24.000000000 +0200 |
3479 |
-@@ -46,6 +46,7 @@ |
3480 |
- // LibPGF includes |
3481 |
- |
3482 |
- #include "PGFimage.h" |
3483 |
-+#include "config-digikam.h" |
3484 |
- |
3485 |
- namespace Digikam |
3486 |
- { |
3487 |
|
3488 |
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch |
3489 |
deleted file mode 100644 |
3490 |
index 184360d..0000000 |
3491 |
--- a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch |
3492 |
+++ /dev/null |
3493 |
@@ -1,23 +0,0 @@ |
3494 |
-diff -ruN digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp |
3495 |
---- digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp 2011-06-28 16:38:45.000000000 +0200 |
3496 |
-+++ digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp 2011-07-05 13:50:20.036746353 +0200 |
3497 |
-@@ -29,6 +29,7 @@ |
3498 |
- //#define ENABLE_DEBUG_MESSAGES |
3499 |
- |
3500 |
- #include "pgfloader.h" |
3501 |
-+#include "config-digikam.h" |
3502 |
- |
3503 |
- // C Ansi includes |
3504 |
- |
3505 |
-@@ -435,10 +436,8 @@ |
3506 |
- CallbackForLibPGF, this); |
3507 |
- |
3508 |
- UINT32 nWrittenBytes = 0; |
3509 |
--#ifdef PGFCodecVersionID |
3510 |
--# if PGFCodecVersionID >= 0x061124 |
3511 |
-+#if PGFCodecVersionID >= 0x061124 |
3512 |
- pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this); |
3513 |
--# endif |
3514 |
- #else |
3515 |
- pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this); |
3516 |
- #endif |
3517 |
|
3518 |
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch |
3519 |
deleted file mode 100644 |
3520 |
index c60a7e3..0000000 |
3521 |
--- a/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch |
3522 |
+++ /dev/null |
3523 |
@@ -1,26 +0,0 @@ |
3524 |
-commit 1f80f35b68702136ebd3d315fe4baf7d75b3c142 |
3525 |
-Author: Gilles Caulier <caulier.gilles@×××××.com> |
3526 |
-Date: Sun Jul 3 10:57:21 2011 +0200 |
3527 |
- |
3528 |
- compile with libpgf 6.09.44 |
3529 |
- BUGS: 276969 |
3530 |
- |
3531 |
-diff --git a/libs/threadimageio/pgfutils.cpp b/libs/threadimageio/pgfutils.cpp |
3532 |
-index 2b5829f..758f12c 100644 |
3533 |
---- a/libs/threadimageio/pgfutils.cpp |
3534 |
-+++ b/libs/threadimageio/pgfutils.cpp |
3535 |
-@@ -151,7 +151,14 @@ bool writePGFImageData(const QImage& img, QByteArray& data, int quality) |
3536 |
- // TODO : optimize memory allocation... |
3537 |
- CPGFMemoryStream stream(256000); |
3538 |
- UINT32 nWrittenBytes = 0; |
3539 |
-+ |
3540 |
-+#ifdef PGFCodecVersionID |
3541 |
-+# if PGFCodecVersionID >= 0x061124 |
3542 |
- pgfImg.Write(&stream, &nWrittenBytes); |
3543 |
-+# endif |
3544 |
-+#else |
3545 |
-+ pgfImg.Write(&stream, 0, 0, &nWrittenBytes); |
3546 |
-+#endif |
3547 |
- |
3548 |
- data = QByteArray((const char*)stream.GetBuffer(), nWrittenBytes); |
3549 |
- |
3550 |
|
3551 |
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml |
3552 |
deleted file mode 100644 |
3553 |
index 032404f..0000000 |
3554 |
--- a/media-gfx/digikam/metadata.xml |
3555 |
+++ /dev/null |
3556 |
@@ -1,17 +0,0 @@ |
3557 |
-<?xml version="1.0" encoding="UTF-8"?> |
3558 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
3559 |
-<pkgmetadata> |
3560 |
-<herd>kde</herd> |
3561 |
-<maintainer><email>dilfridge@g.o</email></maintainer> |
3562 |
-<use> |
3563 |
- <flag name="addressbook">Add support for kdepim</flag> |
3564 |
- <flag name="geolocation">Add support for marble</flag> |
3565 |
- <flag name="themedesigner">Build the digikam theme designer</flag> |
3566 |
- <flag name="thumbnails">Enable thumbnails database support</flag> |
3567 |
- <flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag> |
3568 |
- <flag name="linguas_ha">Hausa translation</flag> |
3569 |
- <flag name="linguas_mi">Maori translation</flag> |
3570 |
- <flag name="linguas_tt">?? translation</flag> |
3571 |
- <flag name="linguas_ven">Venda translation</flag> |
3572 |
-</use> |
3573 |
-</pkgmetadata> |