[DRE-commits] r2996 - in packages/ruby-gnome2/trunk/debian: . patches
acornet at alioth.debian.org
acornet at alioth.debian.org
Thu Sep 18 17:41:14 UTC 2008
Author: acornet
Date: 2008-09-18 17:41:13 +0000 (Thu, 18 Sep 2008)
New Revision: 2996
Added:
packages/ruby-gnome2/trunk/debian/patches/holder-free-memory-leak.diff
packages/ruby-gnome2/trunk/debian/patches/maincontext-value.patch
Removed:
packages/ruby-gnome2/trunk/debian/patches/maincontext-leakfix.patch
Modified:
packages/ruby-gnome2/trunk/debian/changelog
packages/ruby-gnome2/trunk/debian/patches/series
Log:
Rename a patch, add another one (closing #498558).
* Add patch maincontext-value.patch fixes a crash triggered at least by
kazehakase (Closes: #490305).
* Add patch holder-free-memory-leak.diff fixes large memory leak (Closes:
#498558).
Modified: packages/ruby-gnome2/trunk/debian/changelog
===================================================================
--- packages/ruby-gnome2/trunk/debian/changelog 2008-09-18 09:02:36 UTC (rev 2995)
+++ packages/ruby-gnome2/trunk/debian/changelog 2008-09-18 17:41:13 UTC (rev 2996)
@@ -1,7 +1,10 @@
ruby-gnome2 (0.17.0~rc1-6) UNRELEASED; urgency=low
* NOT RELEASED YET
- * Add patch maincontext-leakfix.patch (Closes: #490305]).
+ * Add patch maincontext-value.patch fixes a crash triggered at least by
+ kazehakase (Closes: #490305).
+ * Add patch holder-free-memory-leak.diff fixes large memory leak (Closes:
+ #498558).
-- Arnaud Cornet <acornet at debian.org> Thu, 18 Sep 2008 10:56:46 +0200
Added: packages/ruby-gnome2/trunk/debian/patches/holder-free-memory-leak.diff
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/holder-free-memory-leak.diff (rev 0)
+++ packages/ruby-gnome2/trunk/debian/patches/holder-free-memory-leak.diff 2008-09-18 17:41:13 UTC (rev 2996)
@@ -0,0 +1,30 @@
+Index: ruby-gnome2-0.17.0~rc1/glib/ChangeLog
+===================================================================
+--- ruby-gnome2-0.17.0~rc1.orig/glib/ChangeLog 2008-09-18 19:22:57.000000000 +0200
++++ ruby-gnome2-0.17.0~rc1/glib/ChangeLog 2008-09-18 19:24:27.000000000 +0200
+@@ -3,6 +3,10 @@
+ * src/rbglib_maincontext.c: use VALUE not guint to
+ rb_set_end_proc()'s data. This will fix Debian bug [#490305].
+
++2008-09-14 Kouhei Sutou <kou at cozmixng.org>
++
++ * src/rbgobj_object.c (holder_free): fix memory leak.
++
+ 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/rbgobj_object.c
+===================================================================
+--- ruby-gnome2-0.17.0~rc1.orig/glib/src/rbgobj_object.c 2008-09-18 19:22:57.000000000 +0200
++++ ruby-gnome2-0.17.0~rc1/glib/src/rbgobj_object.c 2008-09-18 19:24:09.000000000 +0200
+@@ -57,9 +57,9 @@
+ {
+ if (holder->gobj){
+ if (!holder->destroyed){
+- rbgobj_instance_call_cinfo_free(holder->gobj);
+ g_object_set_qdata(holder->gobj, RUBY_GOBJECT_OBJ_KEY, NULL);
+ g_object_weak_unref(holder->gobj, (GWeakNotify)weak_notify, holder);
++ weak_notify(holder, holder->gobj);
+ }
+ holder->gobj = NULL;
+ }
Deleted: packages/ruby-gnome2/trunk/debian/patches/maincontext-leakfix.patch
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/maincontext-leakfix.patch 2008-09-18 09:02:36 UTC (rev 2995)
+++ packages/ruby-gnome2/trunk/debian/patches/maincontext-leakfix.patch 2008-09-18 17:41:13 UTC (rev 2996)
@@ -1,41 +0,0 @@
-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
- }
Copied: packages/ruby-gnome2/trunk/debian/patches/maincontext-value.patch (from rev 2995, packages/ruby-gnome2/trunk/debian/patches/maincontext-leakfix.patch)
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/maincontext-value.patch (rev 0)
+++ packages/ruby-gnome2/trunk/debian/patches/maincontext-value.patch 2008-09-18 17:41:13 UTC (rev 2996)
@@ -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
+ }
Property changes on: packages/ruby-gnome2/trunk/debian/patches/maincontext-value.patch
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: packages/ruby-gnome2/trunk/debian/patches/series
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/series 2008-09-18 09:02:36 UTC (rev 2995)
+++ packages/ruby-gnome2/trunk/debian/patches/series 2008-09-18 17:41:13 UTC (rev 2996)
@@ -7,4 +7,5 @@
buildsys-abort-on-error.patch
fix-object-allocation-during-gc-phase.patch
destroy-object-on-weak-notify.diff
-maincontext-leakfix.patch
+maincontext-value.patch
+holder-free-memory-leak.diff
More information about the Pkg-ruby-extras-commits
mailing list