Add build fix for offical new libpgf

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

4 files changed, 82 insertions, 3 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 982e979..e8f4e7a 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_officialpgf.patch:
+  Add build fix for offical new libpgf
+
   03 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_rc-oldpgf.patch:
   Add build fix for older libpgf
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 80be244..460cf2a 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -20,6 +20,7 @@ AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310
 AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
 AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac
 AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964
+AUX digikam-2.0.0_officialpgf.patch 2538 RMD160 5939068015c2923dd0bbbe033ed1eda96d7972ee SHA1 4bcf25368d63bdf06bfa3a8d140832404e874755 SHA256 40f01b857e1bb68545f554ea01e0685fab390bbb3912cb3d233fd70ddef3c60e
 AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c
 DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
@@ -32,6 +33,6 @@ EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b7
 EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
 EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
 EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
-EBUILD digikam-2.0.0_rc.ebuild 3262 RMD160 3322eaaab51467d8040ea0defb30054272813f0f SHA1 58ffd139cb2bdfbd8e9ee93b56b68647690148a7 SHA256 e0c4ce7b8b1b6cfb95d9dd87524dd0cf8b5d2a0f702a19809f552ba30c1fe48f
-MISC ChangeLog 11160 RMD160 b2233957c17b7751ffbaf55559e446565faec4af SHA1 83d381318f2a160e7aa2bdb56cd4ef6e08f07358 SHA256 a8e97992395a60bdc35dc875134e08e867bd66840bed70f68a590cd0aba3859e
+EBUILD digikam-2.0.0_rc.ebuild 3311 RMD160 970164e604eb863f38851cfbf815c429a74b11ea SHA1 b36d9e465f17b5f30f5826fc6f4614ad3a22e188 SHA256 9194485f3a2c0b984d89b8580d8f3c45f372be0f300f898bf0d95517b5bcaaf5
+MISC ChangeLog 11324 RMD160 c854d1088c5dfa2af0484ec190d3b5149b40dcf2 SHA1 1174b45878aa769762599d9c56f2a8c1a282236a SHA256 23e512e42afa379426421c3c88ff7004e13b98c61722017ba06add358dba50fe
 MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
index 2eaba0e..378d391 100644
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
@@ -68,7 +68,10 @@ DEPEND="${CDEPEND}
 	doc? ( app-doc/doxygen )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch"
+	"${FILESDIR}/${PN}-2.0.0_rc-officialpgf.patch"
+)
 
 S="${WORKDIR}/${MY_P}/core"
 
diff --git a/media-gfx/digikam/files/digikam-2.0.0_officialpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_officialpgf.patch
new file mode 100644
index 0000000..80d46b7
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.0.0_officialpgf.patch
@@ -0,0 +1,71 @@
+commit abd03787b7b1e3a392803edc5b40dfb25a69423c
+Author: Gilles Caulier <caulier.gilles@gmail.com>
+Date:   Mon Jul 4 13:54:40 2011 +0200
+
+    compile with last offcial libpgf
+    CCBUGS: 276969
+
+diff --git a/cmake/modules/FindPGF.cmake b/cmake/modules/FindPGF.cmake
+index b6622c4..0c82a4e 100644
+--- a/cmake/modules/FindPGF.cmake
++++ b/cmake/modules/FindPGF.cmake
+@@ -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)
+@@ -14,11 +15,14 @@ IF(PKG_CONFIG_FOUND)
+ 
+     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}")
++    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 --git a/digikam/utils/config-digikam.h.cmake b/digikam/utils/config-digikam.h.cmake
+index 4ba293b..f881036 100644
+--- a/digikam/utils/config-digikam.h.cmake
++++ b/digikam/utils/config-digikam.h.cmake
+@@ -60,6 +60,8 @@
+ /* Define to 1 if we know how to start mysqld */
+ #cmakedefine HAVE_INTERNALMYSQL 1
+ 
++#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID}
++
+ #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}"
+ 
+ /*
+diff --git a/libs/threadimageio/pgfutils.cpp b/libs/threadimageio/pgfutils.cpp
+index 758f12c..426a531 100644
+--- a/libs/threadimageio/pgfutils.cpp
++++ b/libs/threadimageio/pgfutils.cpp
+@@ -46,6 +46,7 @@ extern "C"
+ // LibPGF includes
+ 
+ #include "PGFimage.h"
++#include "config-digikam.h"
+ 
+ namespace Digikam
+ {