[xscreensaver] Fix the iteration number for pentomino mode in polyominoes

[Mamoru Tasaka]

commit e26e33906779d402456f3a6cedb1da0cee704425
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Sun Apr 21 02:42:12 2013 +0900

    Fix the iteration number for pentomino mode in polyominoes
    
      (bug 954077)
    - Convert maxlife option from 5.20- for fireworkx (bug 953916)
    - Fix broken Name entry for desktop file of GL hacks (bug 953558)
    - Add OnlyShownIn entry for desktop files (bug 953558)

 xscreensaver-5.21-fireworkx-transit.patch        |   21 ++++++++++++++++
 xscreensaver-5.21-polyominoes-array-bounds.patch |   11 ++++++++
 xscreensaver.spec                                |   29 +++++++++++++++++----
 3 files changed, 55 insertions(+), 6 deletions(-)
---
diff --git a/xscreensaver-5.21-fireworkx-transit.patch b/xscreensaver-5.21-fireworkx-transit.patch
new file mode 100644
index 0000000..9c812f2
--- /dev/null
+++ b/xscreensaver-5.21-fireworkx-transit.patch
@@ -0,0 +1,21 @@
+--- xscreensaver-5.21/hacks/fireworkx.c.transit	2013-04-21 02:05:22.000000000 +0900
++++ xscreensaver-5.21/hacks/fireworkx.c	2013-04-21 02:06:43.000000000 +0900
+@@ -45,7 +45,7 @@
+ #define HEIGHT 632                /* 548     */
+ #define SHELLCOUNT 4              /* FIXED NUMBER; for SSE optimization */
+ #define PIXCOUNT 500              /* 500     */
+-#define SHELL_LIFE_DEFAULT 3200   /* 3200    */
++#define SHELL_LIFE_DEFAULT 32     /* 32    */
+ #define SHELL_LIFE_RATIO 6        /* 6       */
+ #define POWDER 5.0                /* 5.0     */
+ #define FTWEAK 12                 /* 12      */
+@@ -709,6 +709,9 @@
+ 	st->shoot          = get_boolean_resource(st->dpy, "shoot"   , "Boolean");
+ 	st->verbose        = get_boolean_resource(st->dpy, "verbose" , "Boolean");
+ 	st->max_shell_life = get_integer_resource(st->dpy, "maxlife" , "Integer");
++        /* transit from xscreensaver <= 5.20 */
++	if (st->max_shell_life < 0) st->max_shell_life = 0;
++	if (st->max_shell_life > 100) st->max_shell_life = 100;
+ 	st->delay          = get_integer_resource(st->dpy, "delay"   , "Integer");
+ 
+ 	st->max_shell_life = pow(10.0,(st->max_shell_life/50.0)+2.7);
diff --git a/xscreensaver-5.21-polyominoes-array-bounds.patch b/xscreensaver-5.21-polyominoes-array-bounds.patch
new file mode 100644
index 0000000..06f9f9b
--- /dev/null
+++ b/xscreensaver-5.21-polyominoes-array-bounds.patch
@@ -0,0 +1,11 @@
+--- xscreensaver-5.21/hacks/polyominoes.c.arraybounds	2012-07-04 05:22:21.000000000 +0900
++++ xscreensaver-5.21/hacks/polyominoes.c	2013-04-21 01:50:43.000000000 +0900
+@@ -1500,7 +1500,7 @@
+   int i,j,t,u;
+ 
+   j=0;
+-  for (i=0;i<18;i++) {
++  for (i=0;i<12;i++) {
+     one_sided_pentomino[j] = pentomino[i];
+     for (t=0;t<8;t++)
+       if (one_sided_pentomino[j].transform_list[t]>=4) {
diff --git a/xscreensaver.spec b/xscreensaver.spec
index cb32e37..1978619 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    2
+%define fedora_rel    3
 
 %undefine extrarel
 
@@ -65,10 +65,15 @@ Patch30:         xscreensaver-5.11-conf264.patch
 Patch32:         xscreensaver-5.13-dpmsQuickoff-japo.patch
 # Fix bumps segfault on 64bit (bug 911007)
 Patch33:         xscreensaver-5.21-bumps-size.patch
+# Fix the iteration number for pentomino mode in polyominoes
+# (bug 954077)
+Patch34:         xscreensaver-5.21-polyominoes-array-bounds.patch
+# Convert maxlife option from 5.20- for fireworkx (bug 953916)
+Patch35:         xscreensaver-5.21-fireworkx-transit.patch
 # driver/test-passwd tty segfaults
-Patch41:         xscreensaver-5.12-test-passwd-segv-tty.patch
+Patch51:         xscreensaver-5.12-test-passwd-segv-tty.patch
 # patch to compile driver/test-xdpms
-Patch42:         xscreensaver-5.12-tests-miscfix.patch
+Patch52:         xscreensaver-5.12-tests-miscfix.patch
 # Fedora specific patch
 # senescent_p: Fedora changes screensaver_id
 Patch100:        xscreensaver-5.21-senescent_p-rpmver.patch
@@ -262,8 +267,10 @@ This package contains some test programs to debug XScreenSaver.
 %patch21 -p1 -b .nonet
 %patch32 -p1 -b .dpmsoff_japo
 %patch33 -p1 -b .bumps_size
-%patch41 -p1 -b .test_passwd
-%patch42 -p1 -b .test_misc
+%patch34 -p1 -b .polyominoes_arraybounds
+%patch35 -p1 -b .fireworkx.transit
+%patch51 -p1 -b .test_passwd
+%patch52 -p1 -b .test_misc
 %patch100 -p1 -b .rpmver
 
 change_option(){
@@ -681,7 +688,8 @@ create_desktop(){
       echo "$COMMAND could not be found under $RPM_BUILD_ROOT"
       #exit 1
    fi
-   NAME=`cat $1 | sed -n -e 's|^<screen.*_label=\"\(.*\)\">.*$|\1|p'`
+# NAME entry fix (bug 953558)
+   NAME=`cat $1 | sed -n -e 's|^<screen.*_label=\"\([^\"][^\"]*\)\".*>.*$|\1|p'`
    ARG=`cat $1 | sed -n -e 's|^.*<command arg=\"\([^ ][^ ]*\)\".*$|\1|p'`
    ARG=$(echo "$ARG" | while read line ; do echo -n "$line " ; done)
    COMMENT="`cat $1 | sed -e '1,/_description/d' | \
@@ -708,6 +716,8 @@ create_desktop(){
    echo "StartupNotify=false" >> $2
    echo "Type=Application" >> $2
    echo "Categories=GNOME;Screensaver;" >> $2
+# Add OnlyShowIn (bug 953558)
+   echo "OnlyShowIn=GNOME;MATE;" >> $2
 }
 
 cd $dd
@@ -816,6 +826,13 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Apr 21 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.21-3
+- Fix the iteration number for pentomino mode in polyominoes
+  (bug 954077)
+- Convert maxlife option from 5.20- for fireworkx (bug 953916)
+- Fix broken Name entry for desktop file of GL hacks (bug 953558)
+- Add OnlyShownIn entry for desktop files (bug 953558)
+
 * Sat Feb 16 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.21-2
 - Fix bumps segfault on 64bit (bug 911007)