rpms/xscreensaver/devel xscreensaver-5.09-kill-c89-warning.patch, NONE, 1.1 xscreensaver.spec, 1.96, 1.97

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3209

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.09-kill-c89-warning.patch 
Log Message:
- Suppress compilation warnings with -std=c89

xscreensaver-5.09-kill-c89-warning.patch:
 juggler3d.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE xscreensaver-5.09-kill-c89-warning.patch ---
--- xscreensaver-5.09/hacks/glx/juggler3d.c.c89	2009-08-18 02:28:09.000000000 +0900
+++ xscreensaver-5.09/hacks/glx/juggler3d.c	2009-09-03 23:27:24.000000000 +0900
@@ -2318,11 +2318,12 @@
       glNormal3f (0, 0, j*1);
       glBegin (wire_p ? GL_LINES : GL_QUAD_STRIP);
       for (i = 0; i < slices + (wire_p ? 0 : 1); i++) {
+        GLfloat th, cth, sth;
         glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE,
                       (i % (slices/3) ? gcolor1 : gcolor2));
-        GLfloat th = i * width;
-        GLfloat cth = cos(th);
-        GLfloat sth = sin(th);
+        th = i * width;
+        cth = cos(th);
+        sth = sin(th);
         glVertex3f (cth * ra, sth * ra, z);
         glVertex3f (cth * rb, sth * rb, z);
         polys++;


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- xscreensaver.spec	3 Sep 2009 14:10:34 -0000	1.96
+++ xscreensaver.spec	3 Sep 2009 14:34:03 -0000	1.97
@@ -47,6 +47,8 @@ Patch1:          xscreensaver-5.00b5-san
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
 # Generate missing header files
 Patch50:	xscreensaver-5.09-hacks-missing-header-creation.patch
+# Kill warnings with -std=c89
+Patch51:	xscreensaver-5.09-kill-c89-warning.patch
 # Ubuntu bug 418419, sent upstream
 # Another SIGFPE when hack's window size is too small:
 Patch55:         xscreensaver-5.08-hacks-window-too-small.patch
@@ -208,6 +210,7 @@ This package contains some test programs
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 %patch50 -p1 -b .missing
+%patch51 -p1 -b .c89
 %patch55 -p1 -b .small
 
 change_option(){
@@ -678,6 +681,7 @@ exit 0
 - Drop patches applied by upstream (1 patch still pending on upstream
   + 2 Fedora specific patches left)
 - Add one patch to generate missing header files
+- Suppress compilation warnings with -std=c89
 
 * Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-13
 - Another case of hack's crash when window size is too small