Fix building with libpng15 wrt #378189 by Diego Elio Pettenò

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

diff --git a/sci-libs/pgplot/ChangeLog b/sci-libs/pgplot/ChangeLog
index 1822f47536f8ec875dfe51353e873776f7c0aca2..c50966fe9f39060834148936ec2d78a369c47d3f 100644 (file)
--- a/sci-libs/pgplot/ChangeLog
+++ b/sci-libs/pgplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/pgplot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.22 2011/06/21 15:14:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.23 2011/09/14 16:01:26 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +files/pgplot-libpng15.patch, pgplot-5.2.2-r4.ebuild:
+  Fix building with libpng15 wrt #378189 by Diego Elio Pettenò
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> pgplot-5.2.2-r3.ebuild,
   pgplot-5.2.2-r4.ebuild:

diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index bcec52bb3142e4ecad182bd87aed638ecdd23e97..88f9cc8ea9e4d7d49dcde1d663c2c06afd025ff3 100644 (file)
--- a/sci-libs/pgplot/Manifest
+++ b/sci-libs/pgplot/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX pgplot-compile-setup.patch 3034 RMD160 bb694b1a549b285144ae8e197423d412d123bf3d SHA1 3c72b4c09c68f43865ef03ac92313c124f9827db SHA256 d42ec9479298e8a4a2acb0165d457422fa484a700ac05e53b90dde786c1a044f
 AUX pgplot-drivers.patch 7431 RMD160 d300ecf9d5ed3b3117465330e4c235a3f17d0540 SHA1 d1cd686dd0f93b7550affe1e0d4d36f0a336b440 SHA256 19cabb29fd05c2c44cbb0492167ee3e45ab8890390b1e98de672f2ca2588baed
 AUX pgplot-headers.patch 2716 RMD160 aaad73bfbea9b4f731346a02c390e0adc318f8d0 SHA1 e6b95497b519a5450a24bb5997e18019c73e33eb SHA256 e92a07e38fff278218c09b84453d5c75be663576bdbe19ed9259615bd7a0be7c
 AUX pgplot-ldflags.patch 1005 RMD160 b7dbadeb1ccac887083c76b570acd80749b5163d SHA1 58ddaaa152777ff613df92b37982fb727f961941 SHA256 5d065415a304fb5650fc3db1294961b1208a75f0b72e0af34edc3e88dbe3b31d
+AUX pgplot-libpng15.patch 370 RMD160 c8c76b783ed5b4e9a01110b6f209dfbb8e8ca9a0 SHA1 586ad56ec8cfec1aa952b3eff440e03a46feadbf SHA256 6cc1734ed629c0d93f25509be87ed1285fd8f49e8c5e036cd870075a5de8947c
 AUX pgplot-makemake.patch 4455 RMD160 5535ad4a42795d3395a79bbea5fd5dbe6357cd5f SHA1 e16937eebade8ae14d8242c9c37715f1dc260163 SHA256 c1a02f579910b793dcd6c9da606c0091ba6ff2f4f36a5a1661c9793371501bb4
 AUX pgplot-pgdisp.patch 332 RMD160 1bd3c2ed7770bb60be19c50c4610c35d67bf92e9 SHA1 891475823d011156aa919fc2b844d1786ae6d85f SHA256 3aac6127d35f4039023a13182553b24e1902d6e1b46530fbd68e034357d0b078
 DIST pgplot522.tar.gz 1197397 RMD160 4c21cad6613772f4104c65ac3d8d9a42e3c4afe1 SHA1 1f1c9aa17eeec9a2fb23fd15a0e4a91dcc49ddc1 SHA256 a5799ff719a510d84d26df4ae7409ae61fe66477e3f1e8820422a9a4727a5be4
 EBUILD pgplot-5.2.2-r3.ebuild 4608 RMD160 add0f34632ae98936843abe71e846bc2c2353b2c SHA1 aaf5afb6a9ad944a9cbf0fc16ecacfbbe8f6dcb5 SHA256 b44eddfa4bda20eb1ea14605b124f6f5f4a6d47cecfa87fae6f867c9c9eadfac
