[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/

[Andreas Hüttel]

commit:     8293a0ecdb5bb914757cb151662e7052c57aeefc
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 12:03:41 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 12:03:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8293a0ec

[media-gfx/digikam] Additional compile fix for libpgf-6.11.24

(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)

---
 media-gfx/digikam/digikam-2.0.0_rc.ebuild          |    1 +
 .../files/digikam-2.0.0_rc-officialpgf2.patch      |   23 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
index 378d391..61faba4 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 0000000..184360d
--- /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