Fix building with libpng14 by Wizzleby.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

4 files changed, 53 insertions, 5 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/Manifest b/media-gfx/digikam/Manifest
index d22eadbbd3c3..ef895e49eebc 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,7 +1,8 @@
 AUX digikam-1.1.0-libpgf.patch 8996 RMD160 4f1a7ad7b28c43b3fe2e454eb3351f27a14bde6f SHA1 fd2b98e23c31d880a2a32f28161f279abef82c22 SHA256 f2001099ee5538a31a9660c223e59a25a19eb7c36a191831b849e1b81c58856d
+AUX digikam-1.1.0-libpng14.patch 1580 RMD160 769e9bf4030d795349cb260854e26c189471ccbc SHA1 9b3123dad7bd7530db6833296dc1de7ec240fd54 SHA256 0ae5e279aedc80857cb27ace7d1609b6cf632853513445896b88a7365b763fb9
 DIST digikam-1.1.0-libjpeg-8a.patch.bz2 14552 RMD160 8ecf249a0e4db45ccd13b7013b543483cb1a7af5 SHA1 137402f1727f8fcb76f38c33ad1ba0ae036e298e SHA256 c728940524ef7089c842319134aa3346de154e546f8dbf5f2b9d3a7096c33456
 DIST digikam-1.1.0.tar.bz2 15385611 RMD160 a4bd749adf24be7cd349e7be464cf22018d21eca SHA1 5ee482ff209c0a29b898e57278d62c428b743ba5 SHA256 6d26921e83bdb85342a0455df919f33bc2f23533c96e9293e80cd79ff92bfa8f
-EBUILD digikam-1.1.0-r1.ebuild 2125 RMD160 d2dd4b074edcfe693e0ec2fd0083571a2f755672 SHA1 2347df2d9a9b4e39c65c467becf492e446222475 SHA256 87cbe2c1c547ef3f1ac55005cf96c4e997012c9221ac78eb4581feb1c9378aff
+EBUILD digikam-1.1.0-r1.ebuild 2160 RMD160 6acbf8c5d1e0ec019776e3919240979b266d011f SHA1 7ccbe8be105b3a1bf8868d5ee4cd8478e3f6af8d SHA256 fe20d71c7b6a2d823c09445a6e5d083761548a54da0d3dc3950540dd294c3407
 EBUILD digikam-1.1.0.ebuild 2015 RMD160 fd9696e3bc39722e52056e88fe5a6ea5722df7f9 SHA1 08833271db626840009c7cb241d9ac8f891f023d SHA256 25cc7b6759a8f071908ccb193224281ce7e74ee018b6460026a3159e49d5ded9
-MISC ChangeLog 24498 RMD160 9546d39faedd007dadeac4dc4845d79e2ffe8556 SHA1 40c809f81a10a8c8c28b51699db7c154d2427251 SHA256 4904200dd0791971dd5a7d7363847e33a20686a06f18ca34ad96bc32b464f7f0
+MISC ChangeLog 24659 RMD160 286ee19391ee5f0f4b5de38bbfb14b5425aec431 SHA1 485fafe0fd381d22cc734748bb0287ce1b99cf7f SHA256 2322b7d6b87135ea32649ce3b9225801bd1a5bc51dd73f641da525687f1848eb
 MISC metadata.xml 494 RMD160 6139d5c9cfa6c7c1295682cc4094b1138a3d4197 SHA1 d5d698ce43d3089bc3c9dd0a6eb989d89766062e SHA256 8fb9939a7dec954094ab4dea687e3be5a8486295e201124fc4192f32d4526de1
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);