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

acornet at alioth.debian.org acornet at alioth.debian.org
Sat Sep 6 16:20:14 UTC 2008 

Author: acornet
Date: 2008-09-06 16:20:13 +0000 (Sat, 06 Sep 2008)
New Revision: 2982

Added:
   packages/ruby-gnome2/trunk/debian/patches/destroy-object-on-weak-notify.diff
Modified:
   packages/ruby-gnome2/trunk/debian/changelog
   packages/ruby-gnome2/trunk/debian/control
   packages/ruby-gnome2/trunk/debian/patches/fix-object-allocation-during-gc-phase.patch
   packages/ruby-gnome2/trunk/debian/patches/series
Log:
Fix crash on applet removal, and cleanup libgda build-depend.

  * Add patch destroy-object-on-weak-notify.diff (Closes: #493063).
  * Build depend on libgda2-dev (>= 1.2.4) rather on the 1.2.4-1 revision.



Modified: packages/ruby-gnome2/trunk/debian/changelog
===================================================================
--- packages/ruby-gnome2/trunk/debian/changelog	2008-09-05 21:35:11 UTC (rev 2981)
+++ packages/ruby-gnome2/trunk/debian/changelog	2008-09-06 16:20:13 UTC (rev 2982)
@@ -1,6 +1,7 @@
-ruby-gnome2 (0.17.0~rc1-5) UNRELEASED; urgency=low
+ruby-gnome2 (0.17.0~rc1-5) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Add patch destroy-object-on-weak-notify.diff (Closes: #493063).
+  * Build depend on libgda2-dev (>= 1.2.4) rather on the 1.2.4-1 revision.
 
  -- Arnaud Cornet <acornet at debian.org>  Tue, 26 Aug 2008 23:11:02 +0200
 

Modified: packages/ruby-gnome2/trunk/debian/control
===================================================================
--- packages/ruby-gnome2/trunk/debian/control	2008-09-05 21:35:11 UTC (rev 2981)
+++ packages/ruby-gnome2/trunk/debian/control	2008-09-06 16:20:13 UTC (rev 2982)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Arnaud Cornet <acornet at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Paul van Tilburg <paulvt at debian.org>, Michael Schutte <m.schutte.jr at gmail.com>, Antonio Terceiro <terceiro at softwarelivre.org>
-Build-Depends: ruby-pkg-tools (>= 0.14), cdbs, debhelper (>= 4), ruby, ruby1.8, ruby1.8-dev, libgnomeui-dev, libglade2-dev, libgtkhtml2-dev, libpng12-dev, libgtkglext1-dev, libxmu-dev, libgtksourceview-dev, libpanel-applet2-dev, libgnomeprint2.2-dev (>= 2.8.0), libgnomeprintui2.2-dev (>= 2.6.0), librsvg2-dev (>= 2.8.0), libcairo-ruby, xulrunner-dev (>= 1.9~b5-4), libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.5.2), pkg-config, quilt, libgda2-dev (>= 1.2.4-1), libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev
+Build-Depends: ruby-pkg-tools (>= 0.14), cdbs, debhelper (>= 4), ruby, ruby1.8, ruby1.8-dev, libgnomeui-dev, libglade2-dev, libgtkhtml2-dev, libpng12-dev, libgtkglext1-dev, libxmu-dev, libgtksourceview-dev, libpanel-applet2-dev, libgnomeprint2.2-dev (>= 2.8.0), libgnomeprintui2.2-dev (>= 2.6.0), librsvg2-dev (>= 2.8.0), libcairo-ruby, xulrunner-dev (>= 1.9~b5-4), libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.5.2), pkg-config, quilt, libgda2-dev (>= 1.2.4), libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev
 Standards-Version: 3.7.3
 Homepage: http://ruby-gnome2.sourceforge.jp/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/ruby-gnome2/trunk/

