rpms/ruby-gnome2/F-9 ruby-gnome2-0.17.0-bz456816.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 ruby-gnome2.spec, 1.28, 1.29 sources, 1.3, 1.4

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2791/F-9

Modified Files:
	.cvsignore ruby-gnome2.spec sources 
Added Files:
	ruby-gnome2-0.17.0-bz456816.patch 
Log Message:
F-8/9: sync to devel to fix bz456816

ruby-gnome2-0.17.0-bz456816.patch:

--- NEW FILE ruby-gnome2-0.17.0-bz456816.patch ---
Index: glib/src/rbglib_maincontext.c
===================================================================
--- glib/src/rbglib_maincontext.c	(revision 3283)
+++ glib/src/rbglib_maincontext.c	(working copy)
@@ -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
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jun 2008 13:07:41 -0000	1.3
+++ .cvsignore	18 Sep 2008 12:11:49 -0000	1.4
@@ -1 +1 @@
-ruby-gnome2-0.17.0-rc1.tar.gz
+ruby-gnome2-all-0.17.0.tar.gz


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-9/ruby-gnome2.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ruby-gnome2.spec	19 Jul 2008 02:54:42 -0000	1.28
+++ ruby-gnome2.spec	18 Sep 2008 12:11:50 -0000	1.29
@@ -2,7 +2,6 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 %define         xulrunner_still_beta   1
-%define         betaver                rc1
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -11,16 +10,20 @@
 
 Name:           ruby-gnome2
 Version:        0.17.0
-Release:        0.4.%{betaver}%{?dist}
+Release:        1%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
 
 License:        LGPLv2
 URL:            http://ruby-gnome2.sourceforge.jp/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?betaver:-%betaver}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
 Patch14:        ruby-gnome2-all-0.16.0-xulrunner.patch
+# Already in upstream svn
+# Fix bug 456816
+# http://lists.sourceforge.jp/mailman/archives/kazehakase-devel/2008-September/002846.html
+Patch15:        ruby-gnome2-0.17.0-bz456816.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -482,11 +485,12 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?betaver:-%betaver}
+%setup -q -n %{name}-all-%{version}
 %patch0 -p1
 %if 0%{?fedora} >= 9
 %patch14 -p1 -b .xulrunner
 %endif
+%patch15 -p0 -b .bz456816
 
 # Fix the attributes of some files
 # suppress lots of messages..
@@ -696,6 +700,10 @@
 
 
 %changelog
+* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.17.0-1
+- Update to 0.17.0
+- Patch from svn to fix Ruby/GLib bug (bug 456816)
+
 * Sat Jul 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.17.0-0.4.rc1
 - F-9+: relax gecko libs dependency
 - F-9+: bump version to fix EVR problem between F-8 branch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jun 2008 13:07:41 -0000	1.3
+++ sources	18 Sep 2008 12:11:50 -0000	1.4
@@ -1 +1 @@
-6d04af04c8674b0a88ce47e09dd26a76  ruby-gnome2-0.17.0-rc1.tar.gz
+cc54338888c487055670ee2898391caf  ruby-gnome2-all-0.17.0.tar.gz