From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QmCBM-0006ee-JV for garchives@archives.gentoo.org; Wed, 27 Jul 2011 22:02:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3691D21C11A for ; Wed, 27 Jul 2011 22:02:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5BF6921C03A for ; Wed, 27 Jul 2011 21:57:38 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9CDEB1B402C for ; Wed, 27 Jul 2011 21:57:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 02F768003D for ; Wed, 27 Jul 2011 21:57:37 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: Subject: [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/ X-VCS-Repository: dev/dilfridge X-VCS-Files: media-gfx/digikam/ChangeLog media-gfx/digikam/Manifest media-gfx/digikam/digikam-1.9.0-r1.ebuild media-gfx/digikam/digikam-1.9.0.ebuild media-gfx/digikam/digikam-2.0.0_rc.ebuild media-gfx/digikam/files/digikam-1.9.0-newpgf.patch X-VCS-Directories: media-gfx/digikam/ media-gfx/digikam/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: de5d6e5bf27c1cf34d4f1ce4dbb4a3e3ef34a0d6 Date: Wed, 27 Jul 2011 21:57:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: f7b8a41491c5dbf92043eee33c89bca0 commit: de5d6e5bf27c1cf34d4f1ce4dbb4a3e3ef34a0d6 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Wed Jul 27 21:57:29 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Wed Jul 27 21:57:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3Dde5d6e5b Resync with main tree (Portage version: 2.1.10.7/git/Linux x86_64, signed Manifest commit with = key B6C5F7DE) --- media-gfx/digikam/ChangeLog | 5 + media-gfx/digikam/Manifest | 35 ++++---- media-gfx/digikam/digikam-1.9.0-r1.ebuild | 7 +- media-gfx/digikam/digikam-1.9.0.ebuild | 24 +++--- media-gfx/digikam/digikam-2.0.0_rc.ebuild | 5 +- media-gfx/digikam/files/digikam-1.9.0-newpgf.patch | 92 ++++++++++++++= ++++++ 6 files changed, 134 insertions(+), 34 deletions(-) diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog index a4bf127..51e1807 100644 --- a/media-gfx/digikam/ChangeLog +++ b/media-gfx/digikam/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 27 Jul 2011; Andreas K. Huettel digikam-1.9.0.e= build, + digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-newpgf.patch, + digikam-2.0.0_rc.ebuild: + Resync with main tree + 27 Jul 2011; Andreas K. Huettel digikam-2.0.0_rc.ebuild: Cleanup, re-add accidentally dropped useflag mysql, depend on kde-4.7 diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 1deea89..6b434ee 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -18,6 +18,7 @@ AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb472= 34047fbe78aaf920299690705 AUX digikam-1.8.0-gcc46.patch 512 RMD160 950c4744a8d4bfe88f0f19233bfd5ae= fb87ccbba SHA1 e3682e8af28233609c12817ec13a120c95a169be SHA256 088709ad10= f71266957d237fabba9ee6f1de0f43ba2c5f63badbeb974d140241 AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d= 36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd= 804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da95476364115= 7a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a93= 1af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af +AUX digikam-1.9.0-newpgf.patch 3463 RMD160 4e5c506e81436aaafe5b789d79adc= b1caee4407b SHA1 3bb97db282fbb0c50e03cd4ba6c5ac6821558620 SHA256 9ca068c8= 7868b9709d75441795bfff2790d13957354b675a9aa94d5f3d55eca8 AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc= 079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee= 35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41= c3ed7310a2 SHA1 e9383e730b81348656c3482700dec59a3ba5a499 SHA256 765338d84= 2b39622428c068d9e190cf0f97933cd66845fea2ff0b5f79ed7b2cc AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec47= 23860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8b= f8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c @@ -33,27 +34,27 @@ DIST digikam-2.0.0-beta6.tar.bz2 43533320 RMD160 eb50= febc2ade359f8d92e6673e4f73a DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a= 32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 56435= 4c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10= cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65= b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467 EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b= 2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f9= 73e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4 -EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a8531= 0e7ca4b704f SHA1 1346318824da28a94445ebac446c737e46906dae SHA256 b73c19ab= 5cf8ecddec3802687b00e664e3fbc7b054a504173b540151e0c324f6 -EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a38212= 79aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f81= 2d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53 +EBUILD digikam-1.9.0-r1.ebuild 3347 RMD160 3cdaf055dc0b801a3cd05ce5ebd91= a7db10ff819 SHA1 29390bef0da866f1f914ba05e046f15f78297d4e SHA256 2b83becd= cae58d502d977afe0551abf24b80365bb42be54144444b969d7342e2 +EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a34297= 4c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c= 1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75 EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b= 33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5df= d0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40= f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9= 123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75 -EBUILD digikam-2.0.0_rc.ebuild 3346 RMD160 be0115573261b514fa58148436c2c= 49c015c5826 SHA1 00b5733fbb44c4b345113749945cdc8c1d92cb96 SHA256 c49e0957= 7600adad9478a9702a79f2003c99a132a22fee68ecc33b928e698111 -MISC ChangeLog 12010 RMD160 9ae712c69a3ad32799d2cc72d130bda5ee4fcc3c SHA= 1 363ad373e7411f9978cfba67cd1765ff1c596f8b SHA256 8376c41406c84a03ce41474= a6d0db69d7512c59cd37bc9a0a04edb7ca9c93c43 +EBUILD digikam-2.0.0_rc.ebuild 3500 RMD160 34a75d9a7b3aea4e5065cfc94d167= 4672a9a5ce3 SHA1 17abcd6e5996cc57a83fee9f9b0088aeaf1f4054 SHA256 2254955a= f12fb79aebdaec5dbaa6c3fe8e747ce47c42c22f2067ddddbf37f89a +MISC ChangeLog 12203 RMD160 dad8c089a58312af04a5df63bae02cf38af3209d SHA= 1 9558c98e432bc61204e9782d1fb9c4c050fccfe3 SHA256 4a85e9b0a2cbc911a6ee392= c357d7d603bd2cb9b4095b125c14d1cb6921f9044 MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SH= A1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca13151= 48380f1c89c6c042d0bc511105f3b2c3a926e17b80 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iQIcBAEBCgAGBQJOMHWOAAoJENwGBM22xffeO84QAIp63v4ceC7fhc7ulFETs7fh -+hTa0NmQW3//A6idGCSXTinnpZcaFOVRf8ny0uKXuzSPJ1enN3FeQHRrdhttR2UM -EsfhGN1Z7IMug1rzyk3d24xwf1mxAA2YCvFnZ4kVo813i/fGYIv52/isCDRrB0mC -eL36N1+xdOgNIXCtsqHTfSnNLXjxPvuFH0fea2YTN25qCDZTEIEdwrDp4EIzMQQa -XkcrwiaIAEdEqYRBOGsR1ncKm/T1Q4iK6SSUTq8Szmay+fxgZZuMLfVndrABgp4g -7nWQkjj8CoU34ZC3LTBzQQJcnmSSWbug9UceU3tGJ6556T3jjwRCtdzk6yvN4e9r -eWqpW7jaSs44J9GczO4jxhAUFkXLb/GrmO1NhL1EIrBqN/gWfeVlArQzb5BD4sQK -xOw8PJLYaa6GwTzxvT68xzJxQ6TdMYTvypuqBM/1V/gXQeadS9miqdc53TC3sdMS -ps9pp8pWr+P4+pSfWbUQGNZLOmG/Ml+c6bAy3ILpWd86rb/WM5E/HI3BBi56PQA5 -knUxDzCS9L47yIfOZhFWprYG8sFxmIJQ0VvxGL/UUkh40TOE7U4S9a1tlq/nuA5Q -x4+oZ09npmNp7qHIUwmtTVyrb3r7FtqEMvnWA9eghUkxx0BYbB4I9Ta2XO+eJajU -XqIAlP6OfYvXanby8cGl -=3DP5KI +iQIcBAEBCgAGBQJOMInJAAoJENwGBM22xffeoecQAJ5dNaTo+foLdjZAnYQOqzAO +ZemA7GnO/84v0P2YFJJfDaKMmhvy1YFl1fXZBHNk1Ivk10LJhMXKcSHpkwP8BDwp +BOUVJqWIRVmBXNjsoNbwWG08P3zs4nkjWRPFBwYjuW2SOld3Kt0zZ2/2YqvkMaT9 +Pxgw9HAVmOFrBo+jiDU3lCGM+zaplUIBXuXf4Uz/RH8nCgBAtpQ4rsFDbBNgrPJh +4NjgK/3qGJ9EUsLNQaPuynlrM0JqUajylrOEPMrI4ZqGG+o/KIDMTQTipkgVQAHq +jVQMDptS0u3cGmArOOGTdv23PIPWVI9iqLoAE2jhS6M2t+JG54OqaNhh+zd9fEkb +MlDAA0ISxdQeEj5tgpA/U2zv9W9WtH9TpN087OCc5ZXXlmN+36oWfGSw3eOdXdrZ +e3Xfhgpbia/35/nmbxh/tpEfRBuMBGdsI/oZVToeQXqVRyfzX5hIhpvSIiUuKGz6 +NillqL7oSAUnNEAhi95ZTXtSMTyChkrVXV2kuDrN4SdRE3Wjwphdf2XR2pYwHrrB +KFGwXwClNn6hmHVFh2Jvr2jrQUronIWlaXdun+w1F50Gv0CbDCl6KcLFM3zrjL60 +dFSr3s2ynmxaRH2Qgv73aL/BvPcz2pOaBaPuLIoAjwSjsvTRtA6w8Cmx2uPiJGK8 +yCtbfrJpTKyukhs4vo/f +=3Dfeu8 -----END PGP SIGNATURE----- diff --git a/media-gfx/digikam/digikam-1.9.0-r1.ebuild b/media-gfx/digika= m/digikam-1.9.0-r1.ebuild index 1eff898..5ef1230 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.eb= uild,v 1.2 2011/05/11 10:45:31 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0-r1.eb= uild,v 1.5 2011/07/05 11:39:35 dilfridge Exp $ =20 EAPI=3D4 =20 @@ -52,8 +52,8 @@ RDEPEND=3D"${CDEPEND} $(add_kdebase_dep kreadconfig) video? ( || ( - $(add_kdebase_dep ffmpegthumbs) - $(add_kdebase_dep mplayerthumbs) + ( $(add_kdebase_dep ffmpegthumbs) ) + ( $(add_kdebase_dep mplayerthumbs) ) ) ) " @@ -69,6 +69,7 @@ PATCHES=3D( "${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 ) =20 src_prepare() { diff --git a/media-gfx/digikam/digikam-1.9.0.ebuild b/media-gfx/digikam/d= igikam-1.9.0.ebuild index ee18dc5..5d28d34 100644 --- a/media-gfx/digikam/digikam-1.9.0.ebuild +++ b/media-gfx/digikam/digikam-1.9.0.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.ebuil= d,v 1.4 2011/05/09 23:10:48 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0.ebuil= d,v 1.5 2011/06/07 02:51:21 abcd Exp $ =20 EAPI=3D3 =20 @@ -26,11 +26,11 @@ SLOT=3D"4" IUSE=3D"addressbook debug doc geolocation gphoto2 handbook semantic-desk= top themedesigner +thumbnails video" =20 CDEPEND=3D" - >=3Dkde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?] - >=3Dkde-base/libkdcraw-${KDE_MINIMAL} - >=3Dkde-base/libkexiv2-${KDE_MINIMAL} - >=3Dkde-base/libkipi-${KDE_MINIMAL} - >=3Dkde-base/solid-${KDE_MINIMAL} + $(add_kdebase_dep kdelibs 'semantic-desktop?') + $(add_kdebase_dep libkdcraw) + $(add_kdebase_dep libkexiv2) + $(add_kdebase_dep libkipi) + $(add_kdebase_dep solid) media-libs/jasper virtual/jpeg media-libs/lcms:0 @@ -44,16 +44,16 @@ CDEPEND=3D" virtual/mysql x11-libs/qt-gui[qt3support] || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) - addressbook? ( >=3Dkde-base/kdepimlibs-${KDE_MINIMAL} ) - geolocation? ( >=3Dkde-base/marble-${KDE_MINIMAL}[plasma] ) + addressbook? ( $(add_kdebase_dep kdepimlibs) ) + geolocation? ( $(add_kdebase_dep marble plasma) ) gphoto2? ( media-libs/libgphoto2 ) " RDEPEND=3D"${CDEPEND} - >=3Dkde-base/kreadconfig-${KDE_MINIMAL} + $(add_kdebase_dep kreadconfig) video? ( || ( - >=3Dkde-base/mplayerthumbs-${KDE_MINIMAL} - >=3Dkde-base/ffmpegthumbs-${KDE_MINIMAL} + ( $(add_kdebase_dep mplayerthumbs) ) + ( $(add_kdebase_dep ffmpegthumbs) ) ) ) " @@ -120,6 +120,6 @@ pkg_postinst() { kde4-base_pkg_postinst =20 if use doc; then - elog The digikam api documentation has been installed at /usr/share/do= c/${PF}/html + elog "The digikam api documentation has been installed at /usr/share/d= oc/${PF}/html" fi } diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digika= m/digikam-2.0.0_rc.ebuild index d3834ff..706304c 100644 --- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild +++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild @@ -1,12 +1,13 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0_rc.eb= uild,v 1.1 2011/07/27 20:51:56 dilfridge Exp $ =20 EAPI=3D4 =20 KDE_LINGUAS=3D"" #KDE_LINGUAS=3D"be ca ca@valencia de el en_GB eo es et eu fi fr he hi hn= e hu is it km # ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW" +#the release candidate has no internationalization =20 KDE_HANDBOOK=3D"optional" CMAKE_MIN_VERSION=3D"2.8" @@ -16,7 +17,7 @@ inherit kde4-base =20 MY_P=3D"${PN}-${PV/_/-}" =20 -DESCRIPTION=3D"A digital photo management application for KDE." +DESCRIPTION=3D"Digital photo management application for KDE" HOMEPAGE=3D"http://www.digikam.org/" [[ ${PV} !=3D *9999* ]] && SRC_URI=3D"mirror://sourceforge/${PN}/${MY_P}= .tar.bz2" =20 diff --git a/media-gfx/digikam/files/digikam-1.9.0-newpgf.patch b/media-g= fx/digikam/files/digikam-1.9.0-newpgf.patch new file mode 100644 index 0000000..ed5c1bd --- /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.000000= 000 +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. +=20 + # PKG-CONFIG is required. + INCLUDE(FindPkgConfig REQUIRED) +@@ -12,4 +13,15 @@ + INCLUDE(FindPkgConfig) +=20 + PKG_CHECK_MODULES(PGF libpgf) ++ ++ MESSAGE(STATUS "PGF_INCLUDE_DIRS =3D ${PGF_INCLUDE_DIRS}") ++ MESSAGE(STATUS "PGF_INCLUDEDIR =3D ${PGF_INCLUDEDIR}") ++ MESSAGE(STATUS "PGF_LIBRARIES =3D ${PGF_LIBRARIES}") ++ MESSAGE(STATUS "PGF_LDFLAGS =3D ${PGF_LDFLAGS}") ++ MESSAGE(STATUS "PGF_CFLAGS =3D ${PGF_CFLAGS}") ++ MESSAGE(STATUS "PGF_VERSION =3D ${PGF_VERSION}") ++ ++ STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}") ++ MESSAGE(STATUS "PGF_CODEC_VERSION_ID =3D ${PGF_CODEC_VERSION_ID}") ++ + ENDIF(PKG_CONFIG_FOUND) +diff -ruN digikam-1.9.0.prepared/config-digikam.h.cmake digikam-1.9.0/co= nfig-digikam.h.cmake +--- digikam-1.9.0.prepared/config-digikam.h.cmake 2011-02-27 19:58:07.00= 0000000 +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 +=20 ++#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID} ++ + #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}" +=20 + #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.00= 0000000 +0200 +@@ -29,6 +29,7 @@ + //#define ENABLE_DEBUG_MESSAGES +=20 + #include "pgfloader.h" ++#include "config-digikam.h" +=20 + // C Ansi includes +=20 +@@ -435,7 +436,11 @@ + CallbackForLibPGF, this); +=20 + UINT32 nWrittenBytes =3D 0; ++#if PGFCodecVersionID >=3D 0x061124 ++ pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this); ++#else + pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this); ++#endif +=20 + #ifdef ENABLE_DEBUG_MESSAGES + kDebug() << "PGF width =3D " << 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.00= 0000000 +0200 +@@ -46,6 +46,7 @@ + // LibPGF includes +=20 + #include "PGFimage.h" ++#include "config-digikam.h" +=20 + namespace Digikam + { +@@ -136,7 +137,12 @@ + // TODO : optimize memory allocation... + CPGFMemoryStream stream(256000); + UINT32 nWrittenBytes =3D 0; ++ ++#if PGFCodecVersionID >=3D 0x061124 ++ pgfImg.Write(&stream, &nWrittenBytes); ++#else + pgfImg.Write(&stream, 0, NULL, &nWrittenBytes); ++#endif +=20 + data =3D QByteArray((const char*)stream.GetBuffer(), nWrittenBy= tes); + }