Fix #215634

Package-Manager: portage-2.1.4.4

4 files changed, 50 insertions, 5 deletions

diff --git a/dev-ruby/ruby-gtk2/ChangeLog b/dev-ruby/ruby-gtk2/ChangeLog
index 7d6cbb37dab5..3217c34893ee 100644
--- a/dev-ruby/ruby-gtk2/ChangeLog
+++ b/dev-ruby/ruby-gtk2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/ruby-gtk2
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtk2/ChangeLog,v 1.58 2008/03/28 06:53:06 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtk2/ChangeLog,v 1.59 2008/04/12 08:48:56 graaff Exp $
+
+*ruby-gtk2-0.16.0-r3 (12 Apr 2008)
+
+  12 Apr 2008; Hans de Graaff <graaff@gentoo.org>
+  +files/ruby-gtk2-0.16.0-iconview-get-path.patch,
+  +ruby-gtk2-0.16.0-r3.ebuild:
+  Fix crash on amd64 related to iconview; thanks for John Keeping in bug 215634
+  for providing the patch."
 
   28 Mar 2008; Hans de Graaff <graaff@gentoo.org> -ruby-gtk2-0.14.1.ebuild,
   -ruby-gtk2-0.15.0.ebuild, -ruby-gtk2-0.16.0.ebuild,
diff --git a/dev-ruby/ruby-gtk2/Manifest b/dev-ruby/ruby-gtk2/Manifest
index 6e5195a60ecd..790c34f37ba9 100644
--- a/dev-ruby/ruby-gtk2/Manifest
+++ b/dev-ruby/ruby-gtk2/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA1
 
 AUX ruby-gtk2-0.16.0-format-string.patch 707 RMD160 be61bb6c29aa907aa08fe781c6f06d80171651e9 SHA1 6bf0c8ffe3d520fab981b3e055b150a213b4ba61 SHA256 f8023d997396ba31383f5a23ec661955dae3a2710ac8666d9ece5eaaf11bd82f
+AUX ruby-gtk2-0.16.0-iconview-get-path.patch 627 RMD160 e7927a4a7b9434888c58762b2913fc84b35fac99 SHA1 4c6ea571ce6dcdf82ded605bf3442b3a6942b2ed SHA256 ed0b256e6389b1ca6ce5f0725bd8050a2f4855a6906455a73d6b98b8f963aaf4
 AUX ruby-gtk2-0.16.0-typedef.patch 549 RMD160 3af4208381e939c74e64c33708b16cb13c775f52 SHA1 a5dc6d0ebd9d0b453c128d4a60d5a2a98dc8a893 SHA256 4b0cf22b2a80bbc921cd5791cb26366411c7954cbf6eebd627fea4f95c3ff14f
 DIST ruby-gnome2-all-0.16.0.tar.gz 1208856 RMD160 c83c7cdcf633ad5cc213180f641a6c8f18002a9c SHA1 488f6c1f139060e005f336c9c854c4dc5b3e6b7c SHA256 0910f08c5224bc39aad66c46b506e5c97e260475ede6b427d5365a9ef2d69ad4
 EBUILD ruby-gtk2-0.16.0-r2.ebuild 625 RMD160 729803be361eb6594a5eb5a1b18fed378f4942f7 SHA1 1c85711746c0e03704f4c5c806f4f83389ca536a SHA256 8768157e205fb3c016d2f91772bcf0577c9b73055739e97ec974db3b04b1f2d6
-MISC ChangeLog 8089 RMD160 ff6ea511af9f125db8c35d192357ba2f22641a5e SHA1 2c7a7750891d1a60ea3b0ba45c4759ed66e9b08f SHA256 85dd1cf05e9c6a8d962cabbfd60f235445e99ee379b7e9912a853e18bc6736c8
+EBUILD ruby-gtk2-0.16.0-r3.ebuild 680 RMD160 71e7a2243561933837a91dc7542dc39b2717d54f SHA1 e89a8fff7b90ae1a545e9eac9afd3490f423b777 SHA256 ad49e9820c99c644ddbd83f5d15134b3b5a8a794f6127f285d846c8d03002e4b
+MISC ChangeLog 8366 RMD160 18142be12123dc352d1dfd49645cf49927ceb9ce SHA1 1960af2b85e4b4b5e463be41df4d2f745323800f SHA256 a12dc0ae577e28409bbf8654ee3f6581d514201998f7508473d7b186655c032c
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH7JXYQUozDL2JlH4RAlHWAJ9vZD2jjWtxgQ5wPOVVZNMu+7r/JgCeMzsH
-JS8dRhbg7YDci+oopSGwrDI=
-=H7UX
+iD8DBQFIAHeEQUozDL2JlH4RAnpgAJ9tkmcPGrTEIJxVj+IWxpC1yQvVwQCePqJs
+5TQdo0yfeePB8GDXzpP2B3A=
+=0pLC
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-gtk2/files/ruby-gtk2-0.16.0-iconview-get-path.patch b/dev-ruby/ruby-gtk2/files/ruby-gtk2-0.16.0-iconview-get-path.patch
new file mode 100644
index 000000000000..1af1974dc7d1
--- /dev/null
+++ b/dev-ruby/ruby-gtk2/files/ruby-gtk2-0.16.0-iconview-get-path.patch
@@ -0,0 +1,15 @@
+Declare missing function parameters. This fixes a crash on amd64, see
+bug 215634. This patch has been applied upstream.
+
+diff -Naur ./gtk/src/rbgtkiconview.c ../ruby-gnome2-all-0.16.0/gtk/src/rbgtkiconview.c
+--- ./gtk/src/rbgtkiconview.c	2008-03-31 20:18:48.000000000 +0100
++++ ../ruby-gnome2-all-0.16.0/gtk/src/rbgtkiconview.c	2008-03-31 20:18:03.000000000 +0100
+@@ -54,6 +54,8 @@
+ static VALUE
+ iview_get_path_at_pos(self, x, y)
+     VALUE self;
++    VALUE x;
++    VALUE y;
+ {
+     GtkTreePath* path = gtk_icon_view_get_path_at_pos(_SELF(self),
+                                                       NUM2INT(x), NUM2INT(y));
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r3.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r3.ebuild
new file mode 100644
index 000000000000..02828490bb3a
--- /dev/null
+++ b/dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r3.ebuild,v 1.1 2008/04/12 08:48:56 graaff Exp $
+
+inherit ruby ruby-gnome2
+
+DESCRIPTION="Ruby Gtk2 bindings"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+USE_RUBY="ruby18 ruby19"
+DEPEND=">=x11-libs/gtk+-2"
+RDEPEND="${DEPEND}
+	dev-ruby/ruby-gdkpixbuf2
+	>=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-pango-${PV}
+	>=dev-ruby/ruby-atk-${PV}"
+
+PATCHES=( "${FILESDIR}"/ruby-gtk2-0.16.0-typedef.patch
+	"${FILESDIR}"/ruby-gtk2-0.16.0-format-string.patch
+	"${FILESDIR}"/${P}-iconview-get-path.patch )