Fix building with libpng15 wrt #387393 by Jakub Paluszak

(Portage version: 2.2.0_alpha67/cvs/Linux x86_64)

3 files changed, 31 insertions, 4 deletions

diff --git a/dev-ruby/ruby-libart2/ChangeLog b/dev-ruby/ruby-libart2/ChangeLog
index 773e67c29112..377a7bad73cb 100644
--- a/dev-ruby/ruby-libart2/ChangeLog
+++ b/dev-ruby/ruby-libart2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby-libart2
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-libart2/ChangeLog,v 1.55 2010/10/22 13:56:01 graaff Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-libart2/ChangeLog,v 1.56 2011/10/17 14:33:32 ssuominen Exp $
+
+  17 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  ruby-libart2-0.19.4.ebuild, +files/ruby-libart2-0.19.4-libpng15.patch:
+  Fix building with libpng15 wrt #387393 by Jakub Paluszak
 
   22 Oct 2010; Hans de Graaff <graaff@gentoo.org>
   -ruby-libart2-0.19.1.ebuild, -ruby-libart2-0.19.3.ebuild:
diff --git a/dev-ruby/ruby-libart2/files/ruby-libart2-0.19.4-libpng15.patch b/dev-ruby/ruby-libart2/files/ruby-libart2-0.19.4-libpng15.patch
new file mode 100644
index 000000000000..fbfd609b096c
--- /dev/null
+++ b/dev-ruby/ruby-libart2/files/ruby-libart2-0.19.4-libpng15.patch
@@ -0,0 +1,19 @@
+--- libart/src/rbart_canvas.c
++++ libart/src/rbart_canvas.c
+@@ -15,6 +15,7 @@
+ 
+ #include <jpeglib.h>
+ #include <png.h>
++#include <zlib.h> /* Z_BEST_COMPRESSION */
+ 
+ #define ART_CANVAS_PNG_INTERLACE_ADAM7 1
+ #define ART_CANVAS_ALPHA_MASK 2
+@@ -352,7 +353,7 @@
+         return Qnil;
+     }
+ 
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+     {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         return Qnil;
diff --git a/dev-ruby/ruby-libart2/ruby-libart2-0.19.4.ebuild b/dev-ruby/ruby-libart2/ruby-libart2-0.19.4.ebuild
index ad337481b2e0..0300a98ba44c 100644
--- a/dev-ruby/ruby-libart2/ruby-libart2-0.19.4.ebuild
+++ b/dev-ruby/ruby-libart2/ruby-libart2-0.19.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-libart2/ruby-libart2-0.19.4.ebuild,v 1.5 2010/10/20 21:58:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-libart2/ruby-libart2-0.19.4.ebuild,v 1.6 2011/10/17 14:33:32 ssuominen Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -17,3 +17,7 @@ DEPEND="${DEPEND}
 	dev-util/pkgconfig"
 
 ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+}