rpms/ruby-gnome2/devel ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch, NONE, 1.1 ruby-gnome2.spec, 1.48, 1.49

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3632

Modified Files:
	ruby-gnome2.spec 
Added Files:
	ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch 
Log Message:
* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-2
- Fix crash when moving cursor on fantasdic 1.0 beta 7
  (ruby-gnome2-Bugs-2865895)


ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch:
 rbgdkwindow.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch ---
Index: gtk/src/rbgdkwindow.c
===================================================================
--- gtk/src/rbgdkwindow.c	(revision 3712)
+++ gtk/src/rbgdkwindow.c	(revision 3713)
@@ -1093,8 +1093,11 @@
 void
 Init_gtk_gdk_window()
 {
+    GObjectClass *g_class;
     VALUE gdkWindow = G_DEF_CLASS(GDK_TYPE_WINDOW, "Window", mGdk);
 
+    g_class = g_type_class_peek(GDK_TYPE_WINDOW);
+
     rb_define_method(gdkWindow, "initialize", gdkwin_initialize, 3);
     rb_define_method(gdkWindow, "destroy", gdkwin_destroy, 0);
     rb_define_method(gdkWindow, "window_type", gdkwin_get_window_type, 0);
@@ -1178,6 +1181,10 @@
     rb_define_method(gdkWindow, "set_background", gdkwin_set_background, 1);
     rb_define_method(gdkWindow, "set_back_pixmap", gdkwin_set_back_pixmap, 2);
     rb_define_method(gdkWindow, "set_cursor", gdkwin_set_cursor, 1);
+    if (g_object_class_find_property(g_class, "cursor")) {
+        rb_undef_method(gdkWindow, "cursor");
+        rb_undef_method(gdkWindow, "cursor=");
+    }
     rb_define_method(gdkWindow, "user_data", gdkwin_get_user_data, 0);
     rb_define_method(gdkWindow, "geometry", gdkwin_get_geometry, 0);
     rb_define_method(gdkWindow, "set_geometry_hints", gdkwin_set_geometry_hints, 2);


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- ruby-gnome2.spec	24 Sep 2009 18:37:17 -0000	1.48
+++ ruby-gnome2.spec	27 Sep 2009 07:09:03 -0000	1.49
@@ -8,7 +8,7 @@
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define         mainrel                1
+%define         mainrel                2
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -31,7 +31,13 @@ URL:            http://ruby-gnome2.sourc
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 #Source0:        %{name}-all-%{version}-%{betaver}.tar.gz
 # Currently Fedora specific patch
+# Fix shebang on sample files
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
+# Patch from upstream
+# Fix crash when moving curson on fantasdic 1.0 beta 7 
+# (ruby-gnome2-Bugs-2865895)
+Patch10:        ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -765,6 +771,7 @@ This package provides libraries and head
 %setup -q -n %{name}-all-%{version}
 #%%setup -q -n %{name}-all-%{version}-%{betaver}
 %patch0 -p1
+%patch10 -p0
 
 # Keep timestamps as much as possible
 find . -type f -name depend | xargs sed -i -e 's|-m 0644 -v|-m 0644 -p -v|'
@@ -1090,6 +1097,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-2
+- Fix crash when moving cursor on fantasdic 1.0 beta 7
+  (ruby-gnome2-Bugs-2865895)
+
 * Fri Sep 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-1
 - Update to 0.19.3
 - Released source does not support gio yet