rpms/ruby-gnome2/devel ruby-gnome2-0.17.0-rc1-newgtk-021303.patch, NONE, 1.1 ruby-gnome2.spec, 1.26, 1.27

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19819

Modified Files:
	ruby-gnome2.spec 
Added Files:
	ruby-gnome2-0.17.0-rc1-newgtk-021303.patch 
Log Message:
* Sun Jun 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.17.0-0.2.rc1
- gtk/gtkfilesystem.h is removed from GTK 2.13.3+, some symbols no
  longer available (bug 451402, thanks to Matthias)


ruby-gnome2-0.17.0-rc1-newgtk-021303.patch:

--- NEW FILE ruby-gnome2-0.17.0-rc1-newgtk-021303.patch ---
--- ruby-gnome2-0.17.0-rc1/gtk/extconf.rb.newgtk	2008-06-06 23:03:41.000000000 +0900
+++ ruby-gnome2-0.17.0-rc1/gtk/extconf.rb	2008-06-15 05:19:31.000000000 +0900
@@ -49,6 +49,10 @@
 have_func('gtk_socket_get_type')
 have_func('pango_render_part_get_type')
 
+if have_header("gtk/gtkfilesystem.h")
+  $defs.push("-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED")
+end
+
 if target == "x11"
   have_func("XReadBitmapFileData")
   have_header('X11/Xlib.h')
--- ruby-gnome2-0.17.0-rc1/gtk/src/rbgtkfilechooser.c.newgtk	2008-06-06 23:03:41.000000000 +0900
+++ ruby-gnome2-0.17.0-rc1/gtk/src/rbgtkfilechooser.c	2008-06-15 05:18:10.000000000 +0900
@@ -17,8 +17,9 @@
 #define _SELF(self) GTK_FILE_CHOOSER(RVAL2GOBJ(self))
 
 /* For error handling */
-#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
+#ifdef GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
 #include <gtk/gtkfilesystem.h>
+#endif
 
 static VALUE
 gslist2ary_free(list)
@@ -324,7 +325,9 @@
 #if GTK_CHECK_VERSION(2,4,0)
 
     VALUE gFileCho = G_DEF_INTERFACE(GTK_TYPE_FILE_CHOOSER, "FileChooser", mGtk);
+#ifdef GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
     VALUE fse;
+#endif
 
     rb_define_method(gFileCho, "set_action", fcho_set_action, 1);
     rb_define_method(gFileCho, "action", fcho_get_action, 0);
@@ -367,6 +370,8 @@
     /* GtkFileChooserError */
     G_DEF_ERROR(GTK_FILE_CHOOSER_ERROR, "FileChooserError", mGtk, rb_eRuntimeError, 
                 GTK_TYPE_FILE_CHOOSER_ERROR);
+
+#ifdef GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
     /* GtkFileSystemError */
     fse = G_DEF_ERROR2(GTK_FILE_SYSTEM_ERROR, "FileSystemError", mGtk, rb_eRuntimeError);
     rb_define_const(fse, "NONEXISTENT", INT2NUM(GTK_FILE_SYSTEM_ERROR_NONEXISTENT));
@@ -375,6 +380,7 @@
     rb_define_const(fse, "BAD_FILENAME", INT2NUM(GTK_FILE_SYSTEM_ERROR_BAD_FILENAME));
     rb_define_const(fse, "FAILED", INT2NUM(GTK_FILE_SYSTEM_ERROR_FAILED));
     rb_define_const(fse, "ALREADY_EXSITS", INT2NUM(GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS));
+#endif
 
 #if GTK_CHECK_VERSION(2,8,0)
     /* GtkFileChooserConfirmation */


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ruby-gnome2.spec	9 Jun 2008 12:40:25 -0000	1.26
+++ ruby-gnome2.spec	14 Jun 2008 20:42:53 -0000	1.27
@@ -11,7 +11,7 @@
 
 Name:           ruby-gnome2
 Version:        0.17.0
-Release:        0.1.%{betaver}%{?dist}
+Release:        0.2.%{betaver}%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -21,6 +21,8 @@
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?betaver:-%betaver}.tar.gz
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
 Patch14:        ruby-gnome2-all-0.16.0-xulrunner.patch
+# must be sent to upstream
+Patch15:        ruby-gnome2-0.17.0-rc1-newgtk-021303.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -487,6 +489,7 @@
 %if 0%{?fedora} >= 9
 %patch14 -p1 -b .xulrunner
 %endif
+%patch15 -p1 -b .newgtk
 
 # Fix the attributes of some files
 # suppress lots of messages..
@@ -696,6 +699,10 @@
 
 
 %changelog
+* Sun Jun 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.17.0-0.2.rc1
+- gtk/gtkfilesystem.h is removed from GTK 2.13.3+, some symbols no
+  longer available (bug 451402, thanks to Matthias)
+
 * Sun Jun  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.17.0-0.1.rc1
 - 0.17.0 rc1
 - Remove upstreamed patches - 2 patches remain