| 1 |
commit: 170142f01d9d4b71478dab69c2777f53069d5950 |
| 2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 3 09:25:13 2011 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 3 09:25:13 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=170142f0 |
| 7 |
|
| 8 |
Add build fix for older libpgf |
| 9 |
|
| 10 |
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
media-gfx/digikam/ChangeLog | 4 +++ |
| 14 |
media-gfx/digikam/Manifest | 5 ++- |
| 15 |
media-gfx/digikam/digikam-2.0.0_rc.ebuild | 2 + |
| 16 |
.../digikam/files/digikam-2.0.0_rc-oldpgf.patch | 26 ++++++++++++++++++++ |
| 17 |
4 files changed, 35 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog |
| 20 |
index a6ca443..982e979 100644 |
| 21 |
--- a/media-gfx/digikam/ChangeLog |
| 22 |
+++ b/media-gfx/digikam/ChangeLog |
| 23 |
@@ -2,6 +2,10 @@ |
| 24 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
+ 03 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
| 28 |
+ digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_rc-oldpgf.patch: |
| 29 |
+ Add build fix for older libpgf |
| 30 |
+ |
| 31 |
*digikam-2.0.0_rc (02 Jul 2011) |
| 32 |
|
| 33 |
02 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
| 34 |
|
| 35 |
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest |
| 36 |
index 88551a0..80be244 100644 |
| 37 |
--- a/media-gfx/digikam/Manifest |
| 38 |
+++ b/media-gfx/digikam/Manifest |
| 39 |
@@ -20,6 +20,7 @@ AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310 |
| 40 |
AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c |
| 41 |
AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac |
| 42 |
AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964 |
| 43 |
+AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c |
| 44 |
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa |
| 45 |
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5 |
| 46 |
DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a5303f0473 SHA1 97432e5997f00028c1acff38e2e0a791294c2aaf SHA256 118ea42cebaec6795b89cbb6018bdfa1d0e664eeda9b09ac0fd4083e3969f394 |
| 47 |
@@ -31,6 +32,6 @@ EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b7 |
| 48 |
EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53 |
| 49 |
EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf |
| 50 |
EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75 |
| 51 |
-EBUILD digikam-2.0.0_rc.ebuild 3207 RMD160 1aeaf47f7a6c4980322bd699030b6ec8bd6360bd SHA1 a5cac00b9d468418cf340ed250416dad5d20fee1 SHA256 f529b966f33261732c072060dcbc3767d53de7665e1663440a9b3933bcd64a8f |
| 52 |
-MISC ChangeLog 11004 RMD160 5e9edd169e242504366ee2f45bbe2f0f02d3657f SHA1 eb603e9e4ee3eb507a9520005dd889800809beeb SHA256 3ebb5b184f05fa323b682cac3d35b77a251762d1dc505341555c20b465f04483 |
| 53 |
+EBUILD digikam-2.0.0_rc.ebuild 3262 RMD160 3322eaaab51467d8040ea0defb30054272813f0f SHA1 58ffd139cb2bdfbd8e9ee93b56b68647690148a7 SHA256 e0c4ce7b8b1b6cfb95d9dd87524dd0cf8b5d2a0f702a19809f552ba30c1fe48f |
| 54 |
+MISC ChangeLog 11160 RMD160 b2233957c17b7751ffbaf55559e446565faec4af SHA1 83d381318f2a160e7aa2bdb56cd4ef6e08f07358 SHA256 a8e97992395a60bdc35dc875134e08e867bd66840bed70f68a590cd0aba3859e |
| 55 |
MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80 |
| 56 |
|
| 57 |
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild |
| 58 |
index 8f062fe..2eaba0e 100644 |
| 59 |
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild |
| 60 |
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild |
| 61 |
@@ -68,6 +68,8 @@ DEPEND="${CDEPEND} |
| 62 |
doc? ( app-doc/doxygen ) |
| 63 |
" |
| 64 |
|
| 65 |
+PATCHES=( "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" ) |
| 66 |
+ |
| 67 |
S="${WORKDIR}/${MY_P}/core" |
| 68 |
|
| 69 |
src_prepare() { |
| 70 |
|
| 71 |
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 |
| 72 |
new file mode 100644 |
| 73 |
index 0000000..c60a7e3 |
| 74 |
--- /dev/null |
| 75 |
+++ b/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch |
| 76 |
@@ -0,0 +1,26 @@ |
| 77 |
+commit 1f80f35b68702136ebd3d315fe4baf7d75b3c142 |
| 78 |
+Author: Gilles Caulier <caulier.gilles@×××××.com> |
| 79 |
+Date: Sun Jul 3 10:57:21 2011 +0200 |
| 80 |
+ |
| 81 |
+ compile with libpgf 6.09.44 |
| 82 |
+ BUGS: 276969 |
| 83 |
+ |
| 84 |
+diff --git a/libs/threadimageio/pgfutils.cpp b/libs/threadimageio/pgfutils.cpp |
| 85 |
+index 2b5829f..758f12c 100644 |
| 86 |
+--- a/libs/threadimageio/pgfutils.cpp |
| 87 |
++++ b/libs/threadimageio/pgfutils.cpp |
| 88 |
+@@ -151,7 +151,14 @@ bool writePGFImageData(const QImage& img, QByteArray& data, int quality) |
| 89 |
+ // TODO : optimize memory allocation... |
| 90 |
+ CPGFMemoryStream stream(256000); |
| 91 |
+ UINT32 nWrittenBytes = 0; |
| 92 |
++ |
| 93 |
++#ifdef PGFCodecVersionID |
| 94 |
++# if PGFCodecVersionID >= 0x061124 |
| 95 |
+ pgfImg.Write(&stream, &nWrittenBytes); |
| 96 |
++# endif |
| 97 |
++#else |
| 98 |
++ pgfImg.Write(&stream, 0, 0, &nWrittenBytes); |
| 99 |
++#endif |
| 100 |
+ |
| 101 |
+ data = QByteArray((const char*)stream.GetBuffer(), nWrittenBytes); |
| 102 |
+ |
Archives