diff options
| author |   Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2011-07-05 14:03:41 +0200 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2011-07-05 14:03:41 +0200 |
| commit | 8293a0ecdb5bb914757cb151662e7052c57aeefc (patch) | |
| tree | d14f433440dbe60b794f43bdb599e1aa997ba43c /media-gfx | |
| parent | [media-gfx/digikam] Include build fix for new but unbundled libpng (diff) | |
| download | kde-8293a0ecdb5bb914757cb151662e7052c57aeefc.tar.gz kde-8293a0ecdb5bb914757cb151662e7052c57aeefc.tar.bz2 kde-8293a0ecdb5bb914757cb151662e7052c57aeefc.zip | |
[media-gfx/digikam] Additional compile fix for libpgf-6.11.24
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/digikam/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-2.0.0_rc.ebuild | 1 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch | 23 |
3 files changed, 26 insertions, 1 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 383af65816..bc6783d279 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,7 +1,8 @@ AUX digikam-2.0.0_rc-officialpgf.patch 2351 RMD160 a3be56a7377b013bfa2a3539a8bbe7cfc9d3a75d SHA1 883b79dca41f7c624de3a8dc85b02f2dcae363a9 SHA256 bf40b21501bb944993017fcc0f05411e100b88708b1560ddd00e7ca203db3bda +AUX digikam-2.0.0_rc-officialpgf2.patch 824 RMD160 54715604f3ca772253fee111f311028bc6dc9643 SHA1 8d170abfebddbf1d4f146d6c0b568f2a6262466a SHA256 0f3f010da6f7230ef865169db58f8595796354726b5599e975fde42af4fecbd5 AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c DIST digikam-2.0.0-beta6.tar.bz2 43533320 RMD160 eb50febc2ade359f8d92e6673e4f73a6b57b6fa5 SHA1 3ca5356da07d6484ce2299627e9d54acf14e06a2 SHA256 5f81ce581ff8e1148c023b71365928509d497f0bd248f27c925ea3038cea2cea DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 564354c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691 EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75 -EBUILD digikam-2.0.0_rc.ebuild 3311 RMD160 970164e604eb863f38851cfbf815c429a74b11ea SHA1 b36d9e465f17b5f30f5826fc6f4614ad3a22e188 SHA256 9194485f3a2c0b984d89b8580d8f3c45f372be0f300f898bf0d95517b5bcaaf5 +EBUILD digikam-2.0.0_rc.ebuild 3360 RMD160 7148a6acb05d956ee209d77143511914c3703d09 SHA1 2a8d842f8315ef9b4247ae0522508ba183ceb22f SHA256 fc480aec87937847c41edd6902273bc085f912425dd5c72297ed6c7ed928896f MISC metadata.xml 497 RMD160 73141e1fd45de59b199e7c4a2a1622f6c9dac130 SHA1 664d9d8b9b1953e0f6aa3130f61138cbc207a2bf SHA256 1ec09a52e4d5c3a6bd12993b7903663c10f57c8549686189a6a7b5d297bc7d24 diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild index 378d39166c..61faba4d6f 100644 --- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild +++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild @@ -71,6 +71,7 @@ DEPEND="${CDEPEND} PATCHES=( "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" "${FILESDIR}/${PN}-2.0.0_rc-officialpgf.patch" + "${FILESDIR}/${PN}-2.0.0_rc-officialpgf2.patch" ) S="${WORKDIR}/${MY_P}/core" 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 new file mode 100644 index 0000000000..184360d997 --- /dev/null +++ b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch @@ -0,0 +1,23 @@ +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 +--- digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp 2011-06-28 16:38:45.000000000 +0200 ++++ digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp 2011-07-05 13:50:20.036746353 +0200 +@@ -29,6 +29,7 @@ + //#define ENABLE_DEBUG_MESSAGES + + #include "pgfloader.h" ++#include "config-digikam.h" + + // C Ansi includes + +@@ -435,10 +436,8 @@ + CallbackForLibPGF, this); + + UINT32 nWrittenBytes = 0; +-#ifdef PGFCodecVersionID +-# if PGFCodecVersionID >= 0x061124 ++#if PGFCodecVersionID >= 0x061124 + pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this); +-# endif + #else + pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this); + #endif |