rpms/xscreensaver/F-9 xscreensaver-5.05-fix-compile.patch, NONE, 1.1 xscreensaver.spec, 1.68, 1.69

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15430/F-9

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.05-fix-compile.patch 
Log Message:
* Mon Jun  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.05-4
- Fix compilation error with GLib 2.17+


xscreensaver-5.05-fix-compile.patch:

--- NEW FILE xscreensaver-5.05-fix-compile.patch ---
--- xscreensaver-5.05/driver/demo-Gtk.c.debug	2008-02-10 11:54:43.000000000 +0900
+++ xscreensaver-5.05/driver/demo-Gtk.c	2008-06-01 02:03:49.000000000 +0900
@@ -582,13 +582,13 @@
   gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
   gtk_window_set_title (GTK_WINDOW (dialog), progclass);
-  STFU GTK_WIDGET_SET_FLAGS (ok, GTK_CAN_DEFAULT);
+  GTK_WIDGET_SET_FLAGS (ok, GTK_CAN_DEFAULT);
   gtk_widget_show (ok);
   gtk_widget_grab_focus (ok);
 
   if (cancel)
     {
-      STFU GTK_WIDGET_SET_FLAGS (cancel, GTK_CAN_DEFAULT); 
+      GTK_WIDGET_SET_FLAGS (cancel, GTK_CAN_DEFAULT); 
       gtk_widget_show (cancel);
     }
   gtk_widget_show (label);
@@ -1808,7 +1808,7 @@
   char *str;
   int list_elt;
 
-  STFU g_return_if_fail (!gdk_pointer_is_grabbed ());
+  g_return_if_fail (!gdk_pointer_is_grabbed ());
 
   str = gtk_tree_path_to_string (path);
   list_elt = strtol (str, NULL, 10);


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-9/xscreensaver.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- xscreensaver.spec	6 Apr 2008 13:05:04 -0000	1.68
+++ xscreensaver.spec	31 May 2008 17:33:19 -0000	1.69
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    3
+%define fedora_rel    4
 
 %define extrarel      %{nil}
 
@@ -32,6 +32,7 @@
 %endif
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch3:          xscreensaver-5.05-addopts-jwz.patch
+Patch4:          xscreensaver-5.05-fix-compile.patch
 Patch21:         xscreensaver-5.05-webcollage-default-nonet.patch
 Patch22:         xscreensaver-5.05-penetrate-font.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -175,6 +176,7 @@
 
 %patch1 -p1 -b .sanitize-hacks
 %patch3 -p1 -b .opts
+%patch4 -p1 -b .compile
 %patch21 -p1 -b .nonet
 %patch22 -p1 -b .font
 
@@ -562,6 +564,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Jun  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.05-4
+- Fix compilation error with GLib 2.17+
+
 * Sun Apr  6 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.05-3
 - penetrate - fallback to smaller font