Include build fix for media-libs/libpgf-6.11.24, bug 373893

(Portage version: 2.1.10.3/cvs/Linux x86_64)

3 files changed, 99 insertions, 2 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 89364fe69047..f88791b01cd8 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.187 2011/06/07 02:51:20 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.188 2011/07/05 11:39:35 dilfridge Exp $
+
+  05 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-newpgf.patch:
+  Include build fix for media-libs/libpgf-6.11.24, bug 373893
 
   07 Jun 2011; Jonathan Callen <abcd@gentoo.org> digikam-1.9.0.ebuild,
   digikam-1.9.0-r1.ebuild:
diff --git a/media-gfx/digikam/digikam-1.9.0-r1.ebuild b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
index 9f199bf97018..5ef12302cf4c 100644
--- a/media-gfx/digikam/digikam-1.9.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0-r1.ebuild,v 1.4 2011/06/07 02:51:20 abcd Exp $
+# $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 $
 
 EAPI=4
 
@@ -69,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}"-1.8.0-tests.patch
 	"${FILESDIR}/${PN}"-1.9.0-nomysql.patch
 	"${FILESDIR}/${PN}"-1.9.0-turbo.patch
+	"${FILESDIR}/${PN}"-1.9.0-newpgf.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch b/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch
new file mode 100644
index 000000000000..ed5c1bd64c34
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch
@@ -0,0 +1,92 @@
+diff -ruN digikam-1.9.0.prepared/cmake/modules/FindPGF.cmake digikam-1.9.0/cmake/modules/FindPGF.cmake
+--- digikam-1.9.0.prepared/cmake/modules/FindPGF.cmake	2011-02-27 19:58:23.000000000 +0100
++++ digikam-1.9.0/cmake/modules/FindPGF.cmake	2011-07-05 12:03:41.000000000 +0200
+@@ -1,9 +1,10 @@
+ # - Try to find libpgf
+ # Once done this will define
+ #
+-#  PGF_FOUND - system has libgf
+-#  PGF_INCLUDE_DIRS - the libpgf include directory
+-#  PGF_LIBRARIES - Link these to use libpgf
++#  PGF_FOUND            - system has libgf
++#  PGF_INCLUDE_DIRS     - the libpgf include directory
++#  PGF_LIBRARIES        - Link these to use libpgf
++#  PGF_CODEC_VERSION_ID - PGF codec version ID.
+ 
+ # PKG-CONFIG is required.
+ INCLUDE(FindPkgConfig REQUIRED)
+@@ -12,4 +13,15 @@
+ 	INCLUDE(FindPkgConfig)
+ 
+ 	PKG_CHECK_MODULES(PGF libpgf)
++
++	MESSAGE(STATUS "PGF_INCLUDE_DIRS     = ${PGF_INCLUDE_DIRS}")
++	MESSAGE(STATUS "PGF_INCLUDEDIR       = ${PGF_INCLUDEDIR}")
++	MESSAGE(STATUS "PGF_LIBRARIES        = ${PGF_LIBRARIES}")
++	MESSAGE(STATUS "PGF_LDFLAGS          = ${PGF_LDFLAGS}")
++	MESSAGE(STATUS "PGF_CFLAGS           = ${PGF_CFLAGS}")
++	MESSAGE(STATUS "PGF_VERSION          = ${PGF_VERSION}")
++
++	STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}")
++	MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}")
++
+ ENDIF(PKG_CONFIG_FOUND)
+diff -ruN digikam-1.9.0.prepared/config-digikam.h.cmake digikam-1.9.0/config-digikam.h.cmake
+--- digikam-1.9.0.prepared/config-digikam.h.cmake	2011-02-27 19:58:07.000000000 +0100
++++ digikam-1.9.0/config-digikam.h.cmake	2011-07-05 12:05:59.000000000 +0200
+@@ -54,6 +54,8 @@
+ /* Define to 1 if you have Nepomuk shared libraries installed */
+ #cmakedefine HAVE_NEPOMUK 1
+ 
++#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID}
++
+ #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}"
+ 
+ #endif /* CONFIG_DIGIKAM_H */
+diff -ruN digikam-1.9.0.prepared/libs/dimg/loaders/pgfloader.cpp digikam-1.9.0/libs/dimg/loaders/pgfloader.cpp
+--- digikam-1.9.0.prepared/libs/dimg/loaders/pgfloader.cpp	2011-02-27 19:58:08.000000000 +0100
++++ digikam-1.9.0/libs/dimg/loaders/pgfloader.cpp	2011-07-05 12:22:56.000000000 +0200
+@@ -29,6 +29,7 @@
+ //#define ENABLE_DEBUG_MESSAGES
+ 
+ #include "pgfloader.h"
++#include "config-digikam.h"
+ 
+ // C Ansi includes
+ 
+@@ -435,7 +436,11 @@
+                          CallbackForLibPGF, this);
+ 
+         UINT32 nWrittenBytes = 0;
++#if PGFCodecVersionID >= 0x061124
++        pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this);
++#else
+         pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this);
++#endif
+ 
+ #ifdef ENABLE_DEBUG_MESSAGES
+         kDebug() << "PGF width     = " << header.width;
+diff -ruN digikam-1.9.0.prepared/libs/threadimageio/pgfutils.cpp digikam-1.9.0/libs/threadimageio/pgfutils.cpp
+--- digikam-1.9.0.prepared/libs/threadimageio/pgfutils.cpp	2011-02-27 19:58:07.000000000 +0100
++++ digikam-1.9.0/libs/threadimageio/pgfutils.cpp	2011-07-05 12:19:15.000000000 +0200
+@@ -46,6 +46,7 @@
+ // LibPGF includes
+ 
+ #include "PGFimage.h"
++#include "config-digikam.h"
+ 
+ namespace Digikam
+ {
+@@ -136,7 +137,12 @@
+         // TODO : optimize memory allocation...
+         CPGFMemoryStream stream(256000);
+         UINT32 nWrittenBytes = 0;
++
++#if PGFCodecVersionID >= 0x061124
++        pgfImg.Write(&stream, &nWrittenBytes);
++#else
+         pgfImg.Write(&stream, 0, NULL, &nWrittenBytes);
++#endif
+ 
+         data = QByteArray((const char*)stream.GetBuffer(), nWrittenBytes);
+     }