[DRE-commits] r1847 - in packages/ruby-gnome2/trunk/debian: . patches

[acornet at alioth.debian.org]

Author: acornet
Date: 2007-08-27 11:30:16 +0000 (Mon, 27 Aug 2007)
New Revision: 1847

Modified:
   packages/ruby-gnome2/trunk/debian/changelog
   packages/ruby-gnome2/trunk/debian/patches/glib2.14.patch
Log:
Update glib2.14.patch to prevent ftbs on some 32bits archs.

Modified: packages/ruby-gnome2/trunk/debian/changelog
===================================================================
--- packages/ruby-gnome2/trunk/debian/changelog	2007-08-26 10:48:33 UTC (rev 1846)
+++ packages/ruby-gnome2/trunk/debian/changelog	2007-08-27 11:30:16 UTC (rev 1847)
@@ -1,3 +1,9 @@
+ruby-gnome2 (0.16.0-7) UNRELEASED; urgency=low
+
+  * Update glib2.14.patch to prevent ftbs on some 32bits archs.
+
+ -- Arnaud Cornet <acornet at debian.org>  Mon, 27 Aug 2007 13:36:38 +0200
+
 ruby-gnome2 (0.16.0-6) unstable; urgency=low
 
   * Add glib22.14.patch to build against recent glibs (Closes: #439455).

Modified: packages/ruby-gnome2/trunk/debian/patches/glib2.14.patch
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/glib2.14.patch	2007-08-26 10:48:33 UTC (rev 1846)
+++ packages/ruby-gnome2/trunk/debian/patches/glib2.14.patch	2007-08-27 11:30:16 UTC (rev 1847)
@@ -1,7 +1,7 @@
 Index: ruby-gnome2-0.16.0/glib/src/rbglib_maincontext.c
 ===================================================================
---- ruby-gnome2-0.16.0.orig/glib/src/rbglib_maincontext.c	2006-12-29 14:17:28.000000000 +0100
-+++ ruby-gnome2-0.16.0/glib/src/rbglib_maincontext.c	2007-08-25 12:26:18.000000000 +0200
+--- ruby-gnome2-0.16.0.orig/glib/src/rbglib_maincontext.c	2007-08-27 12:36:14.000000000 +0200
++++ ruby-gnome2-0.16.0/glib/src/rbglib_maincontext.c	2007-08-27 12:48:34.000000000 +0200
 @@ -341,7 +341,8 @@
  
      info = ALLOC(callback_info_t);
@@ -14,8 +14,8 @@
      info->id = id;
 Index: ruby-gnome2-0.16.0/glib/src/rbglib_unicode.c
 ===================================================================
---- ruby-gnome2-0.16.0.orig/glib/src/rbglib_unicode.c	2007-08-25 12:30:55.000000000 +0200
-+++ ruby-gnome2-0.16.0/glib/src/rbglib_unicode.c	2007-08-25 12:31:11.000000000 +0200
+--- ruby-gnome2-0.16.0.orig/glib/src/rbglib_unicode.c	2007-08-27 12:36:14.000000000 +0200
++++ ruby-gnome2-0.16.0/glib/src/rbglib_unicode.c	2007-08-27 12:48:34.000000000 +0200
 @@ -140,7 +140,7 @@
  rbglib_m_unichar_get_script(VALUE self, VALUE unichar)
  {
@@ -25,3 +25,30 @@
  }
  #endif
  
+Index: ruby-gnome2-0.16.0/glib/src/rbgobj_boxed.c
+===================================================================
+--- ruby-gnome2-0.16.0.orig/glib/src/rbgobj_boxed.c	2007-08-27 12:36:14.000000000 +0200
++++ ruby-gnome2-0.16.0/glib/src/rbgobj_boxed.c	2007-08-27 12:48:34.000000000 +0200
+@@ -145,7 +145,8 @@
+ 
+ gpointer
+ rbgobj_boxed_get(obj, gtype)
+-    VALUE obj, gtype;
++    VALUE obj;
++    GType gtype;
+ {
+     boxed_holder* holder;
+     Data_Get_Struct(obj, boxed_holder, holder);
+Index: ruby-gnome2-0.16.0/gtk/src/rbgtk.h
+===================================================================
+--- ruby-gnome2-0.16.0.orig/gtk/src/rbgtk.h	2007-08-27 12:59:05.000000000 +0200
++++ ruby-gnome2-0.16.0/gtk/src/rbgtk.h	2007-08-27 12:59:19.000000000 +0200
+@@ -115,7 +115,7 @@
+  */
+ typedef void (*rbgtkiter_set_value_func)(void *model, GtkTreeIter *iter,
+                                          gint column, GValue *value);
+-extern void rbgtk_register_treeiter_set_value_func(VALUE klass, rbgtkiter_set_value_func);
++extern void rbgtk_register_treeiter_set_value_func(GType klass, rbgtkiter_set_value_func);
+ 
+ /*
+  * Gtk::SelectionData