Added: packages/ruby-gnome2/trunk/debian/patches/destroy-object-on-weak-notify.diff
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/destroy-object-on-weak-notify.diff	                        (rev 0)
+++ packages/ruby-gnome2/trunk/debian/patches/destroy-object-on-weak-notify.diff	2008-09-06 16:20:13 UTC (rev 2982)
@@ -0,0 +1,37 @@
+Index: ruby-gnome2-0.17.0~rc1/glib/ChangeLog
+===================================================================
+--- ruby-gnome2-0.17.0~rc1.orig/glib/ChangeLog	2008-09-06 18:05:19.000000000 +0200
++++ ruby-gnome2-0.17.0~rc1/glib/ChangeLog	2008-09-06 18:06:08.000000000 +0200
+@@ -1,3 +1,8 @@
++2008-09-06  Kouhei Sutou  <kou at cozmixng.org>
++
++	* src/rbgobj_object.c: destroy object on weak notify. [Bug #2060606]
++	Reported by Arnaud Cornet. Thanks!!!
++
+ 2008-07-27  Sjoerd Simons  <sjoerd at luon.net>
+ 
+ 	* src/rbgobj_closure.c: Only use G_REMOVE_RELATIVE when a closure is
+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-06-06 16:03:39.000000000 +0200
++++ ruby-gnome2-0.17.0~rc1/glib/src/rbgobj_object.c	2008-09-06 18:05:42.000000000 +0200
+@@ -39,6 +39,9 @@
+     rbgobj_instance_call_cinfo_free(holder->gobj);
+     rbgobj_invalidate_relatives(holder->self);
+     holder->destroyed = TRUE;
++
++    g_object_unref(holder->gobj);
++    holder->gobj = NULL;
+ }
+ 
+ static void
+@@ -58,8 +61,7 @@
+             g_object_set_qdata(holder->gobj, RUBY_GOBJECT_OBJ_KEY, NULL);
+             g_object_weak_unref(holder->gobj, (GWeakNotify)weak_notify, holder);
+         }
+-        g_object_unref(holder->gobj);
+-        /* holder->gobj = NULL; */
++        holder->gobj = NULL;
+     }
+     free(holder);
+ }

Modified: packages/ruby-gnome2/trunk/debian/patches/fix-object-allocation-during-gc-phase.patch
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/fix-object-allocation-during-gc-phase.patch	2008-09-05 21:35:11 UTC (rev 2981)
+++ packages/ruby-gnome2/trunk/debian/patches/fix-object-allocation-during-gc-phase.patch	2008-09-06 16:20:13 UTC (rev 2982)
@@ -1,6 +1,7 @@
-diff -Nru ruby-gnome2-0.17.0~rc1-from-archive/glib/ChangeLog ruby-gnome2-0.17.0~rc1/glib/ChangeLog
---- ruby-gnome2-0.17.0~rc1-from-archive/glib/ChangeLog	2008-08-21 21:15:03.000000000 -0300
-+++ ruby-gnome2-0.17.0~rc1/glib/ChangeLog	2008-08-21 21:15:20.000000000 -0300
+Index: ruby-gnome2-0.17.0~rc1/glib/ChangeLog
+===================================================================
+--- ruby-gnome2-0.17.0~rc1.orig/glib/ChangeLog	2008-06-06 16:03:38.000000000 +0200
++++ ruby-gnome2-0.17.0~rc1/glib/ChangeLog	2008-09-06 17:55:16.000000000 +0200
 @@ -1,3 +1,23 @@
 +2008-07-27  Sjoerd Simons  <sjoerd at luon.net>
 +
@@ -25,9 +26,10 @@
  2008-05-23  Kouhei Sutou  <kou at cozmixng.org>
  
  	* test/run-test.rb: use which not --version to detect make.
-diff -Nru ruby-gnome2-0.17.0~rc1-from-archive/glib/src/rbgobj_closure.c ruby-gnome2-0.17.0~rc1/glib/src/rbgobj_closure.c
---- ruby-gnome2-0.17.0~rc1-from-archive/glib/src/rbgobj_closure.c	2008-08-21 21:15:03.000000000 -0300
-+++ ruby-gnome2-0.17.0~rc1/glib/src/rbgobj_closure.c	2008-08-21 21:15:20.000000000 -0300
+Index: ruby-gnome2-0.17.0~rc1/glib/src/rbgobj_closure.c
+===================================================================
+--- ruby-gnome2-0.17.0~rc1.orig/glib/src/rbgobj_closure.c	2008-06-06 16:03:39.000000000 +0200
++++ ruby-gnome2-0.17.0~rc1/glib/src/rbgobj_closure.c	2008-09-06 17:55:16.000000000 +0200
 @@ -142,9 +142,6 @@
          GList *next;
          for (next = rclosure->objects; next; next = next->next) {
@@ -70,9 +72,10 @@
  }
  
  GClosure*
