rpms/xscreensaver/F-13 xscreensaver-5.11-undefined-behavior.patch, NONE, 1.1 xscreensaver.spec, 1.111, 1.112

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7235/F-13

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.11-undefined-behavior.patch 
Log Message:
* Thu Jul  8 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-7.respin1
- Fix codes which contain undefined behavior, detected by gcc45


xscreensaver-5.11-undefined-behavior.patch:
 fadeplot.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xscreensaver-5.11-undefined-behavior.patch ---
--- xscreensaver-5.11/hacks/fadeplot.c.undef	2008-08-03 05:11:04.000000000 +0900
+++ xscreensaver-5.11/hacks/fadeplot.c	2010-07-08 18:16:02.000000000 +0900
@@ -202,11 +202,11 @@
 	if ((fp->temps % (fp->angles / 2)) == 0) {
 		fp->temps = fp->temps % fp->angles * 5;
 		if ((fp->temps % (fp->angles)) == 0)
-			fp->speed.y = (fp->speed.y++) % 30 + 1;
+			fp->speed.y = (fp->speed.y + 1) % 30 + 1;
 		if ((fp->temps % (fp->angles * 2)) == 0)
 			fp->speed.x = (fp->speed.x) % 20;
 		if ((fp->temps % (fp->angles * 3)) == 0)
-			fp->step.y = (fp->step.y++) % 2 + 1;
+			fp->step.y = (fp->step.y + 1) % 2 + 1;
 
 		MI_CLEARWINDOW(mi);
 	}


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-13/xscreensaver.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- xscreensaver.spec	27 Jun 2010 17:51:23 -0000	1.111
+++ xscreensaver.spec	8 Jul 2010 09:36:18 -0000	1.112
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    6
+%define fedora_rel    7
 
 %define extrarel      .respin1
 
@@ -62,6 +62,8 @@ Patch31:         xscreensaver-5.11-no-wi
 Patch32:         xscreensaver-5.11-xjack-with-small-window.patch
 #
 ## Patches to be sent to the upsteam
+# gcc45 emits new undefined behavior warnings
+Patch33:	xscreensaver-5.11-undefined-behavior.patch
 #
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -221,6 +223,7 @@ This package contains some test programs
 %patch30 -p1 -b .conf264
 %patch31 -p1 -b .nowin2_sig
 %patch32 -p1 -b .xjack_smallwin
+%patch33 -p1 -b .undef
 
 change_option(){
    set +x
@@ -701,6 +704,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Jul  8 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-7.respin1
+- Fix codes which contain undefined behavior, detected by gcc45
+
 * Mon Jun 28 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-6.respin1
 - Replace Patch32 (xscreensaver-5.11-xjack-with-small-window.patch) with the one
   revised by the upstream