Author: tilman Date: 2006-01-29 21:46:38 +0100 (Sun, 29 Jan 2006) New Revision: 631 Added: crux-2.1/ports/opt/ruby-gtk/ crux-2.1/ports/opt/ruby-gtk/ruby-gtk.diff Removed: crux-2.1/ports/attic/ruby-gtk/ Modified: crux-2.1/ports/opt/ruby-gtk/.footprint crux-2.1/ports/opt/ruby-gtk/.md5sum crux-2.1/ports/opt/ruby-gtk/Pkgfile Log: ruby-gtk: assumed maintainership, bumped to 0.14.1 Copied: crux-2.1/ports/opt/ruby-gtk (from rev 474, crux-2.1/ports/attic/ruby-gtk) Modified: crux-2.1/ports/opt/ruby-gtk/.footprint =================================================================== --- crux-2.1/ports/attic/ruby-gtk/.footprint 2005-12-31 11:17:11 UTC (rev 474) +++ crux-2.1/ports/opt/ruby-gtk/.footprint 2006-01-29 20:46:38 UTC (rev 631) @@ -15,6 +15,8 @@ -rwxr-xr-x root/root usr/lib/ruby/site_ruby/1.8/linux/gtk20.so -rwxr-xr-x root/root usr/lib/ruby/site_ruby/1.8/linux/gtk22.so -rwxr-xr-x root/root usr/lib/ruby/site_ruby/1.8/linux/pango.so +-rw-r--r-- root/root usr/lib/ruby/site_ruby/1.8/linux/rbatk.h +-rw-r--r-- root/root usr/lib/ruby/site_ruby/1.8/linux/rbatkversion.h -rw-r--r-- root/root usr/lib/ruby/site_ruby/1.8/linux/rbglib.h -rw-r--r-- root/root usr/lib/ruby/site_ruby/1.8/linux/rbgobject.h -rw-r--r-- root/root usr/lib/ruby/site_ruby/1.8/linux/rbgtk.h Modified: crux-2.1/ports/opt/ruby-gtk/.md5sum =================================================================== --- crux-2.1/ports/attic/ruby-gtk/.md5sum 2005-12-31 11:17:11 UTC (rev 474) +++ crux-2.1/ports/opt/ruby-gtk/.md5sum 2006-01-29 20:46:38 UTC (rev 631) @@ -1 +1,2 @@ -8142aed346e82fa8a8f7cef33c63d233 ruby-gtk2-0.12.0.tar.gz +9f6eeaa3e663b6b2cf444f7559a1ed93 ruby-gtk.diff +118aad5048a85e5f67db7c96e5561ac2 ruby-gtk2-0.14.1.tar.gz Modified: crux-2.1/ports/opt/ruby-gtk/Pkgfile =================================================================== --- crux-2.1/ports/attic/ruby-gtk/Pkgfile 2005-12-31 11:17:11 UTC (rev 474) +++ crux-2.1/ports/opt/ruby-gtk/Pkgfile 2006-01-29 20:46:38 UTC (rev 631) @@ -1,19 +1,22 @@ -# $Id: Pkgfile,v 1.5 2005/03/09 19:00:03 jue Exp $ -# Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de -# Packager: H�vard Moen, vanilje at netcom dot no -# Description: Ruby bindings for glib2, pango, gdkpixbuf2 and gtk2 -# URL: http://ruby-gnome2.sourceforge.jp/ -# Depends on: ruby, gtk +# Description: Ruby bindings for glib2, pango, atk, gdkpixbuf2 and gtk2 +# URL: http://ruby-gnome2.sourceforge.jp/ +# Maintainer: Tilman Sauerbeck, tilman at code-monkey dot de +# Packager: H�vard Moen, vanilje at netcom dot no +# Depends on: ruby, gtk name=ruby-gtk -version=0.12.0 +version=0.14.1 release=1 -source=(http://dl.sourceforge.net/ruby-gnome2/ruby-gtk2-$version.tar.gz) +source=(http://dl.sourceforge.net/ruby-gnome2/ruby-gtk2-$version.tar.gz \ + $name.diff) build() { - cd ruby-gtk2-$version - ruby extconf.rb - make - make DESTDIR=$PKG install - chown -R root.root $PKG + cd ruby-gtk2-$version + + patch -Np1 -i ../$name.diff + + ruby extconf.rb + + make + make DESTDIR=$PKG install } Added: crux-2.1/ports/opt/ruby-gtk/ruby-gtk.diff =================================================================== --- crux-2.1/ports/attic/ruby-gtk/ruby-gtk.diff 2005-12-31 11:17:11 UTC (rev 474) +++ crux-2.1/ports/opt/ruby-gtk/ruby-gtk.diff 2006-01-29 20:46:38 UTC (rev 631) @@ -0,0 +1,24 @@ +diff -aur ruby-gtk2-0.14.1.orig/gtk/src/rbgdkpixbuf.c ruby-gtk2-0.14.1/gtk/src/rbgdkpixbuf.c +--- ruby-gtk2-0.14.1.orig/gtk/src/rbgdkpixbuf.c 2005-11-14 09:14:07.000000000 +0100 ++++ ruby-gtk2-0.14.1/gtk/src/rbgdkpixbuf.c 2006-01-29 11:34:19.000000000 +0100 +@@ -73,7 +73,7 @@ + GdkPixmap *pixmap; + GdkBitmap *mask; + +- rb_scan_args(argc, argv, "01", &colormap_or_alpha, &alpha); ++ rb_scan_args(argc, argv, "11", &colormap_or_alpha, &alpha); + + if (rb_obj_is_kind_of(colormap_or_alpha, GTYPE2CLASS(GDK_TYPE_COLORMAP))){ + gdk_pixbuf_render_pixmap_and_mask_for_colormap(_SELF(self), +diff -aur ruby-gtk2-0.14.1.orig/gtk/src/rbgtkwidget.c ruby-gtk2-0.14.1/gtk/src/rbgtkwidget.c +--- ruby-gtk2-0.14.1.orig/gtk/src/rbgtkwidget.c 2005-11-14 09:14:07.000000000 +0100 ++++ ruby-gtk2-0.14.1/gtk/src/rbgtkwidget.c 2006-01-29 11:40:12.000000000 +0100 +@@ -340,7 +340,7 @@ + widget_set_colormap(self, colormap) + VALUE self, colormap; + { +- gtk_widget_set_colormap(_SELF(self), GDK_COLORMAP(RVAL2GOBJ(self))); ++ gtk_widget_set_colormap(_SELF(self), GDK_COLORMAP(RVAL2GOBJ(colormap))); + return self; + } +