From 7e4db7bba9c4abd3da53c9e34cc4ba4a3c09bf43 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Sat, 15 Mar 2008 17:34:32 +0100 Subject: [PATCH] ruby-gtk: added a patch to fix the build with glib 2.16. --- ruby-gtk/.md5sum | 2 +- ruby-gtk/Pkgfile | 2 +- ruby-gtk/ruby-gtk.diff | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ruby-gtk/.md5sum b/ruby-gtk/.md5sum index 275e32993..e4ce9b46e 100644 --- a/ruby-gtk/.md5sum +++ b/ruby-gtk/.md5sum @@ -1,2 +1,2 @@ -e3aaae7cf5d1589dcf94d7f2bd4334d3 ruby-gtk.diff +1aac72ec246354641bfc6a19aaf2fb1f ruby-gtk.diff aedca2b3a7c6ae0f02cf5fd1e02f642c ruby-gtk2-0.16.0.tar.gz diff --git a/ruby-gtk/Pkgfile b/ruby-gtk/Pkgfile index 3e6bff3d6..0cd6bf172 100644 --- a/ruby-gtk/Pkgfile +++ b/ruby-gtk/Pkgfile @@ -7,7 +7,7 @@ name=ruby-gtk version=0.16.0 -release=2 +release=3 source=(http://dl.sourceforge.net/ruby-gnome2/ruby-gtk2-$version.tar.gz \ $name.diff) diff --git a/ruby-gtk/ruby-gtk.diff b/ruby-gtk/ruby-gtk.diff index 7af781906..fbaa20ccc 100644 --- a/ruby-gtk/ruby-gtk.diff +++ b/ruby-gtk/ruby-gtk.diff @@ -72,3 +72,25 @@ diff -aur ruby-gtk2-0.16.0.orig/gtk/src/rbgtk.h ruby-gtk2-0.16.0/gtk/src/rbgtk.h /* * Gtk::SelectionData +diff -aur ruby-gtk2-0.16.0.orig/glib/src/lib/glib-mkenums.rb ruby-gtk2-0.16.0/glib/src/lib/glib-mkenums.rb +--- ruby-gtk2-0.16.0.orig/glib/src/lib/glib-mkenums.rb 2006-12-29 14:17:29.000000000 +0100 ++++ ruby-gtk2-0.16.0/glib/src/lib/glib-mkenums.rb 2008-03-15 17:25:05.034366090 +0100 +@@ -33,16 +33,14 @@ + if const_lines.include? "<<" + @type = "flags" + @Type = "Flags" +- regexp = /^\s*([^\s]*)\s.*\n/ + else + @type = "enum" + @Type = "Enum" +- regexp = /^\s*([^\s,]*).*\n/ + end + consts = [] +- const_lines.scan(regexp){|name| ++ const_lines.scan(/^\s*([^\s,]*).*\n/) do |name| + consts << name[0] unless name[0] =~ /(^[\/\*]|^$)/ +- } ++ end + @prefix = extract_prefix(consts) + consts.each do |name| + # consts = [name, nick]