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

[acornet at alioth.debian.org]

Author: acornet
Date: 2008-09-18 09:02:36 +0000 (Thu, 18 Sep 2008)
New Revision: 2995

Added:
   packages/ruby-gnome2/trunk/debian/patches/maincontext-leakfix.patch
Modified:
   packages/ruby-gnome2/trunk/debian/changelog
   packages/ruby-gnome2/trunk/debian/patches/series
Log:
Add patch maincontext-leakfix.patch (Closes: #490305]).

Modified: packages/ruby-gnome2/trunk/debian/changelog
===================================================================
--- packages/ruby-gnome2/trunk/debian/changelog	2008-09-17 00:31:27 UTC (rev 2994)
+++ packages/ruby-gnome2/trunk/debian/changelog	2008-09-18 09:02:36 UTC (rev 2995)
@@ -1,8 +1,9 @@
 ruby-gnome2 (0.17.0~rc1-6) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Add patch maincontext-leakfix.patch (Closes: #490305]).
 
- -- Arnaud Cornet <acornet at debian.org>  Sat, 06 Sep 2008 18:35:14 +0200
+ -- Arnaud Cornet <acornet at debian.org>  Thu, 18 Sep 2008 10:56:46 +0200
 
 ruby-gnome2 (0.17.0~rc1-5) unstable; urgency=low
 

Added: packages/ruby-gnome2/trunk/debian/patches/maincontext-leakfix.patch
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/maincontext-leakfix.patch	                        (rev 0)
+++ packages/ruby-gnome2/trunk/debian/patches/maincontext-leakfix.patch	2008-09-18 09:02:36 UTC (rev 2995)
@@ -0,0 +1,41 @@
+Index: ruby-gnome2-0.17.0~rc1/glib/ChangeLog
+===================================================================
+--- ruby-gnome2-0.17.0~rc1.orig/glib/ChangeLog	2008-09-18 10:52:38.000000000 +0200
++++ ruby-gnome2-0.17.0~rc1/glib/ChangeLog	2008-09-18 10:54:41.000000000 +0200
+@@ -1,3 +1,8 @@
++2008-09-18  Kouhei Sutou  <kou at cozmixng.org>
++
++	* src/rbglib_maincontext.c: use VALUE not guint to
++	rb_set_end_proc()'s data. This will fix Debian bug [#490305].
++
+ 2008-09-06  Kouhei Sutou  <kou at cozmixng.org>
+ 
+ 	* src/rbgobj_object.c: destroy object on weak notify. [Bug #2060606]
+Index: ruby-gnome2-0.17.0~rc1/glib/src/rbglib_maincontext.c
+===================================================================
+--- ruby-gnome2-0.17.0~rc1.orig/glib/src/rbglib_maincontext.c	2008-06-06 16:03:39.000000000 +0200
++++ ruby-gnome2-0.17.0~rc1/glib/src/rbglib_maincontext.c	2008-09-18 10:54:16.000000000 +0200
+@@ -753,6 +753,14 @@
+ }
+ #endif
+ 
++#ifndef HAVE_RB_THREAD_BLOCKING_REGION
++static void
++ruby_source_remove(VALUE tag)
++{
++    g_source_remove(NUM2UINT(tag));
++}
++#endif
++
+ void
+ Init_glib_main_context()
+ {
+@@ -831,7 +839,7 @@
+         source = ruby_source_new();
+         tag = g_source_attach(source, NULL);
+         g_source_unref(source);
+-        rb_set_end_proc((void (*)(VALUE))g_source_remove, (VALUE)tag);
++        rb_set_end_proc(ruby_source_remove, UINT2NUM(tag));
+     }
+ #endif
+ }

Modified: packages/ruby-gnome2/trunk/debian/patches/series
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/series	2008-09-17 00:31:27 UTC (rev 2994)
+++ packages/ruby-gnome2/trunk/debian/patches/series	2008-09-18 09:02:36 UTC (rev 2995)
@@ -7,3 +7,4 @@
 buildsys-abort-on-error.patch
 fix-object-allocation-during-gc-phase.patch
 destroy-object-on-weak-notify.diff
+maincontext-leakfix.patch