rpms/xscreensaver/devel xscreensaver-5.00-fix-hacks.patch, 1.1, 1.2 xscreensaver.spec, 1.18, 1.19
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Mon Jul 3 15:33:46 UTC 2006
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10845
Modified Files:
xscreensaver-5.00-fix-hacks.patch xscreensaver.spec
Log Message:
* Mon Jul 3 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-13
- Fix for causing SEGV on exit about petri, squiral (total: 22 hacks)
xscreensaver-5.00-fix-hacks.patch:
Index: xscreensaver-5.00-fix-hacks.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver-5.00-fix-hacks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xscreensaver-5.00-fix-hacks.patch 2 Jul 2006 17:50:57 -0000 1.1
+++ xscreensaver-5.00-fix-hacks.patch 3 Jul 2006 15:33:45 -0000 1.2
@@ -357,8 +357,8 @@
--st->move_length;
st->next_fn = move;
}
---- xscreensaver-5.00/hacks/petri.c.petri 2006-02-26 05:13:25.000000000 +0900
-+++ xscreensaver-5.00/hacks/petri.c 2006-06-29 07:30:28.000000000 +0900
+--- xscreensaver-5.00/hacks/petri.c.petri2 2006-02-26 05:13:25.000000000 +0900
++++ xscreensaver-5.00/hacks/petri.c 2006-07-03 23:55:01.000000000 +0900
@@ -121,8 +121,8 @@
};
@@ -381,7 +381,26 @@
if (st->xSize > st->ySize)
{
st->xSize = st->ySize;
-@@ -586,8 +586,8 @@
+@@ -482,6 +482,9 @@
+
+ XFillRectangle (st->dpy, st->window, st->coloredGCs[0], 0, 0,
+ st->windowWidth, st->windowHeight);
++
++ if (!st->arr_width) st->arr_width = 1;
++ if (!st->arr_height) st->arr_height = 1;
+
+ st->arr = (cell *) calloc (sizeof(cell), st->arr_width * st->arr_height);
+ if (!st->arr)
+@@ -494,7 +497,7 @@
+ for (y = 0; y < st->arr_height; y++)
+ {
+ int row = y * st->arr_width;
+- for (x = 0; x < st->arr_width; x++)
++ for (x = 0; x < st->arr_width; x++)
+ {
+ st->arr[row+x].speed = 0.0;
+ st->arr[row+x].growth = 0.0;
+@@ -586,8 +589,8 @@
while (n--)
{
@@ -392,15 +411,36 @@
int c;
FLOAT s;
if (b)
-@@ -597,7 +597,7 @@
+@@ -597,7 +600,7 @@
}
else
{
- c = (random () % (st->count-1)) + 1;
-+ c = ((st->count - 1) ? random () % (st->count-1) : 0) + 1;
++ c = ((st->count - 1) ? random () % (st->count-1) : 0) + 1;
s = RAND_FLOAT * (st->maxlifespeed - st->minlifespeed) + st->minlifespeed;
}
newcell (st, &st->arr[y * st->arr_width + x], c, s);
+@@ -637,7 +640,7 @@
+ int x = cell_x(a) + coords->x;
+ int y = cell_y(a) + coords->y;
+ coords++;
+-
++
+ if (x < 0) x = st->arr_width - 1;
+ else if (x >= st->arr_width) x = 0;
+
+@@ -650,9 +653,9 @@
+ if (a->growth >= st->diaglim)
+ killcell (st, a);
+ }
+-
++
+ randblip (st, (st->head->next) == st->tail);
+-
++
+ for (a = st->head->next; a != st->tail; a = a->next)
+ {
+ if (a->isnext)
--- xscreensaver-5.00/hacks/piecewise.c.piecewise 2006-03-08 18:57:55.000000000 +0900
+++ xscreensaver-5.00/hacks/piecewise.c 2006-06-29 07:14:50.000000000 +0900
@@ -358,7 +358,7 @@
@@ -508,6 +548,23 @@
st->draw_dy = -1; st->draw_dir = UP; st->hole_y -= st->draw_rnd;
} else {
st->draw_dy = 1; st->draw_dir = DOWN; st->draw_rnd -= st->hole_y;
+--- xscreensaver-5.00/hacks/squiral.c.squiral 2006-02-09 19:40:17.000000000 +0900
++++ xscreensaver-5.00/hacks/squiral.c 2006-07-04 00:27:24.000000000 +0900
+@@ -198,10 +198,12 @@
+ memset(&st->fill[(st->height-st->inclear-1)*st->width], 0, sizeof(int)*st->width);
+ st->inclear++;
+ XDrawLine(st->dpy, st->window, st->erase_gc, 0, st->inclear, st->width-1, st->inclear);
+- memset(&st->fill[st->inclear*st->width], 0, sizeof(int)*st->width);
++ if (st->inclear < st->height)
++ memset(&st->fill[st->inclear*st->width], 0, sizeof(int)*st->width);
+ XDrawLine(st->dpy, st->window, st->erase_gc, 0, st->height-st->inclear-1, st->width-1,
+ st->height-st->inclear-1);
+- memset(&st->fill[(st->height-st->inclear-1)*st->width], 0, sizeof(int)*st->width);
++ if (st->height - st->inclear >= 1)
++ memset(&st->fill[(st->height-st->inclear-1)*st->width], 0, sizeof(int)*st->width);
+ st->inclear++;
+ if(st->inclear>st->height/2) st->inclear=st->height;
+ }
--- xscreensaver-5.00/hacks/twang.c.twang 2006-03-27 14:30:37.000000000 +0900
+++ xscreensaver-5.00/hacks/twang.c 2006-07-02 15:24:03.000000000 +0900
@@ -554,8 +554,8 @@
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xscreensaver.spec 2 Jul 2006 17:50:57 -0000 1.18
+++ xscreensaver.spec 3 Jul 2006 15:33:45 -0000 1.19
@@ -1,7 +1,7 @@
%define name xscreensaver
%define version 5.00
-%define fedora_rel 12
+%define fedora_rel 13
%define fedora_ver 5.90
%define default_text %{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt
@@ -288,7 +288,10 @@
%defattr(-,root,root)
%changelog
-* Sun Jul 1 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-12
+* Mon Jul 3 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-13
+- Fix for causing SEGV on exit about petri, squiral (total: 22 hacks)
+
+* Sun Jul 2 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-12
- Fix other (extras, gl-extras) hacks (total: 21 hacks).
- Make sure the subprocess xscreensaver-getimage is properly
killed by parent hack process.
More information about the fedora-extras-commits
mailing list