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

[acornet at alioth.debian.org]

Author: acornet
Date: 2007-08-25 10:39:03 +0000 (Sat, 25 Aug 2007)
New Revision: 1838

Added:
   packages/ruby-gnome2/trunk/debian/patches/buildsys-abort-on-error.patch
   packages/ruby-gnome2/trunk/debian/patches/glib2.14.patch
Modified:
   packages/ruby-gnome2/trunk/debian/changelog
   packages/ruby-gnome2/trunk/debian/patches/series
Log:
  * Add glib22.14.patch to build against recent glibs (Closes: #439455).
  * Add buildsys-abort-on-error.patch to stop building as soon as the
    build of one package fails.



Modified: packages/ruby-gnome2/trunk/debian/changelog
===================================================================
--- packages/ruby-gnome2/trunk/debian/changelog	2007-08-20 19:40:55 UTC (rev 1837)
+++ packages/ruby-gnome2/trunk/debian/changelog	2007-08-25 10:39:03 UTC (rev 1838)
@@ -1,8 +1,10 @@
-ruby-gnome2 (0.16.0-6) UNRELEASED; urgency=low
+ruby-gnome2 (0.16.0-6) unstable; urgency=low
 
-  * UNRELEASED
+  * Add glib22.14.patch to build against recent glibs (Closes: #439455).
+  * Add buildsys-abort-on-error.patch to stop building as soon as the
+    build of one package fails.
 
- -- Arnaud Cornet <acornet at debian.org>  Mon, 20 Aug 2007 21:47:21 +0200
+ -- Arnaud Cornet <acornet at debian.org>  Sat, 25 Aug 2007 12:43:14 +0200
 
 ruby-gnome2 (0.16.0-5) unstable; urgency=low
 

Added: packages/ruby-gnome2/trunk/debian/patches/buildsys-abort-on-error.patch
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/buildsys-abort-on-error.patch	                        (rev 0)
+++ packages/ruby-gnome2/trunk/debian/patches/buildsys-abort-on-error.patch	2007-08-25 10:39:03 UTC (rev 1838)
@@ -0,0 +1,14 @@
+Index: ruby-gnome2-0.16.0/exec_make.rb
+===================================================================
+--- ruby-gnome2-0.16.0.orig/exec_make.rb	2007-08-25 12:05:43.000000000 +0200
++++ ruby-gnome2-0.16.0/exec_make.rb	2007-08-25 12:06:18.000000000 +0200
+@@ -29,7 +29,8 @@
+ 	if ret
+ 		success << subdir 
+ 	else
+-		failure << subdir
++                puts "Building of #{subdir} failed."
++                exit(1)
+ 	end
+ end
+ 

Added: packages/ruby-gnome2/trunk/debian/patches/glib2.14.patch
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/glib2.14.patch	                        (rev 0)
+++ packages/ruby-gnome2/trunk/debian/patches/glib2.14.patch	2007-08-25 10:39:03 UTC (rev 1838)
@@ -0,0 +1,27 @@
+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
+@@ -341,7 +341,8 @@
+ 
+     info = ALLOC(callback_info_t);
+     info->callback = func;
+-    id = g_timeout_add_seconds(NUM2UINT(interval),
++    id = g_timeout_add_seconds_full(G_PRIORITY_DEFAULT,
++		               NUM2UINT(interval),
+                                (GSourceFunc)invoke_source_func,
+                                (gpointer)info, g_free);
+     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
+@@ -140,7 +140,7 @@
+ rbglib_m_unichar_get_script(VALUE self, VALUE unichar)
+ {
+     return GENUM2RVAL(g_unichar_get_script(NUM2UINT(unichar)),
+-                      G_TYPE_UNICODE_SCRIPT_TYPE);
++                      G_TYPE_UNICODE_SCRIPT);
+ }
+ #endif
+ 

Modified: packages/ruby-gnome2/trunk/debian/patches/series
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/series	2007-08-20 19:40:55 UTC (rev 1837)
+++ packages/ruby-gnome2/trunk/debian/patches/series	2007-08-25 10:39:03 UTC (rev 1838)
@@ -4,3 +4,5 @@
 shebangs.patch
 gtkmozembed-rpath.patch
 libglade2-nil-source.patch
+buildsys-abort-on-error.patch
+glib2.14.patch