diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2011-09-26 07:45:56 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2011-09-26 07:45:56 +0000 |
| commit | 662385a5a35629190431035c7f199dcf4baf3cc5 (patch) | |
| tree | 4214840d623d371b0702c7b094fc61cc5d4aeb2b /sci-geosciences/mapnik | |
| parent | Version bump to new tarball (diff) | |
| download | gentoo-2-662385a5a35629190431035c7f199dcf4baf3cc5.tar.gz gentoo-2-662385a5a35629190431035c7f199dcf4baf3cc5.tar.bz2 gentoo-2-662385a5a35629190431035c7f199dcf4baf3cc5.zip | |
Update for libpng 1.5 changes (closes bug #384263).
(Portage version: 2.1.10.19/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences/mapnik')
| -rw-r--r-- | sci-geosciences/mapnik/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/mapnik/files/mapnik-0.7.1-libpng1.5.4.patch | 11 | ||||
| -rw-r--r-- | sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild | 5 |
3 files changed, 20 insertions, 2 deletions
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/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() { |