[xscreensaver/f14/master] - Fix the issue that xflame is completely blank (bug 642651)

[Mamoru Tasaka]

commit 527517a623bd4b53ddb3311a7dc9a9556776ff89
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Wed Oct 13 23:22:16 2010 +0900

    - Fix the issue that xflame is completely blank (bug 642651)

 xscreensaver-5.12-flame-completely-blank.patch |   22 ++++++++++++++++++++++
 xscreensaver.spec                              |    8 +++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/xscreensaver-5.12-flame-completely-blank.patch b/xscreensaver-5.12-flame-completely-blank.patch
new file mode 100644
index 0000000..0e636a1
--- /dev/null
+++ b/xscreensaver-5.12-flame-completely-blank.patch
@@ -0,0 +1,22 @@
+--- xscreensaver-5.12/hacks/flame.c.debug	2010-05-24 14:39:51.000000000 +0900
++++ xscreensaver-5.12/hacks/flame.c	2010-10-13 23:16:00.000000000 +0900
+@@ -173,7 +173,7 @@
+ static int
+ recurse (struct state *st, double x, double y, int l, Display *dpy, Window win)
+ {
+-  int /*xp, yp,*/ i;
++  int i;
+   double nx, ny;
+ 
+   if (l == st->max_levels)
+@@ -184,8 +184,8 @@
+ 
+       if (x > -1.0 && x < 1.0 && y > -1.0 && y < 1.0)
+ 	{
+-/*	  xp = st->points[st->num_points].x = (int) ((st->width / 2) * (x + 1.0));
+-	  yp = st->points[st->num_points].y = (int) ((st->height / 2) * (y + 1.0));*/
++	  st->points[st->num_points].x = (int) ((st->width / 2) * (x + 1.0));
++	  st->points[st->num_points].y = (int) ((st->height / 2) * (y + 1.0));
+ 	  st->num_points++;
+ 	  if (st->num_points >= POINT_BUFFER_SIZE)
+ 	    {
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 4ac44a3..6b4f94c 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    4
+%define fedora_rel    5
 
 %undefine extrarel
 
@@ -63,6 +63,8 @@ Patch31:         xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch
 Patch32:         xscreensaver-5.12-gltext-memleak.patch
 # Remove duplicate xml files entry
 Patch33:         xscreensaver-5.12-xml-duplicate-list.patch
+# Fix the issue that flame is completely blank (bug 642651)
+Patch34:         xscreensaver-5.12-flame-completely-blank.patch
 #
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -237,6 +239,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch31 -p1 -b .langc
 %patch32 -p1 -b .gltext_mem
 %patch33 -p1 -b .xmllist
+%patch34 -p1 -b .flame_blank
 
 change_option(){
    set +x
@@ -742,6 +745,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Oct 13 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-5
+- Fix the issue that xflame is completely blank (bug 642651)
+
 * Wed Oct 13 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-4
 - Enable libgle dependent hacks on F-13+