rpms/xscreensaver/devel xscreensaver-5.11-xjack-with-small-window.patch, 1.3, 1.4 xscreensaver.spec, 1.114, 1.115

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8114/devel

Modified Files:
	xscreensaver-5.11-xjack-with-small-window.patch 
	xscreensaver.spec 
Log Message:
* Sun Jul 25 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-8.respin1
- Fix xscreensaver-5.11-xjack-with-small-window.patch (bug 617905)


xscreensaver-5.11-xjack-with-small-window.patch:
 xjack.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Index: xscreensaver-5.11-xjack-with-small-window.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver-5.11-xjack-with-small-window.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xscreensaver-5.11-xjack-with-small-window.patch	27 Jun 2010 17:51:23 -0000	1.3
+++ xscreensaver-5.11-xjack-with-small-window.patch	25 Jul 2010 07:30:09 -0000	1.4
@@ -1,5 +1,5 @@
 --- xscreensaver-5.11/hacks/xjack.c.small	2008-07-31 18:52:05.000000000 +0900
-+++ xscreensaver-5.11/hacks/xjack.c	2010-06-28 02:42:42.000000000 +0900
++++ xscreensaver-5.11/hacks/xjack.c	2010-07-25 15:48:27.000000000 +0900
 @@ -59,6 +59,10 @@
    XGetWindowAttributes (st->dpy, st->window, &st->xgwa);
    st->columns = (st->xgwa.width  - st->hspace - st->hspace) / st->char_width;
@@ -11,3 +11,18 @@
    st->rows--;
    st->columns--;
  
+@@ -116,9 +120,12 @@
+ 
+   xjack_reshape (dpy, window, st, st->xgwa.width, st->xgwa.height);
+ 
+-  st->left = 0xFF & (random() % ((st->columns / 2)+1));
+-  st->right = st->left + (0xFF & (random() % (st->columns - st->left - 10)
++  if (st->columns >= 21)
++  {
++    st->left = 0xFF & (random() % ((st->columns / 2)+1));
++    st->right = st->left + (0xFF & (random() % (st->columns - st->left - 10)
+                                   + 10));
++  }
+   st->x = 0;
+   st->y = 0;
+ 


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- xscreensaver.spec	8 Jul 2010 09:36:20 -0000	1.114
+++ xscreensaver.spec	25 Jul 2010 07:30:09 -0000	1.115
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    7
+%define fedora_rel    8
 
 %define extrarel      .respin1
 
@@ -704,6 +704,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Jul 25 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-8.respin1
+- Fix xscreensaver-5.11-xjack-with-small-window.patch (bug 617905)
+
 * 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