Fix building with libpng15 wrt #387553 by Daniel Savard

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

4 files changed, 52 insertions, 9 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 9d17ce0c83b3..0e05878c0985 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.88 2011/06/21 14:31:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.89 2011/10/18 16:35:29 ssuominen Exp $
+
+  18 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> root-5.26.00e-r1.ebuild,
+  +files/root-5.26.00e-libpng15.patch:
+  Fix building with libpng15 wrt #387553 by Daniel Savard
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> root-5.26.00-r2.ebuild,
   root-5.26.00e-r1.ebuild, root-5.28.00d.ebuild:
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 8d3c9c2f7429..3d3682598c07 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -6,6 +6,7 @@ AUX olbd.initd 714 RMD160 e2cc28474a280345f6962f890f5ddb3884d7f69f SHA1 4dcdf7ba
 AUX proofd.confd 415 RMD160 3814aacb63d82b9d060086f9bef304d431a15b4e SHA1 31eb7af239a0042f887b5089a7c6c7ec5d6662e9 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38
 AUX proofd.initd 717 RMD160 2ff4ca04e838b171b1a60941ba3aded645a67147 SHA1 80cd4f6fd1e818edf27368b1175ed504e2c619a6 SHA256 341d1b4cd09731c506e97278959e6b669d63d65efb036070ecd4f31b01f34305
 AUX root-5.26.00-make-3.82.patch 1638 RMD160 9c29d5b32a65f181ffd10964113e290b70d20130 SHA1 2ada31318bc631b4442a1a79a4644a8de5c86b9c SHA256 0c94fc3f8bb8eb009465913f2ee20eefc510468643c04d2aad8cc40341fde457
+AUX root-5.26.00e-libpng15.patch 1261 RMD160 6fa4b2a6c20f0a0eb7cca381045074c5f2d27ed7 SHA1 598abe303d20b1d3029080af8c60498211840b1c SHA256 94fd93a4e9081ef8070e2bcaeb09f169ae4475689fe4987c3a9acfec879a45f2
 AUX root-5.28.00b-asneeded.patch 712 RMD160 0b3a3d41e309f13310fda607955ad88cc6bc176e SHA1 4fa704d2790e19933155da2587a9c6998d3c4e4f SHA256 17d1d41d8c7f78abbb7cd284af0a6aca544820db72fa72956b473c7c1817a96b
 AUX root-5.28.00b-glibc212.patch 276 RMD160 02901df4c8e5e3c7d50a78916f843fde83faf1f0 SHA1 842129d6247255b5fa72778a12f08e1383247cd8 SHA256 e51e127a80e2bf1afad41c2b7ca5233c362bce017057ca489bedb2a9442efb62
 AUX root-5.28.00b-nobyte-compile.patch 5483 RMD160 490801842ba9ca6c980e498224d48dc676fcf0fa SHA1 538ac62083b8b12c558b97d72235dd047a64b632 SHA256 81b015dd6c122176fbc3103c75f62b7b1c3db569ad6d461ca544248f4e017b5c
@@ -26,14 +27,18 @@ DIST root_v5.26.00.source.tar.gz 29209345 RMD160 bf7f91abd76ec86f69eb80506291cb8
 DIST root_v5.26.00e.source.tar.gz 28922785 RMD160 692312a1984279255e32c96a0a79b974ff2e2971 SHA1 5a4b7e1b759dfef0dd218491bbe74ca376fc8c07 SHA256 7f2604954775653825b9897da131278c9b349f12d77b1fc087004c1b838f4a80
 DIST root_v5.28.00d.source.tar.gz 31145040 RMD160 f3a25f9c6ae5cd4d4ad511d6707adf0845bbfac5 SHA1 b932d9b2ebfe66a28333b5b9ef90ab0e877173d8 SHA256 2e485140cd786725ded68296f0629c7e1e498a167d80e8c812fe28ceca04ff60
 EBUILD root-5.26.00-r2.ebuild 8982 RMD160 f84b6392dfcdeaa4b696f31cc10d29a4a1dd4743 SHA1 5a894eb684a008ffc990fbbea6e070ea2b212f0e SHA256 b579cc245d98c76b6a22094c5f393061ae6aeb0b0666f0825428decea7550e9a
-EBUILD root-5.26.00e-r1.ebuild 9260 RMD160 1f3673ddb5190e233ce5aa09345dd94641479a36 SHA1 4404bc050e234638b8309f8fac9d8df8240296cf SHA256 99065c72bb48c1fd9b874107aed82d655d7309382a8d7baa715723ff57f66dab
+EBUILD root-5.26.00e-r1.ebuild 9303 RMD160 9ac2cc783cb5c71ddfe6d79ef2da6f58882c29d0 SHA1 751fc1ec72b84192797d939ab5137cc455dfb544 SHA256 6829126cc7b7e6a93bc2360f67ecb6e358f9eb44b09b433e7a307679d2b4b0d0
 EBUILD root-5.28.00d.ebuild 10025 RMD160 65ff9bdba7257ccfd6734a3bbcb58b3f18777194 SHA1 363e8e381f757f5719c1ca41c322e0416b07b6d9 SHA256 7081183857331522101f13346c6ca8e211e4799b0c5a262f56afb571eb0f838a
