From e8937c4a40ca92a0bee5cbce7861abc5fd613639 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 17 Oct 2011 14:33:32 +0000 Subject: [PATCH] Fix building with libpng15 wrt #387393 by Jakub Paluszak Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64 --- dev-ruby/ruby-libart2/ChangeLog | 8 ++++++-- dev-ruby/ruby-libart2/Manifest | 19 ++++++++++++------- .../files/ruby-libart2-0.19.4-libpng15.patch | 19 +++++++++++++++++++ .../ruby-libart2/ruby-libart2-0.19.4.ebuild | 8 ++++++-- 4 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 dev-ruby/ruby-libart2/files/ruby-libart2-0.19.4-libpng15.patch 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 + 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 -ruby-libart2-0.19.1.ebuild, -ruby-libart2-0.19.3.ebuild: diff --git a/dev-ruby/ruby-libart2/Manifest b/dev-ruby/ruby-libart2/Manifest index 68fc20ae41e1..2d11b23c02e8 100644 --- a/dev-ruby/ruby-libart2/Manifest +++ b/dev-ruby/ruby-libart2/Manifest @@ -1,14 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 +AUX ruby-libart2-0.19.4-libpng15.patch 449 RMD160 38a6439e0c125f63eae6a0a056fc0fb6fe95f806 SHA1 66e1991fe886aaf6a7eeab80fd69125c4723ffc9 SHA256 727f8db7d83a1ce2e47384fa50f557d4a7ded635e1efd8c0ad3ed37620be9660 DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 RMD160 11a102c28d00f8f5a7b2baeb2370a6d794cfb7d9 SHA1 6fbaf51cced8cc15158144e15898244f2ebf6870 SHA256 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf -EBUILD ruby-libart2-0.19.4.ebuild 533 RMD160 d580428be1c818f1944d5a686090f4bb82a4fb0e SHA1 11d3831522f9c3a5954f5072d302429be5e41f2f SHA256 7c10c4a0567b1ee596e2bd6eddacb06476f59953489f43ffb01dc71a455e5c35 -MISC ChangeLog 7132 RMD160 02cd718f1109bc65a45a5072be1bf2f4fd2d0ceb SHA1 c6715c73e4ada000043c2bf7e806a883a5fda29b SHA256 8031566ba43a7783ff2630dfe31ba02108c8cad26226fe8db1652fe9a08337f8 +EBUILD ruby-libart2-0.19.4.ebuild 602 RMD160 d04f6f264a474dff151d8c69bca38857d9697944 SHA1 881330455bd865e709b7b85648b214be054430cf SHA256 e9a99ab3b791e6820f115e2492df6f8caa9178a69ceaaa213b23f2dbb0d7ecd2 +MISC ChangeLog 7322 RMD160 7b021d41a67113fa3c9a40f592f9ebde794d4756 SHA1 4f570ecb5725003e6b4929ba0ca02d3b57e8a2b6 SHA256 a7bd5ead4848db8b2421f28ea776cb6928a9aa9196a1dd82e117fd8972700354 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAkzBl/cACgkQZihJkut28SsHrwD+OFf8vTOd8e41Csd3ij9D4Ivo -36zLmEiUkzDEls8gHNEA/jLa+AVhdnrCy2rhdwidtFKkRtfdu1wkdNIdTvGdXOnA -=C7hk +iQEcBAEBAgAGBQJOnDytAAoJEEdUh39IaPFN2yUIAKPIqn3Fv1+Fd0ltSZ8vB43q +SEZLKTu9LkpVPy/a/gfyJ2FJwWmIpXES9f70Ygf5WpTFqjk3jaLzs4iJ60m/0RQ2 +8DV3X6VxfIh3phYkUCVZgMvHYeAIfgqVynW0m66FKStTU65bpR5L8dcCjTaqWRv/ +jG9c7K3Y+NBJJWOdhoVbZeT2dSQ//0xjgujQzbF3QCthDkvkXygIEy0gch8rVRIS +OwvNYrknWgl2k8a8Hnzwdr8SFHncKfCBAXYpscPIpa07GRUx25aWinfDhf/qOyzz +ZycyUlgGmFwt3tsN0xRZ7vMbxiQgVEsj+BjwPR/XD9DgzQJzicXYKWypPcZM9sE= +=T1Hd -----END PGP SIGNATURE----- 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 + #include ++#include /* 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 +} -- 2.26.2