-diff -Nru ruby-gnome2-0.17.0~rc1-from-archive/glib/src/rbgobject.h ruby-gnome2-0.17.0~rc1/glib/src/rbgobject.h
---- ruby-gnome2-0.17.0~rc1-from-archive/glib/src/rbgobject.h	2008-08-21 21:15:03.000000000 -0300
-+++ ruby-gnome2-0.17.0~rc1/glib/src/rbgobject.h	2008-08-21 21:15:16.000000000 -0300
+Index: ruby-gnome2-0.17.0~rc1/glib/src/rbgobject.h
+===================================================================
+--- ruby-gnome2-0.17.0~rc1.orig/glib/src/rbgobject.h	2008-06-06 16:03:39.000000000 +0200
++++ ruby-gnome2-0.17.0~rc1/glib/src/rbgobject.h	2008-09-06 17:55:16.000000000 +0200
 @@ -76,6 +76,7 @@
  
  #define CLASS2CINFO(klass) (rbgobj_lookup_class(klass))
@@ -95,9 +98,10 @@
  extern VALUE rbgobj_gtype_to_ruby_class(GType gtype);
  extern VALUE rbgobj_define_class(GType gtype, const gchar* name, VALUE module,
                                   void* mark, void* free, VALUE parent); 
-diff -Nru ruby-gnome2-0.17.0~rc1-from-archive/glib/src/rbgobj_type.c ruby-gnome2-0.17.0~rc1/glib/src/rbgobj_type.c
---- ruby-gnome2-0.17.0~rc1-from-archive/glib/src/rbgobj_type.c	2008-08-21 21:15:03.000000000 -0300
-+++ ruby-gnome2-0.17.0~rc1/glib/src/rbgobj_type.c	2008-08-21 21:15:16.000000000 -0300
+Index: ruby-gnome2-0.17.0~rc1/glib/src/rbgobj_type.c
+===================================================================
+--- ruby-gnome2-0.17.0~rc1.orig/glib/src/rbgobj_type.c	2008-06-06 16:03:39.000000000 +0200
++++ ruby-gnome2-0.17.0~rc1/glib/src/rbgobj_type.c	2008-09-06 17:55:16.000000000 +0200
 @@ -39,8 +39,9 @@
  } RGObjClassInfoDynamic;
  
@@ -147,9 +151,10 @@
  
      rb_thread_critical = 1;
  
-diff -Nru ruby-gnome2-0.17.0~rc1-from-archive/glib/src/rbgobj_typeinstance.c ruby-gnome2-0.17.0~rc1/glib/src/rbgobj_typeinstance.c
---- ruby-gnome2-0.17.0~rc1-from-archive/glib/src/rbgobj_typeinstance.c	2008-08-21 21:15:03.000000000 -0300
-+++ ruby-gnome2-0.17.0~rc1/glib/src/rbgobj_typeinstance.c	2008-08-21 21:15:16.000000000 -0300
+Index: ruby-gnome2-0.17.0~rc1/glib/src/rbgobj_typeinstance.c
+===================================================================
+--- ruby-gnome2-0.17.0~rc1.orig/glib/src/rbgobj_typeinstance.c	2008-06-06 16:03:39.000000000 +0200
++++ ruby-gnome2-0.17.0~rc1/glib/src/rbgobj_typeinstance.c	2008-09-06 17:55:16.000000000 +0200
 @@ -16,6 +16,10 @@
  
  VALUE cInstantiatable;

Modified: packages/ruby-gnome2/trunk/debian/patches/series
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/series	2008-09-05 21:35:11 UTC (rev 2981)
+++ packages/ruby-gnome2/trunk/debian/patches/series	2008-09-06 16:20:13 UTC (rev 2982)
@@ -6,3 +6,4 @@
 xulrunner-1.9.patch
 buildsys-abort-on-error.patch
 fix-object-allocation-during-gc-phase.patch
+destroy-object-on-weak-notify.diff

More information about the Pkg-ruby-extras-commits mailing list