Bug 642651 - Upstream broke flame xscreensaver hack
Summary: Upstream broke flame xscreensaver hack
Keywords:
Status: CLOSED ERRATA
Alias: None
Product: Fedora
Classification: Fedora
Component: xscreensaver
Version: 13
Hardware: All
OS: Linux
low
medium
Target Milestone: ---
Assignee: Mamoru TASAKA
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2010-10-13 13:55 UTC by John Sullivan
Modified: 2010-10-22 18:12 UTC (History)
1 user (show)

Fixed In Version: xscreensaver-5.12-5.fc13
Clone Of:
Environment:
Last Closed: 2010-10-22 18:10:35 UTC
Type: ---
Embargoed:


Attachments (Terms of Use)

Description John Sullivan 2010-10-13 13:55:50 UTC
xscreensaver 5.12-* contains (in the upstream 5.12 tarball) the following change relative to 5.11-9 (using 5.11 upstream):

diff -rU3 11-9/xscreensaver-5.11/hacks/flame.c 12-1/xscreensaver-5.12/hacks/flame.c
--- 11-9/xscreensaver-5.11/hacks/flame.c        2008-07-31 10:29:35.000000000 +0100
+++ 12-1/xscreensaver-5.12/hacks/flame.c        2010-05-24 06:39:51.000000000 +0100
@@ -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 /*xp, yp,*/ 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));
+/*       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->num_points++;
          if (st->num_points >= POINT_BUFFER_SIZE)
            {


This doesn't appear to be mentioned in the changelog (file README in the tarball), but has the effect that the flame display is now blank.

Note that though xp and yp are unused in the rest of the function and could be removed (and were presumably removed because newer gcc versions whine about the unused locals), the two removed assignments also assign to the points array passed to XDrawPoints, so instead all points drawn are left as [0, 0].

Comment 1 Fedora Update System 2010-10-13 14:45:27 UTC
xscreensaver-5.12-5.fc14 has been submitted as an update for Fedora 14.
https://admin.fedoraproject.org/updates/xscreensaver-5.12-5.fc14

Comment 2 Fedora Update System 2010-10-13 14:47:41 UTC
xscreensaver-5.12-5.fc13 has been submitted as an update for Fedora 13.
https://admin.fedoraproject.org/updates/xscreensaver-5.12-5.fc13

Comment 3 Fedora Update System 2010-10-13 14:50:51 UTC
xscreensaver-5.12-5.fc12 has been submitted as an update for Fedora 12.
https://admin.fedoraproject.org/updates/xscreensaver-5.12-5.fc12

Comment 4 Mamoru TASAKA 2010-10-13 14:53:03 UTC
Thank you for reporting.

Comment 5 Fedora Update System 2010-10-14 06:28:52 UTC
xscreensaver-5.12-5.fc12 has been pushed to the Fedora 12 testing repository.  If problems still persist, please make note of it in this bug report.
 If you want to test the update, you can install it with 
 su -c 'yum --enablerepo=updates-testing update xscreensaver'.  You can provide feedback for this update here: https://admin.fedoraproject.org/updates/xscreensaver-5.12-5.fc12

Comment 6 Fedora Update System 2010-10-18 05:34:34 UTC
xscreensaver-5.12-5.fc14 has been pushed to the Fedora 14 stable repository.  If problems still persist, please make note of it in this bug report.

Comment 7 Fedora Update System 2010-10-22 18:10:26 UTC
xscreensaver-5.12-5.fc12 has been pushed to the Fedora 12 stable repository.  If problems still persist, please make note of it in this bug report.

Comment 8 Fedora Update System 2010-10-22 18:12:25 UTC
xscreensaver-5.12-5.fc13 has been pushed to the Fedora 13 stable repository.  If problems still persist, please make note of it in this bug report.


Note You need to log in before you can comment on or make changes to this bug.