-MISC ChangeLog 23509 RMD160 0ff9f847d9a30dabfc605ccfd06de48aa5532c4e SHA1 0fbacbf87f9611447b4fadfc5494521be45f5f03 SHA256 2389b27333e07377a0c221a0f0e94f49832eee06832e6624dcbd814f371dac64
+MISC ChangeLog 23691 RMD160 af041705e361b3fa4bba451791e8222a40fb0856 SHA1 9974f9c7ac8a46d2d9fc9ee4ac666ce96e99d0a4 SHA256 d309516e1061b316b9401b69b87524eb8e1545af1d708c5719ac3f5c0920d231
 MISC metadata.xml 1657 RMD160 ff8795d208ad4d5523d1984e740aaeaddbd9ae0a SHA1 d616a5f8671b19e4acc62d057d93d265b1833b5a SHA256 73189848145c6d863981271afb727790903aa4e4ef0ddc2b3cbbd13cd52c8e9a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4Aq1sACgkQgAnW8HDreRaRzQCfYKKkxbc/cH005kvX3mZmzEi5
-VB4AoLzvDk+b2eyZygJusP656aJAoxDq
-=FBGA
+iQEcBAEBAgAGBQJOnaq8AAoJEEdUh39IaPFN/bkH+gONJCdPS61HeW/crO/yDRAZ
+GeZHi/KREA+T5LKJRa/LIK+QOAuFQXcQZlNYCjecuR4+mkPCEMWtTLEjfQAkRXpW
+QeiBR8eWvfJngoHQPHjI9ojrjtV0/nP5xFUOt39nl5xa69lIJ6Fe6GffwYUACc71
+bFapeUwlmcykGoiax1ofejv7V8qcHY8l8jOl1qhOfmYuFBeOXxHU3K8WlkMbmuUk
+zgG4HBd2YzhM/VWY7Eh+VyIIK2ZZ9Tpd48frzmnrmU3w4/OCV0wegNKD5Ssj1q5f
+nATSe0xPYQobsWO8pfLyspB5b8NWB7FEjzSOxzp0mmCkLDn63GX0h+9hAwvf5os=
+=noyv
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/root/files/root-5.26.00e-libpng15.patch b/sci-physics/root/files/root-5.26.00e-libpng15.patch
new file mode 100644
index 000000000000..91ed9c428ef1
--- /dev/null
+++ b/sci-physics/root/files/root-5.26.00e-libpng15.patch
@@ -0,0 +1,33 @@
+This patch is a copy from media-libs/libafterimage.
+
+--- graf2d/asimage/src/libAfterImage/export.c
++++ graf2d/asimage/src/libAfterImage/export.c
+@@ -496,7 +496,7 @@
+ 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+     if ( png_ptr != NULL )
+     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
+-			if( setjmp(png_ptr->jmpbuf) )
++			if( setjmp(png_jmpbuf(png_ptr)) )
+ 			{
+ 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
+ 				info_ptr = NULL ;
+--- graf2d/asimage/src/libAfterImage/import.c
++++ graf2d/asimage/src/libAfterImage/import.c
+@@ -1251,7 +1251,7 @@
+ 			 * the normal method of doing things with libpng).  REQUIRED unless you
+ 			 * set up your own error handlers in the png_create_read_struct() earlier.
+ 			 */
+-			if ( !setjmp (png_ptr->jmpbuf))
++			if ( !setjmp (png_jmpbuf(png_ptr)))
+ 			{
+ 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
+ 
+@@ -1468,7 +1468,7 @@
+ 
+ static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+-   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
++   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
+    memcpy(data, buf->buffer, length);
+    buf->buffer += length;
+ }
diff --git a/sci-physics/root/root-5.26.00e-r1.ebuild b/sci-physics/root/root-5.26.00e-r1.ebuild
index 3ce30e5d174a..c06df397abb7 100644
--- a/sci-physics/root/root-5.26.00e-r1.ebuild
+++ b/sci-physics/root/root-5.26.00e-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-physics/root/root-5.26.00e-r1.ebuild,v 1.10 2011/06/21 14:31:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00e-r1.ebuild,v 1.11 2011/10/18 16:35:29 ssuominen Exp $
 
 EAPI=3
 
@@ -111,7 +111,8 @@ src_prepare() {
 		"${WORKDIR}"/${P}-configure-paths.patch \
 		"${WORKDIR}"/${P}-nobyte-compile.patch \
 		"${WORKDIR}"/${P}-glibc212.patch \
-		"${WORKDIR}"/${P}-xrootd-prop-flags.patch
+		"${WORKDIR}"/${P}-xrootd-prop-flags.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 
 	# use system cfortran
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc