Fix building with libpng14 by Wizzleby.

(Portage version: 2.2_rc65/cvs/Linux x86_64)

3 files changed, 50 insertions, 3 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index d870977d92a2..35a2ea1909b5 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.149 2010/03/07 23:10:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.150 2010/03/08 23:26:59 ssuominen Exp $
+
+  08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  digikam-1.1.0-r1.ebuild, +files/digikam-1.1.0-libpng14.patch:
+  Fix building with libpng14 by Wizzleby.
 
 *digikam-1.1.0-r1 (07 Mar 2010)
 
diff --git a/media-gfx/digikam/digikam-1.1.0-r1.ebuild b/media-gfx/digikam/digikam-1.1.0-r1.ebuild
index 5a80d16f075c..a79d295adfde 100644
--- a/media-gfx/digikam/digikam-1.1.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.1.0-r1.ebuild,v 1.1 2010/03/07 23:10:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.1.0-r1.ebuild,v 1.2 2010/03/08 23:26:59 ssuominen Exp $
 
 EAPI=2
 KDE_LINGUAS="ar be bg ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga
@@ -43,7 +43,8 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog DESIGN HACKING NEWS README TODO"
 
 PATCHES=( "${FILESDIR}/${P}-libpgf.patch"
-	"${WORKDIR}/${P}-libjpeg-8a.patch" )
+	"${WORKDIR}/${P}-libjpeg-8a.patch"
+	"${FILESDIR}/${P}-libpng14.patch" )
 
 src_configure() {
 	mycmakeargs+=( "-DENABLE_THEMEDESIGNER=OFF"
diff --git a/media-gfx/digikam/files/digikam-1.1.0-libpng14.patch b/media-gfx/digikam/files/digikam-1.1.0-libpng14.patch
new file mode 100644
index 000000000000..e7a161dbc9b3
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.1.0-libpng14.patch
@@ -0,0 +1,42 @@
+http://repos.archlinux.org/wsvn/packages/digikam/trunk/libpng14.patch
+
+--- libs/dimg/loaders/pngloader.cpp
++++ libs/dimg/loaders/pngloader.cpp
+@@ -105,7 +105,7 @@
+     unsigned char buf[PNG_BYTES_TO_CHECK];
+ 
+     size_t membersRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f);
+-    if ((membersRead != PNG_BYTES_TO_CHECK) || !png_check_sig(buf, PNG_BYTES_TO_CHECK))
++    if ((membersRead != PNG_BYTES_TO_CHECK) || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
+     {
+         kDebug() << "Not a PNG image file.";
+         fclose(f);
+@@ -322,7 +322,7 @@
+ #ifdef ENABLE_DEBUG_MESSAGES
+                     kDebug() << "PNG in PNG_COLOR_TYPE_GRAY";
+ #endif
+-                    png_set_gray_1_2_4_to_8(png_ptr);
++                    png_set_expand_gray_1_2_4_to_8(png_ptr);
+                     png_set_gray_to_rgb(png_ptr);
+ 
+                     if (QSysInfo::ByteOrder == QSysInfo::LittleEndian)           // Intel
+--- libs/threadimageio/thumbnailbasic.cpp
++++ libs/threadimageio/thumbnailbasic.cpp
+@@ -137,7 +137,7 @@
+     unsigned char buf[PNG_BYTES_TO_CHECK];
+ 
+     size_t itemsRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f);
+-    if (itemsRead != 1 || !png_check_sig(buf, PNG_BYTES_TO_CHECK))
++    if (itemsRead != 1 || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
+     {
+         fclose(f);
+         return qimage;
+@@ -232,7 +232,7 @@
+     {
+         png_set_gray_to_rgb(png_ptr);
+         if (png_get_bit_depth(png_ptr, info_ptr) < 8)
+-            png_set_gray_1_2_4_to_8(png_ptr);
++            png_set_expand_gray_1_2_4_to_8(png_ptr);
+     }
+ 
+     int sizeOfUint = sizeof(unsigned int);