Fix build with libpng-1.5 (bug #383879).

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

4 files changed, 29 insertions, 19 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index f35ef9252e42..da4359a8a2a7 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/darktable
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.9 2011/09/14 12:59:27 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.10 2011/09/21 18:39:29 radhermit Exp $
+
+  21 Sep 2011; Tim Harder <radhermit@gentoo.org> darktable-0.9.2-r2.ebuild,
+  +files/darktable-0.9.2-zlib-header.patch:
+  Fix build with libpng-1.5 (bug #383879).
 
 *darktable-0.9.2-r2 (14 Sep 2011)
 
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index c93230233bab..468befc453fe 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,28 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX darktable-0.9-cflags.patch 1756 RMD160 0d758421e2517659f005f5e00dc6e9acbfdc1f56 SHA1 66fd9d18b8f3d49ccb3e34af7395321a1fb6fbde SHA256 babf25ac1f5af7012575da8e7611ef1da1d99d7971e8d3b2b91d03a51675ef9c
 AUX darktable-0.9.1-no-rawspeed.patch 2458 RMD160 fb5528db7f378f3a46690556e1902c86fe127214 SHA1 c5b083edabb3b23fbf9d9f2370a7117d6d19254a SHA256 fcb0be4c37a27a0594260a2adacff66e63b2896c0fe7644f2027a839eef9dee2
 AUX darktable-0.9.2-system-libraw.patch 3249 RMD160 2bf77c9f5807fa42f4bb64e554695c8b9ffa57f3 SHA1 c60612c58eb90c7c64d526541c171b3974564d02 SHA256 fd9a15e3d1f4b2709d357ad25f35f6d27a073f61791f572d1e21bb1956c20084
+AUX darktable-0.9.2-zlib-header.patch 211 RMD160 174894e9b57473378fb698e04ca1253975d25876 SHA1 94845e9893b1d980c8fc95b7c00164a59d4123a7 SHA256 e2521deded9f92d89325a570af55561d3c443d3dfc369903ab9459fd57e1695b
 DIST darktable-0.9.2.tar.gz 2269319 RMD160 95b5f28afd787070d5e8c236f7e3bb2d27522cae SHA1 5527854edd10cca074bd956772b81d646a796293 SHA256 c7f17961db67f430c449e5294ff4a59ae2a649ba17af0fa55f3e9c5bec9ca20a
 EBUILD darktable-0.9.2-r1.ebuild 2288 RMD160 390848cae5ae9a4f20d74ce81bf8310f7bc357f3 SHA1 4b4f2e6bf65d9e9113e88907958276f75a804554 SHA256 78066186d7dcc24334b71568d3a7c70a47eb32e20a24e5c9f6d1b508a0685354
-EBUILD darktable-0.9.2-r2.ebuild 2304 RMD160 1338e1c46c016e5075bc1c60971ce833b24945b0 SHA1 f73aeb70928447f83d18f9d3379e40f95117624e SHA256 a9470f13af0f3b600bb83c63f94e5cb8b7e7c881d090d3e8da70c79e85af7fd5
-MISC ChangeLog 2467 RMD160 61a0365aefe4685aaeb0b8cbe90594e986117550 SHA1 c295b262109b879be87e09976de23a80a928b674 SHA256 1ffd792199c3612c1b1dcb6d8b5bdc5c1871c92d57c0981834cf2c95cde3118d
+EBUILD darktable-0.9.2-r2.ebuild 2345 RMD160 a10b1eb09f12fdf9b2114b58461d1980b9ae3db1 SHA1 f4f21e6c2773280c2e186d8bbabadb7c11f3d1f1 SHA256 d207ca6a3099031bcff2a4b39c3d90ca102aafabb73a1889ed826408239f5632
+MISC ChangeLog 2635 RMD160 129ab16581b01603c862f7210b3388085212894a SHA1 d41dbc96158bca3dec6af7c2d49db33c07688d5e SHA256 119f4fb5b4f8784626f71f0dcdf6418712565d18d8119a7555945533ef56e9b9
 MISC metadata.xml 465 RMD160 bbc3e655a5e60e0004f3a4803b2d3c20ad247233 SHA1 c362f75afc307f82e72173127817721333094b36 SHA256 83c7149b821c50794200e14c0673636ff1b9b035b7f8079b40747642e1e06a23
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOcKSpAAoJEEsurZwMLhUx+10QAKif5uypgW/aiJMfNLuTIaqr
-TPWyu9mVP2u5izdrrSBGuhDENrg8VAzDUnpKoBp1UAxBY2axjvi7rVKfv/THpiJD
-mW9NM5wasxcdBfOM+Gv+MjzML9jGI2RMbna8EuKYSgwXpTIUmOkLoAcr9Gf6SB54
-mfcl1WYnlZKn4QhComBwuY1zAkdyeKcj+VS/mv9Ndiuh7JomXLC7BXJTDvHAzjHX
-ataDZr9lVqd2oDavL7X8vNpBxRPnMg+26PC3+T/KU8zU8ee0ODhK0XJS5RqHsqRd
-J9i24X8TRrur/LLFQA+qr0OFNN8gym1FsF39idhubIuLzNjUh9MNHpuHIz48Zy5S
-SnnED1amf3WvCfREVziEXZCqpaBeYxiaBU/BSqjAdrIplZxObtb1biS/f2McuHtM
-49Q7N+RO8teu4E/WtkITheuewFjfrAUOk+NbqQAanw8Y91t1eMpT+kLea5NEuKjn
-Cx+pyjo92UzSirvgCnMBO0f7YkiopuZzoOQXx8Og4h6flQfluDuAI6MheO82cczk
-9bhSP42jbAGXCjG1ot3Ff7NawytgTfbTtUny+vwXk+hAdj2XA8tHerVJPhmoyBJG
-5lR4mByloNFv3lrERACEKWw3P952FVFez2T+m5LPTv5RASi/z5C3wvQbjKgz9BEp
-BY7k05knvrH7BCWLu7LS
-=rpae
+iQEcBAEBCgAGBQJOei9nAAoJEEqz6FtPBkyjyPQH/0khvxOhWRL3TME9ObZ7avDw
+sYo6Ykj5t0enrsaCDNB72Larps2c48/iqSA9kR3UK9dreezcRINDlr5ilyHNGmWJ
+luSYeA+PHbClQUN5juEEA/jmIzh9ybOZnuyw4G6vzBwt5kEMlP9vkwYBRCtWlb2a
+Txel9M9xXX1+k8A5xyj25NAfkfeWo5s+fY7tZaxshS4lOmI6vjG5hbYFMwNZj56U
+K0MfaWfLQf73hkTfmP/394ob4dZJAARUwx2r/oGVG9Gjb2dIiQMBDfSnm7ipjdXY
+t4yZqE6xyMcSwIp8gUGF7a6uw9Pv/POrRTfWF7+NX33LTOna3l7xVYHZadwGci0=
+=0cTM
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-0.9.2-r2.ebuild b/media-gfx/darktable/darktable-0.9.2-r2.ebuild
index b1020436e987..cbf7b02a7a36 100644
--- a/media-gfx/darktable/darktable-0.9.2-r2.ebuild
+++ b/media-gfx/darktable/darktable-0.9.2-r2.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/darktable/darktable-0.9.2-r2.ebuild,v 1.1 2011/09/14 12:59:27 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-0.9.2-r2.ebuild,v 1.2 2011/09/21 18:39:29 radhermit Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -52,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-system-libraw.patch
 	"${FILESDIR}"/${PN}-0.9.1-no-rawspeed.patch
 	"${FILESDIR}"/${PN}-0.9-cflags.patch
+	"${FILESDIR}"/${P}-zlib-header.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/darktable/files/darktable-0.9.2-zlib-header.patch b/media-gfx/darktable/files/darktable-0.9.2-zlib-header.patch
new file mode 100644
index 000000000000..3f73e7989a99
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-0.9.2-zlib-header.patch
@@ -0,0 +1,10 @@
+--- darktable-0.9.2/src/imageio/format/png.c.orig
++++ darktable-0.9.2/src/imageio/format/png.c
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <png.h>
+ #include <inttypes.h>
++#include <zlib.h>
+ 
+ DT_MODULE(1)
+