Import upstream patch for libpng15 compability wrt #378493 by Diego Elio Pettenò

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

diff --git a/games-util/atlas/ChangeLog b/games-util/atlas/ChangeLog
index b62734f6d770f3c8ee567b128af219a990cd3527..3f726e0fc894cceedc63b0311bd23da3cac39dff 100644 (file)
--- a/games-util/atlas/ChangeLog
+++ b/games-util/atlas/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-util/atlas
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/atlas/ChangeLog,v 1.25 2011/02/26 16:55:11 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/atlas/ChangeLog,v 1.26 2011/08/09 17:29:42 ssuominen Exp $
+
+  09 Aug 2011; Samuli Suominen <ssuominen@gentoo.org>
+  atlas-0.3.1_p20101101.ebuild, +files/atlas-0.3.1_p20101101-libpng15.patch:
+  Import upstream patch for libpng15 compability wrt #378493 by Diego Elio
+  Pettenò
 
   26 Feb 2011; Kevin McCarthy <signals@gentoo.org>
   atlas-0.3.1_p20100302.ebuild:

diff --git a/games-util/atlas/Manifest b/games-util/atlas/Manifest
index 68acce1d66dfa006b700dd464eb915005b0bc5e9..4c2eae2cd3a1e7f50c4a256a8810eb8965b43af9 100644 (file)
--- a/games-util/atlas/Manifest
+++ b/games-util/atlas/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX atlas-0.3.1_p20101101-libpng15.patch 305 RMD160 bb29cbbafbc63b63f6860c7169b45c7c10194c00 SHA1 d4e947225f868f7ff369a2d7bf0ce22ec3f9c108 SHA256 f1d9fa68be3f5f67adaa48626e89d808066068ba514912ea2a5d81e986abf232
 DIST atlas-0.3.1_p20100302.tar.bz2 268125 RMD160 a4bbd79cbb83b472eef51c67d10e82fcdc5e52a0 SHA1 6b819ff0cc4737e521b6acdeb623135cc64ec7f4 SHA256 d12d9469eca0bdabab73ebb63058b1e8767fd4dc463936c785c7fddf8970c68a
 DIST atlas-0.3.1_p20101101.tar.bz2 316895 RMD160 4697d430a434b138ef188d340179a8a1abb60bab SHA1 0665533d950a5b49a8e2a308b1d0ee2472227ea7 SHA256 511b3fc75432b651b0aec925ddb72e3ab454579bcedcbf29622817da888c4fde
 EBUILD atlas-0.3.1_p20100302.ebuild 1936 RMD160 5d421fc70a4ce7ebeaf45010d89e6e4b2093f1cb SHA1 5c7e2716aca63fe9b9a1d11d7290a97516d4091c SHA256 b335a09109710d1e51f1db5e0453bac5baec811ec83870c0250ac12e61d4a5bc
-EBUILD atlas-0.3.1_p20101101.ebuild 1908 RMD160 554cb412ddef8a23768cee9b0c1bc969cb875956 SHA1 2114a325c7df2b1d11dc715068e382917db7952d SHA256 09c713eee9a79140d70858a135e42771444d147bebd3c0e566444a17f850b596
-MISC ChangeLog 3438 RMD160 2490f5f1d7448812136e4a6b3775616fcfcf347d SHA1 d53fd41ffa05b057eb0f5d19028ad82af0285698 SHA256 8d983800895a383504135faab52d59385791428d8a406fea5dca47f02a9c43d9
+EBUILD atlas-0.3.1_p20101101.ebuild 1959 RMD160 ef0604d42624fad44fcab295f88078e5c1dd2258 SHA1 fc4b0eec871cbd7569467c0950c3f550350778cd SHA256 229f0b7002bba1c8690bcc33b4cefb1dd699f3492d8ff38c42f51888af9ab231
+MISC ChangeLog 3658 RMD160 35f874fd174f3a4879fd08e72b9001b6702d9b6c SHA1 d083a3f2e238927e5e7b0e87009aaf5a1c927566 SHA256 3bac7412c7626b08b98d1d601240bdc0adecf94d43ca7014c02e29df6bc47eb5
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk5BbocACgkQXkR9YqOcLPEYZgD+IgpDWLQ6XS/q8fAQza8gnCr+
+ANmoWtI8p96GgKTqNJUA/3ab1wYEZp8pir6Mms0peud55fXpR9ykKBd+QHeA59A3
+=itfX
+-----END PGP SIGNATURE-----

diff --git a/games-util/atlas/atlas-0.3.1_p20101101.ebuild b/games-util/atlas/atlas-0.3.1_p20101101.ebuild
index 59e2889bcf013d35e4670ac9dae4e446c2be3717..d8a3c4d9288e34a34cc840d20870bd300791a679 100644 (file)
--- a/games-util/atlas/atlas-0.3.1_p20101101.ebuild
+++ b/games-util/atlas/atlas-0.3.1_p20101101.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/atlas/atlas-0.3.1_p20101101.ebuild,v 1.2 2011/02/26 13:35:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/atlas/atlas-0.3.1_p20101101.ebuild,v 1.3 2011/08/09 17:29:42 ssuominen Exp $
 
 EAPI=2
-inherit autotools games
+inherit autotools eutils games
 
 DESCRIPTION="Chart Program to use with Flightgear Flight Simulator"
 HOMEPAGE="http://atlas.sourceforge.net/"
@@ -31,6 +31,7 @@ DEPEND=">=games-simulation/flightgear-2
        x11-libs/libXmu"
 
 src_prepare() {
+       epatch "${FILESDIR}"/${P}-libpng15.patch
        eautoreconf
 }
 

diff --git a/games-util/atlas/files/atlas-0.3.1_p20101101-libpng15.patch b/games-util/atlas/files/atlas-0.3.1_p20101101-libpng15.patch
new file mode 100644 (file)
index 0000000..0ed98ae
--- /dev/null
+++ b/games-util/atlas/files/atlas-0.3.1_p20101101-libpng15.patch
@@ -0,0 +1,13 @@
+http://atlas.cvs.sourceforge.net/viewvc/atlas/Atlas/src/Image.cxx?r1=1.7&r2=1.8
+
+--- src/Image.cxx
++++ src/Image.cxx
+@@ -319,7 +319,7 @@
+       return;
+     }
+ 
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+       png_destroy_write_struct(&png_ptr, &info_ptr);
+       fclose(fp);
+       return;