Fix building with libpng15 wrt #384069 by Martin von Gagern

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

4 files changed, 47 insertions, 19 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index e1427323c7dc..9749ab7eb834 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.107 2011/08/28 11:18:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.108 2011/09/27 11:21:12 ssuominen Exp $
+
+  27 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> grass-6.4.1.ebuild,
+  +files/grass-6.4.1-libpng15.patch:
+  Fix building with libpng15 wrt #384069 by Martin von Gagern
 
   28 Aug 2011; Markos Chandras <hwoarang@gentoo.org> grass-6.4.1.ebuild:
   Respect LDFLAGS. bug #375999
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index f5ef28f9bee8..c97a6212d21a 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,26 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX grass-6.4.0-html-nonviz.patch 1774 RMD160 95f278e851dc782fa89861a60e97f2c6c4da564b SHA1 d917690626b669a9e9455b12bcb1aa14db65c29d SHA256 6da939c90fa851c50895aeb26c54bd9a512e2e7ca14c3da3268e1daa672442ff
+AUX grass-6.4.1-libpng15.patch 906 RMD160 50d1df3a4470f937776ad1f1a30afa757f6423e7 SHA1 79f06b8e62a4e09889cf44289e7b98b361264ef9 SHA256 60135350574b9f2c769cb1513446c6b9fea5f949bc084a9e05d2d81a20ae6d55
 AUX grass-pkgconf.patch 1322 RMD160 7b48d8e05a07090d8d36d2fb96b385f2d655e066 SHA1 cb33293f442ad0bdd5592f842bcafe13eb021b48 SHA256 2d80c1a3851cd82bdcd7401c537348ec43e488c8b475718727d65ac423a5640c
 DIST grass-6.4.1.tar.gz 23608488 RMD160 2a9ee5da891c9d89a5ad0e66f914d2dd763e5128 SHA1 ea1cdfd1b7422367d671eeaf66f362d694a94abd SHA256 8b886faf8635f77f0d1626806454e6e8bdfa9155e3c10a0bc3e10447b9e6bd03
-EBUILD grass-6.4.1.ebuild 7930 RMD160 a0524046673ad72bd7ef8e878dd23e87852c0d6c SHA1 bc277e05726b9c59886c44b4b2894cd9470f5dd8 SHA256 ed1c85df18c5b32b6d7b805faca349fd9f0efbc8ac6143a98b86cfb805ba4413
-MISC ChangeLog 20763 RMD160 e7910d0003c4e1bc2bf58f9f353f0d285c1bcf0a SHA1 dbb8e73c636844e71a4de2e2cc465a76bc118082 SHA256 836b3bd19ac51af39798c82d5995b95ac0543f832e7f232e37223fb9fe4ed30a
+EBUILD grass-6.4.1.ebuild 7966 RMD160 7eb936ef73d615dabe3231d3f9de33ec781a5ee7 SHA1 752f9d47245876f0b7a08951ce90b8f83e59c69b SHA256 30c9146a780a8a4ab82dd80713167ba95dd210d776d424eb8641c864aac3018c
+MISC ChangeLog 20938 RMD160 c0f4f0ba139f37ab72aeea84b3038994a9eed920 SHA1 1bfc8798b8bf5420b32b52d12aa5775c05f59378 SHA256 c0369d479494a336e79a301c1093b41720d86488d13b794242e476db9c533b04
 MISC metadata.xml 623 RMD160 f3ab7360eb95e18d25fa0f35bd8817e8628e3246 SHA1 497c577a971010147239a61515ab66a678881569 SHA256 d6200460324878b71cae01dc1193c77749b88b7c2e723041d9f426487c50c85f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOWiPhAAoJEPqDWhW0r/LCB54P/1Zq3sEHlBzWl6tQvGxFldqI
-iogUEv+wr2GIqEfxJ7qE445h1kANV2AfaX6TCps9QG0VBrCjv9AR09KWv/8fHHzK
-RZcyeiKzpaEApnvnXNNiXzq41cRrA6/icgnkeBekzdsUfYcY+VBButhdhPXFWtEp
-9t2A/MMEFlk05LI3Bh3HfE7t8i6C5Sg7LQ788WL4F5PUG149GaCqb3BjEp6ywf1b
-XlLHj9uOkWw4pLPx2qjJj3A/TLOHFE0qJytmHZz0AtAgyDsFXcH1QXEIwTKJOtSe
-CZVZMdAyz6TOxMLzwi5taFpdDzIN2Yc7fH4+qfjLVYZ1O7Kfbmzkg0hVewfB6VDb
-YAOAZJfYLAJCqdqOVzTRaAdw8xT+QJVXZBDF2Q3zWNts4ap5BS3PeNRDei1R6V9x
-NgKF74RzhybkDDeV1ziwugJqgVw+JrAZFzGjHNrSlIGttyWjUT7DtqHQQLUpp4MP
-EKE6+UVqdCxL/f5FwFxXI99q83M5UVznlZDRoxfC4qKGvFDQKzm03XhJSaZPIN0H
-WgG5kbOEcuMhTyZd4EFJv57JPgQYAhtnW3WL7aUXd16RK/Z1M5XZ9E41dZ3sEFw6
-rjTADEPE0u4boBG7l5cBIlarjcdM88e+LpmKJzLgmeXT0h+5+ObmwlbfzXjmRBMj
-sfCNIb5nGhq3X+jMfUSE
-=Eehy
+iQEcBAEBAgAGBQJOgbHUAAoJEEdUh39IaPFN94MH/iOBBuZeFRWh4hQRTCgR7IG5
+Xy2Hz05LWM0IkOqb+QkHO/0kVYge/kodKb16ZeWuHKgA9U6G3xGGlf+l7zM1HRxM
+Yb577VTsOAkkXZILm4jmjuQKGezp8uSsZ4qS62zg4c0DSXF6pxRIYRprm7Bdj+bB
+LBINozr3ohfmz/IPsSO9J/q3qgb66sVsY2Dzg87rYAk6GlTuPi/NPamBYAMgIv09
+RH+sP0OM03n375saf5ksqb+ve0oueO4l6rhQjw69iuzDybpGR4KYlYuH+LfmIU/4
+Iunzy5VmpZhSsGSlynbiwhJzUp1Ehekuujuo1xpslbmvEWOpi5CUSjG7NQSrdm0=
+=FgRa
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch b/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch
new file mode 100644
index 000000000000..3c040e70755c
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch
@@ -0,0 +1,28 @@
+--- raster/r.out.png/r.out.png.c
++++ raster/r.out.png/r.out.png.c
+@@ -261,9 +261,6 @@
+     png_info_init(info_ptr);
+ #endif
+     png_init_io(png_ptr, fp);
+-    info_ptr->width = win.cols;
+-    info_ptr->height = win.rows;
+-    info_ptr->bit_depth = depth;
+ 
+     /* explicit filter-type (or none) required */
+     if ((filter >= 0) && (filter <= 4)) {
+@@ -302,10 +299,13 @@
+ 	/*if(!gscale->answer){ *//* 24BIT COLOR IMAGE */
+ 
+ 	if (TRUE) {
++	    int color_type;
+ 	    if (do_alpha)
+-		info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++		color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+ 	    else
+-		info_ptr->color_type = PNG_COLOR_TYPE_RGB;
++		color_type = PNG_COLOR_TYPE_RGB;
++
++	    png_set_IHDR(png_ptr, info_ptr, win.cols, win.rows, depth, color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+ 
+ 	    /* write the png-info struct */
+ 	    png_write_info(png_ptr, info_ptr);
diff --git a/sci-geosciences/grass/grass-6.4.1.ebuild b/sci-geosciences/grass/grass-6.4.1.ebuild
index 0fd87a8d9c3a..984f83ccd308 100644
--- a/sci-geosciences/grass/grass-6.4.1.ebuild
+++ b/sci-geosciences/grass/grass-6.4.1.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/sci-geosciences/grass/grass-6.4.1.ebuild,v 1.7 2011/08/28 11:18:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.1.ebuild,v 1.8 2011/09/27 11:21:12 ssuominen Exp $
 
 EAPI=3
 
@@ -85,7 +85,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-pkgconf.patch"
+	"${FILESDIR}"/${PN}-pkgconf.patch
+	"${FILESDIR}"/${P}-libpng15.patch
 )
 
 pkg_setup() {