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

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

diff --git a/net-analyzer/bwbar/ChangeLog b/net-analyzer/bwbar/ChangeLog
index 907f996c2854fdf64bdf59ed30db70642da08fb3..cc75eadf7927b5a7ed6ab1b3a97d633ca7822830 100644 (file)
--- a/net-analyzer/bwbar/ChangeLog
+++ b/net-analyzer/bwbar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/bwbar
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwbar/ChangeLog,v 1.7 2008/05/15 01:40:34 rich0 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwbar/ChangeLog,v 1.8 2011/08/07 23:12:32 ssuominen Exp $
+
+  07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> bwbar-1.2.3.ebuild,
+  +files/bwbar-1.2.3-libpng15.patch:
+  Fix building with libpng15 wrt #378145 by Diego Elio Pettenò
 
   15 May 2008; Richard Freeman <rich0@gentoo.org> bwbar-1.2.3.ebuild:
   keyword ~amd64 - 205978

diff --git a/net-analyzer/bwbar/Manifest b/net-analyzer/bwbar/Manifest
index b40b493997854be769e1f4a9c36ba844c04fccdc..52b3e1ecbd715b95240f1511d7070fa1736edb9c 100644 (file)
--- a/net-analyzer/bwbar/Manifest
+++ b/net-analyzer/bwbar/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX bwbar-1.2.3-libpng15.patch 341 RMD160 1c246345f614efd53e9c494f41082f2bd0a30dcf SHA1 dfcbc30c2732c37bda16419f9fb879061c8078fa SHA256 b1a7d3c692e65557ddaa4f0969a09d86a582eb41445e829c5c9f5b9069caf29d
 DIST bwbar-1.2.3.tar.bz2 30202 RMD160 bbd7219ff917243abd48002ed6392e1c624700df SHA1 5b8e0977cb14db5e39fce323e54e11a4417521e0 SHA256 d82f8ba7defbdb9ae6671cbd7a064597a2a717ee6eeb32df6093403e8a86d1c1
-EBUILD bwbar-1.2.3.ebuild 529 RMD160 08ed9da6b631eb600ec8fe223d16362ee419c401 SHA1 3f7c65006b26b5578c61425ec7f8ccae11cd390f SHA256 5d998d65b813a2ec606a18431f02fa983f4f2cc2b26006c3b1a9b079130e9ca1
-MISC ChangeLog 1067 RMD160 b2b0d31ff70d69b08f58c4319c8e468f92021490 SHA1 df6265aea804c66f5b81c6906fe0c8c07c7a5c3d SHA256 7bd49e4b9dcb5ad078ed075dcf23e32d615ab47361d8dba94e0eb641bee62a33
+EBUILD bwbar-1.2.3.ebuild 646 RMD160 177658483a8fed20fb17ab706f8ef5f7f6d9bc22 SHA1 e9e978273103a21bd8c1246406a839a5397fe425 SHA256 e5ee846229642d193a3c2a665316f86314a3792586c30b84d991475cbb68f770
+MISC ChangeLog 1247 RMD160 18587b5f0dcc5487318f4dda76ba331af2496e18 SHA1 29c7c6066895226382677c88bad6ee6cf98e5a76 SHA256 d4f93ec10ec985e7fa12f356e9b2c1d606a7110114fda7f50b7a75a505b9baa9
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk4/G+YACgkQXkR9YqOcLPEnQgEApQyygyMrkFA1jk7X8meksc/6
+f38mNAwnEzfUeNgAVpYBAIamUTj+maMZipklfeqK8Q+7zulinPWFsM8xSSL1cmfy
+=+ECr
+-----END PGP SIGNATURE-----

diff --git a/net-analyzer/bwbar/bwbar-1.2.3.ebuild b/net-analyzer/bwbar/bwbar-1.2.3.ebuild
index 46ebcfb3de893011cec7518060d906799c0d45ef..062184846f462b147040d143db24cd17d6dbfaa3 100644 (file)
--- a/net-analyzer/bwbar/bwbar-1.2.3.ebuild
+++ b/net-analyzer/bwbar/bwbar-1.2.3.ebuild
@@ -1,15 +1,25 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwbar/bwbar-1.2.3.ebuild,v 1.3 2008/05/15 01:40:34 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwbar/bwbar-1.2.3.ebuild,v 1.4 2011/08/07 23:12:32 ssuominen Exp $
+
+EAPI=4
+inherit eutils
 
 DESCRIPTION="The kernel.org \"Current bandwidth utilization\" bar"
 HOMEPAGE="http://www.kernel.org/pub/software/web/bwbar/"
 SRC_URI="mirror://kernel/software/web/bwbar/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
-DEPEND="media-libs/libpng"
+
+RDEPEND=">=media-libs/libpng-1.2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-libpng15.patch
+}
 
 src_install() {
        dobin bwbar

diff --git a/net-analyzer/bwbar/files/bwbar-1.2.3-libpng15.patch b/net-analyzer/bwbar/files/bwbar-1.2.3-libpng15.patch
new file mode 100644 (file)
index 0000000..1bd31e3
--- /dev/null
+++ b/net-analyzer/bwbar/files/bwbar-1.2.3-libpng15.patch
@@ -0,0 +1,19 @@
+--- bwbar.c
++++ bwbar.c
+@@ -30,6 +30,7 @@
+ #include <alloca.h>
+ #include <getopt.h>
+ #include <png.h>
++#include <zlib.h>
+ 
+ void skipline(FILE *f)
+ {
+@@ -79,7 +80,7 @@
+   if ( !info_ptr )
+     goto barf;
+ 
+-  if ( setjmp(png_ptr->jmpbuf) ) {
++  if ( setjmp(png_jmpbuf(png_ptr)) ) {
+     status = 1;
+     goto barf;                        /* libpng abort */
+   }