From: Steve Arnold <nerdboy@gentoo.org>
Date: Mon, 26 Sep 2011 07:45:56 +0000 (+0000)
Subject: Update for libpng 1.5 changes (closes bug #384263).
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=23a3f6d3a8e839d5aa884bb0595edab7fa23d6a9;p=gentoo.git

Update for libpng 1.5 changes (closes bug #384263).

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64
---

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index 96c499698f34..ef1e1ec88f4e 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/mapnik
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.26 2011/07/29 02:33:46 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.27 2011/09/26 07:45:56 nerdboy Exp $
+
+  26 Sep 2011; Steve Arnold <nerdboy@gentoo.org> mapnik-0.7.1-r1.ebuild,
+  +files/mapnik-0.7.1-libpng1.5.4.patch:
+  Update for libpng 1.5 changes (closes bug #384263).
 
   29 Jul 2011; Steve Arnold <nerdboy@gentoo.org> mapnik-0.7.1-r1.ebuild:
   Updated with API doc workaround (see bug #370575) and a missing dep
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 5df65de227dc..9e2ac2a6d955 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,5 +1,6 @@
 AUX mapnik-0.7.1-libagg.patch 1961 RMD160 b2d7199280bdf032cd0a220e686d518a41239f8c SHA1 3adaf5c646ff2b72642bdc29d232489bfb573d17 SHA256 f7114127b1aae227d9ef854ec64c7ac5962a8428d687159604b7e6ff1146f4ff
+AUX mapnik-0.7.1-libpng1.5.4.patch 412 RMD160 82ad05f96b30e0e1c1af1a0740120a7cf9b4420a SHA1 38399f536929320bd3fc5807e35da90a147a9514 SHA256 9a79debf5624adea141428a1d359f47d843e72ec9820ff4d8b3ba892553dd425
 DIST mapnik-0.7.1.tar.bz2 10021260 RMD160 9e4180e901dfaf255091843869e9441d7a08209f SHA1 a1961f6dfe5d591d5a892bef05d58e66537440c4 SHA256 0d04e8cbc2a060ce09ba13ccdcd7bf8bd02bed77a84a3dd1191e4d75fba95b8d
-EBUILD mapnik-0.7.1-r1.ebuild 4537 RMD160 8db2f5c8432331c0db066e029f7f7c064cdc7fbc SHA1 f7c88c93a96b4cdab60b9e45f783e1b0cbfc3d8b SHA256 2c4cfbd675ce619bc7c2aaac5d6e396f410335d4bc653017ecd81824f9327ace
-MISC ChangeLog 5984 RMD160 dbba9bdc75d6f3f87c6c018ec506d834cb755c5f SHA1 ef8f62f073d7c446953c157d3a92775e65cd8aea SHA256 8fc9978c0bd98cea3a923e633123e30020bffa693bd88850b83b53f77bf56e1e
+EBUILD mapnik-0.7.1-r1.ebuild 4628 RMD160 494c43d5e02a1037b4d2e5f0f2b9237e85ad3b5e SHA1 e5edb3e30776f645451c7180a59d463347086a94 SHA256 ebd40f033f4924388286c3cc450e7907535b035ac72e6f4c9575ae5b04c21e8b
+MISC ChangeLog 6153 RMD160 a279df700976187b38ccbd3efab6730e94c5c49c SHA1 5ee958941e52213e17e0e6a7d2979d51170f5b06 SHA256 277f00553e67eff84fa59ff97c472758d353ef2ff3d315d851463cf27ca3dc15
 MISC metadata.xml 540 RMD160 281eea708af7cea3c87c0ac1de1ccc3403b94a13 SHA1 8c0d5b1293cb5ede8254b883f474fe81e76522dc SHA256 18351b15256bb44b61ad8772d011928c37676497b7152468b3d32cec8fd7e6db
diff --git a/sci-geosciences/mapnik/files/mapnik-0.7.1-libpng1.5.4.patch b/sci-geosciences/mapnik/files/mapnik-0.7.1-libpng1.5.4.patch
new file mode 100644
index 000000000000..b3728a30bd8f
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-0.7.1-libpng1.5.4.patch
@@ -0,0 +1,11 @@
+--- src/png_reader.cpp.orig	2011-09-25 20:12:10.000000000 -0700
++++ src/png_reader.cpp	2011-09-25 20:17:17.000000000 -0700
+@@ -82,7 +82,7 @@
+     {
+         png_size_t check;
+         check = (png_size_t)fread(data, (png_size_t)1, length,
+-                                  (FILE *)png_ptr->io_ptr);
++                                  (FILE *)png_get_io_ptr(png_ptr));
+ 
+         if (check != length)
+         {
diff --git a/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild b/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
index f83bdda56c49..4c0d24df8543 100644
--- a/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
+++ b/sci-geosciences/mapnik/mapnik-0.7.1-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/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v 1.7 2011/07/29 02:33:46 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v 1.8 2011/09/26 07:45:56 nerdboy Exp $
 
 EAPI=3
 
@@ -55,6 +55,9 @@ src_prepare() {
 	    bindings/python/SConscript || die "sed 2 failed"
 	rm -rf agg || die
 	epatch "${FILESDIR}"/${P}-libagg.patch
+
+	# update for libpng 1.5 changes (see bug #)
+	epatch "${FILESDIR}"/${P}-libpng1.5.4.patch
 }
 
 src_configure() {