-EBUILD pgplot-5.2.2-r4.ebuild 4657 RMD160 6a4a786259f44377e1ee67b123c2b87e1f933256 SHA1 de4d77086440829ac4a0f3e5c6709b264b24513b SHA256 91fdfe83ab779a87fac5b285544ffee15d4eee32dc0911b1674fa42f5c7f7d6e
-MISC ChangeLog 4088 RMD160 de4176324576c0d51c3e178e03c072a45f3aa9c9 SHA1 2c297bbe4f8cbdf51bb1bf062a8bc813bd4272ca SHA256 70e4f6bf948e3cc81cccb4cf414cbb84b30132a5be923ac81cc4b211b5a8b2b4
+EBUILD pgplot-5.2.2-r4.ebuild 4687 RMD160 454ed5033e0d3a36627ae1683475019e7b74c915 SHA1 0fdd4a18427dbe3bf2540ed9f46d17e8a77e89bd SHA256 c0c5627b0852cd970c8ca0cc068bb3d01fb23023f8cfca7e72be37b6ddb5b056
+MISC ChangeLog 4268 RMD160 935c0df7058a0e61de87de21433b88d853c21d28 SHA1 f341261c14d99c5ecab29953879b785e8b72eadc SHA256 9817e0ac42b371692200896498978cad20238ab240545ae1677c0567a1b39710
 MISC metadata.xml 517 RMD160 27e91597c28b40b94a27548baeb7d1c6768eff77 SHA1 cabae2f60e330d39b41be431df8cf8b4ff84c642 SHA256 c0a4ba04ced31cde679aa0a17c19d313bbe9a5d4cd0771ba9b4af968c92c79f1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4AtXkACgkQgAnW8HDreRZvugCfaukJ6c+aOCdJM6jeIQTvKxhI
-GtgAnA9ytVyd2fl/Za5JlqdG3DEIKzuq
-=Kf9o
+iF4EAREIAAYFAk5w0AwACgkQXkR9YqOcLPHgcgD9EshmenwIphat8cofJviPFjAm
+YwL/FNkau87ORCnWGPYA/3K3lTS4igO2gRWr0KTYJK/IXClDCaviVfKaMIkAt9f1
+=9ObO
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/pgplot/files/pgplot-libpng15.patch b/sci-libs/pgplot/files/pgplot-libpng15.patch
new file mode 100644 (file)
index 0000000..b1064cb
--- /dev/null
+++ b/sci-libs/pgplot/files/pgplot-libpng15.patch
@@ -0,0 +1,11 @@
+--- drivers/pndriv.c
++++ drivers/pndriv.c
+@@ -222,7 +222,7 @@
+       return;
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf)) { /* not really sure what I'm doing here... */
++  if (setjmp(png_jmpbuf(png_ptr))) {
+       fprintf(stderr,"%s: error in libpng while writing file %s, plotting disabled\n", png_ident, filename);
+       png_destroy_write_struct(&png_ptr,&info_ptr);
+       dev->error = true;

diff --git a/sci-libs/pgplot/pgplot-5.2.2-r4.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r4.ebuild
index 1017a17313b49a5f3a14d8dbae22a3f59b295a97..1202702b5242f5109da98e90a1c5424a518f501e 100644 (file)
--- a/sci-libs/pgplot/pgplot-5.2.2-r4.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r4.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-libs/pgplot/pgplot-5.2.2-r4.ebuild,v 1.4 2011/06/21 15:14:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r4.ebuild,v 1.5 2011/09/14 16:01:26 ssuominen Exp $
 
 EAPI=2
 inherit eutils fortran-2 toolchain-funcs
@@ -23,14 +23,16 @@ RDEPEND="
 DEPEND="${RDEPEND}
        doc? ( virtual/latex-base )"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 src_prepare() {
-       epatch "${FILESDIR}"/${PN}-drivers.patch
-       epatch "${FILESDIR}"/${PN}-makemake.patch
-       epatch "${FILESDIR}"/${PN}-compile-setup.patch
-       epatch "${FILESDIR}"/${PN}-headers.patch
-       epatch "${FILESDIR}"/${PN}-ldflags.patch
+       epatch \
+               "${FILESDIR}"/${PN}-drivers.patch \
+               "${FILESDIR}"/${PN}-makemake.patch \
+               "${FILESDIR}"/${PN}-compile-setup.patch \
+               "${FILESDIR}"/${PN}-headers.patch \
+               "${FILESDIR}"/${PN}-ldflags.patch \
+               "${FILESDIR}"/${PN}-libpng15.patch
 
        # gfortran < 4.3 does not compile gif, pp and wd drivers
        if [[ "$(tc-getFC)" == gfortran ]] &&