rpms/xscreensaver/devel xscreensaver-5.10-apple2-initialization.patch, NONE, 1.1 xscreensaver-5.10-substrate-bz545847.patch, NONE, 1.1 xscreensaver.spec, 1.99, 1.100

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.10-apple2-initialization.patch 
	xscreensaver-5.10-substrate-bz545847.patch 
Log Message:
* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
- Fix occasional crash on substrate (bug 545847)
- Fix initialization process on apple2, hopefully fix bug 540790


xscreensaver-5.10-apple2-initialization.patch:
 analogtv.c |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

--- NEW FILE xscreensaver-5.10-apple2-initialization.patch ---
--- xscreensaver-5.10/hacks/analogtv.c.debug2	2008-08-06 10:59:35.000000000 +0900
+++ xscreensaver-5.10/hacks/analogtv.c	2009-12-10 04:31:11.000000000 +0900
@@ -1020,21 +1020,23 @@
   int i,height;
   static const double levelfac[3]={-7.5, 5.5, 24.5};
 
-  for (height=0; height<avgheight+2.0 && height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
+  for (height=0; height<=ANALOGTV_MAX_LINEHEIGHT; height++) {
 
     for (i=0; i<height; i++) {
       it->leveltable[height][i].index = 2;
     }
-    
-    if (avgheight>=3) {
-      it->leveltable[height][0].index=0;
-    }
-    if (avgheight>=5) {
-      it->leveltable[height][height-1].index=0;
-    }
-    if (avgheight>=7) {
-      it->leveltable[height][1].index=1;
-      it->leveltable[height][height-2].index=1;
+
+    if (height < avgheight + 2.0){
+      if (avgheight>=3) {
+        it->leveltable[height][0].index=0;
+      }
+      if (avgheight>=5) {
+        if (height >= 1) it->leveltable[height][height-1].index=0;
+      }
+      if (avgheight>=7) {
+        it->leveltable[height][1].index=1;
+        if (height >= 2) it->leveltable[height][height-2].index=1;
+      }
     }
 
     for (i=0; i<height; i++) {

xscreensaver-5.10-substrate-bz545847.patch:
 substrate.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE xscreensaver-5.10-substrate-bz545847.patch ---
--- xscreensaver-5.10/hacks/substrate.c.debug	2008-07-31 19:19:57.000000000 +0900
+++ xscreensaver-5.10/hacks/substrate.c	2009-12-10 03:01:06.000000000 +0900
@@ -198,6 +198,13 @@
         /* We timed out.  Use our default values */
         px = cr->x;
         py = cr->y;
+
+        /* Sanity check needed */
+        if (px < 0) px = 0;
+        if (px >= f->width) px = f->width - 1;
+        if (py < 0) py = 0;
+        if (py >= f->height) py = f->height - 1;
+
         ref_cgrid(f, px, py) = cr->t;
     }
 


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- xscreensaver.spec	7 Oct 2009 20:33:55 -0000	1.99
+++ xscreensaver.spec	10 Dec 2009 15:50:45 -0000	1.100
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    2
+%define fedora_rel    3
 
 %define extrarel      %{nil}
 
@@ -49,6 +49,8 @@ Patch21:         xscreensaver-5.07-webco
 #
 #
 # Not sent to upstream yet, must do later
+Patch30:         xscreensaver-5.10-substrate-bz545847.patch
+Patch31:         xscreensaver-5.10-apple2-initialization.patch
 #
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -203,6 +205,8 @@ This package contains some test programs
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
+%patch30 -p1 -b .subst
+%patch31 -p1 -b .apple
 
 change_option(){
    set +x
@@ -260,7 +264,9 @@ change_option driver/XScreenSaver.ad.in 
    splash=False \
    ignoreUninstalledPrograms=True \
    textProgram=fortune\ -s \
+%if %{?fedora} >= 12
    textURL=%{default_URL}
+%endif
 
 # Disable the following hacks by default
 # (disable, not remove)
@@ -670,9 +676,13 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Dec 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-3
+- Fix occasional crash on substrate (bug 545847)
+- Fix initialization process on apple2, hopefully fix bug 540790
+
 * Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-2
-- Restrict Autostart effect to GNOME session only (bug 517391)
-- Use planet.fedoraproject.org for textURL (still the default textMode
+- F-12+: Restrict Autostart effect to GNOME session only (bug 517391)
+- F-12+: Use planet.fedoraproject.org for textURL (still the default textMode
   is "file", i.e. no net connection)
 
 * Tue Sep  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.10-1