| 1 |
commit: 75979529b7886433da99b6b2451853f25d8c7665 |
| 2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 5 12:05:07 2011 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 5 12:05:07 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=75979529 |
| 7 |
|
| 8 |
Additional compile fix for libpgf-6.11.24 |
| 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 | 1 + |
| 16 |
.../files/digikam-2.0.0_rc-officialpgf2.patch | 23 ++++++++++++++++++++ |
| 17 |
4 files changed, 31 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog |
| 20 |
index 0d509d7..2e5d407 100644 |
| 21 |
--- a/media-gfx/digikam/ChangeLog |
| 22 |
+++ b/media-gfx/digikam/ChangeLog |
| 23 |
@@ -3,6 +3,10 @@ |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
05 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
| 27 |
+ digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_rc-officialpgf2.patch: |
| 28 |
+ Additional compile fix for libpgf-6.11.24 |
| 29 |
+ |
| 30 |
+ 05 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
| 31 |
-files/digikam-2.0.0_officialpgf.patch, |
| 32 |
+files/digikam-2.0.0_rc-officialpgf.patch: |
| 33 |
Include build fix for new but unbundled libpgf |
| 34 |
|
| 35 |
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest |
| 36 |
index 207a69c..4a34b5b 100644 |
| 37 |
--- a/media-gfx/digikam/Manifest |
| 38 |
+++ b/media-gfx/digikam/Manifest |
| 39 |
@@ -21,6 +21,7 @@ AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2c |
| 40 |
AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac |
| 41 |
AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964 |
| 42 |
AUX digikam-2.0.0_rc-officialpgf.patch 2351 RMD160 a3be56a7377b013bfa2a3539a8bbe7cfc9d3a75d SHA1 883b79dca41f7c624de3a8dc85b02f2dcae363a9 SHA256 bf40b21501bb944993017fcc0f05411e100b88708b1560ddd00e7ca203db3bda |
| 43 |
+AUX digikam-2.0.0_rc-officialpgf2.patch 824 RMD160 54715604f3ca772253fee111f311028bc6dc9643 SHA1 8d170abfebddbf1d4f146d6c0b568f2a6262466a SHA256 0f3f010da6f7230ef865169db58f8595796354726b5599e975fde42af4fecbd5 |
| 44 |
AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c |
| 45 |
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa |
| 46 |
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5 |
| 47 |
@@ -33,6 +34,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 3311 RMD160 970164e604eb863f38851cfbf815c429a74b11ea SHA1 b36d9e465f17b5f30f5826fc6f4614ad3a22e188 SHA256 9194485f3a2c0b984d89b8580d8f3c45f372be0f300f898bf0d95517b5bcaaf5 |
| 52 |
-MISC ChangeLog 11518 RMD160 a1d900415947305f12f6d271fade081333b3209e SHA1 98fee384b20327b609851aed47182d47da654373 SHA256 b40c02f0b2e954aaecaca0aff57853ec2429d9d8fbeda3634258aa6067bc67ed |
| 53 |
+EBUILD digikam-2.0.0_rc.ebuild 3360 RMD160 7148a6acb05d956ee209d77143511914c3703d09 SHA1 2a8d842f8315ef9b4247ae0522508ba183ceb22f SHA256 fc480aec87937847c41edd6902273bc085f912425dd5c72297ed6c7ed928896f |
| 54 |
+MISC ChangeLog 11691 RMD160 e88fcaf22a616cd874070f46b7fff6a9c6efe19b SHA1 30f7d54168ee21281012d1c39d182b09aabed649 SHA256 f5e5e66b9c6f2ff2f3e9a743a3acc14826e169f3e15bd61deb8ee1a184a265c6 |
| 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 378d391..61faba4 100644 |
| 59 |
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild |
| 60 |
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild |
| 61 |
@@ -71,6 +71,7 @@ DEPEND="${CDEPEND} |
| 62 |
PATCHES=( |
| 63 |
"${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" |
| 64 |
"${FILESDIR}/${PN}-2.0.0_rc-officialpgf.patch" |
| 65 |
+ "${FILESDIR}/${PN}-2.0.0_rc-officialpgf2.patch" |
| 66 |
) |
| 67 |
|
| 68 |
S="${WORKDIR}/${MY_P}/core" |
| 69 |
|
| 70 |
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 |
| 71 |
new file mode 100644 |
| 72 |
index 0000000..184360d |
| 73 |
--- /dev/null |
| 74 |
+++ b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch |
| 75 |
@@ -0,0 +1,23 @@ |
| 76 |
+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 |
| 77 |
+--- digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp 2011-06-28 16:38:45.000000000 +0200 |
| 78 |
++++ digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp 2011-07-05 13:50:20.036746353 +0200 |
| 79 |
+@@ -29,6 +29,7 @@ |
| 80 |
+ //#define ENABLE_DEBUG_MESSAGES |
| 81 |
+ |
| 82 |
+ #include "pgfloader.h" |
| 83 |
++#include "config-digikam.h" |
| 84 |
+ |
| 85 |
+ // C Ansi includes |
| 86 |
+ |
| 87 |
+@@ -435,10 +436,8 @@ |
| 88 |
+ CallbackForLibPGF, this); |
| 89 |
+ |
| 90 |
+ UINT32 nWrittenBytes = 0; |
| 91 |
+-#ifdef PGFCodecVersionID |
| 92 |
+-# if PGFCodecVersionID >= 0x061124 |
| 93 |
++#if PGFCodecVersionID >= 0x061124 |
| 94 |
+ pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this); |
| 95 |
+-# endif |
| 96 |
+ #else |
| 97 |
+ pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this); |
| 98 |
+ #endif |
Archives