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

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 102 insertions, 24 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/Manifest b/media-gfx/digikam/Manifest
index b9ae42e52251..1df85e469f0d 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,30 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c
 AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a931af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af
+AUX digikam-1.9.0-newpgf.patch 3463 RMD160 4e5c506e81436aaafe5b789d79adcb1caee4407b SHA1 3bb97db282fbb0c50e03cd4ba6c5ac6821558620 SHA256 9ca068c87868b9709d75441795bfff2790d13957354b675a9aa94d5f3d55eca8
 AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c
 AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310a2 SHA1 e9383e730b81348656c3482700dec59a3ba5a499 SHA256 765338d842b39622428c068d9e190cf0f97933cd66845fea2ff0b5f79ed7b2cc
 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
-EBUILD digikam-1.9.0-r1.ebuild 3302 RMD160 651bb1cda69238d61bd43ef31aafe9ce98555b99 SHA1 f96691ec4799f822888c42abf28d3b7c2556bace SHA256 31450bcc222db00d0a62dc434e140c46a8f1ab2af15c622461f5957630b5da3a
+EBUILD digikam-1.9.0-r1.ebuild 3347 RMD160 3cdaf055dc0b801a3cd05ce5ebd91a7db10ff819 SHA1 29390bef0da866f1f914ba05e046f15f78297d4e SHA256 2b83becdcae58d502d977afe0551abf24b80365bb42be54144444b969d7342e2
 EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a342974c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75
-MISC ChangeLog 31215 RMD160 82fac76fb1bbd16d8f79fcc150f053a775f38950 SHA1 aef52eee9e74a461777b53b5fe03156085558c43 SHA256 a4cd7e290322e0b02d911ef9de8c2de7011274fd441b541fa3124b2a45abebcf
+MISC ChangeLog 31402 RMD160 e7c0bda3134c1213a330b034eeee989d6ae3d996 SHA1 0d429761f4cf569a82efa97ebb2d0a372be4ff33 SHA256 c68a056565cba76633accee95a6065682845ecf9e5c1e621368a713c2e1d779a
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN7ZIvAAoJELHSF2kinlg4qxAP/14GPQnANih8z8EcQgOuN+No
-n0lPT8ggTV/1EvwyEbi/91wzUO/O1Ed0AskpbjugD9l8vtFYNueHS7WAipRgiqul
-s5x8u5DsUjUa/6RakF7uvuvAK4tgJsSPfQI1axI6LWjl38XEMriou0Y9aIb5buX8
-LvhBm8+ltCY2KZWB4nGJmD29wMt12PNE87oalLO7GtgP2zWCuB59AFm3NxVSVYpK
-I5H7GAUuZA4EzOYM96I/eHinOk7VoIv2Ug3Ryh2ittid7EJl8PeT9sCXpi++7BPA
-XgbSWIBCEzcl0SDyoiWscQW8HKEdYZ3wA8RR2ggCcPk6SbDSiUIWMMN4zcDZx6t+
-NPTyOdyYFurHVa9hfnYKjcsWFdIpiqQ8kzEhk9V11y4Xx7DwpUHCiqKrr7u8p/Ur
-Oua+pPU562HvOuilUo852+NpzcduwIml59hfU5tr9bROL5WeM1EW9PYidGcEhy3X
-riCTipApNhyD1+kHtKyaagY816hQMUmEunRhpszbjq3YHSpG2bM348VRBcGwAYoq
-2hmlE/1dlxwM1oEqryQKHWX7/LTngSeH/j0SW0LqFdwGa52qJR4ysVKHtwuunCgu
-EncHOUHSrBebdMvJxvWLyHg3M26t1qw0gqBaimhOACWi4JnpmQjZfoQhmyfIXYDP
-Gss5ZwtPdgpEdRaVQDCS
-=KAZf
------END PGP SIGNATURE-----
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);
+     }