diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2008-04-12 08:48:56 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2008-04-12 08:48:56 +0000 |
| commit | deaa5a7f521c0ee0b5e66c03ebe0fafebda91e70 (patch) | |
| tree | 7eee0b64eb553c0492dcf27452964d2a3efc4d72 /dev-ruby/ruby-gtk2 | |
| parent | Stable on ppc wrt bug 217235 (diff) | |
| download | gentoo-2-deaa5a7f521c0ee0b5e66c03ebe0fafebda91e70.tar.gz gentoo-2-deaa5a7f521c0ee0b5e66c03ebe0fafebda91e70.tar.bz2 gentoo-2-deaa5a7f521c0ee0b5e66c03ebe0fafebda91e70.zip | |
Fix #215634
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-ruby/ruby-gtk2')
| -rw-r--r-- | dev-ruby/ruby-gtk2/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-ruby/ruby-gtk2/files/ruby-gtk2-0.16.0-iconview-get-path.patch | 15 | ||||
| -rw-r--r-- | dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r3.ebuild | 20 |
3 files changed, 44 insertions, 1 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/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 ) |