From 5329a82d8aaf2e87a2940f2244ed8de139929263 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Nov 13 2007 10:49:54 +0000 Subject: - Update to 5.04 --- diff --git a/.cvsignore b/.cvsignore index 160ec4b..f340c83 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -xscreensaver-5.02.tar.gz -xscreensaver-5.03.tar.gz +xscreensaver-5.04.tar.gz diff --git a/sources b/sources index 985884f..ba95b36 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -83937791b30f55f52011d4fee0f5dff3 xscreensaver-5.02.tar.gz -367b0397132102faf43e71e27bbdc181 xscreensaver-5.03.tar.gz +1d27b5ddecdb49c806d1e91ca82fc43e xscreensaver-5.04.tar.gz diff --git a/xscreensaver-5.02-pidnumber-write_long.patch b/xscreensaver-5.02-pidnumber-write_long.patch deleted file mode 100644 index fa3b5bd..0000000 --- a/xscreensaver-5.02-pidnumber-write_long.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xscreensaver-5.02/driver/subprocs.c.pidnum_debug 2007-03-15 17:23:37.000000000 +0900 -+++ xscreensaver-5.02/driver/subprocs.c 2007-08-28 16:40:38.000000000 +0900 -@@ -93,7 +93,7 @@ - num = -num; - } - -- while ((num > 0) && (num_digits < sizeof(string - 1))) -+ while ((num > 0) && (num_digits < sizeof(string) - 1)) - { - int digit; - digit = (int) num % 10; diff --git a/xscreensaver-5.03-compiler-warning.patch b/xscreensaver-5.03-compiler-warning.patch deleted file mode 100644 index bffd3ba..0000000 --- a/xscreensaver-5.03-compiler-warning.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xscreensaver-5.03/driver/xscreensaver.c.orig 2007-03-15 17:33:00.000000000 +0900 -+++ xscreensaver-5.03/driver/xscreensaver.c 2007-10-15 14:16:02.000000000 +0900 -@@ -1406,7 +1406,9 @@ - if (!spasswd) - { - fprintf(stderr, "Could not figure out who the current user is!\n"); -+#if 0 - fprintf(stderr, "spasswd is %x\n", (unsigned int) spasswd); -+#endif - return 1; - } - diff --git a/xscreensaver-5.03-demo-conf-maxvalue-plus1.patch b/xscreensaver-5.03-demo-conf-maxvalue-plus1.patch deleted file mode 100644 index e1facc8..0000000 --- a/xscreensaver-5.03-demo-conf-maxvalue-plus1.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xscreensaver-5.03/driver/demo-Gtk-conf.c.debug 2006-05-24 07:02:11.000000000 +0900 -+++ xscreensaver-5.03/driver/demo-Gtk-conf.c 2007-10-06 22:36:55.000000000 +0900 -@@ -749,6 +749,7 @@ - : p->value); - gfloat si = (p->high - p->low) / 100; - gfloat pi = (p->high - p->low) / 10; -+ gfloat page_size = ((p->type == SLIDER) ? 1 : 0); - - if (p->value < p->low || p->value > p->high) - { -@@ -786,8 +787,8 @@ - - return GTK_ADJUSTMENT (gtk_adjustment_new (value, - p->low, -- p->high + 1, -- si, pi, 1)); -+ p->high + page_size, -+ si, pi, page_size)); - } - - diff --git a/xscreensaver-5.03-screen-depth.patch b/xscreensaver-5.03-screen-depth.patch deleted file mode 100644 index 305a5b9..0000000 --- a/xscreensaver-5.03-screen-depth.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- xscreensaver-5.03/driver/lock.c.orig 2007-07-11 05:19:00.000000000 +0900 -+++ xscreensaver-5.03/driver/lock.c 2007-11-01 19:03:18.000000000 +0900 -@@ -1076,9 +1076,10 @@ - pw->user_entry_pixmap = 0; - } - -- pw->user_entry_pixmap = XCreatePixmap(si->dpy, si->passwd_dialog, -- rects[0].width, rects[0].height, pw->prompt_screen->current_depth); -- -+ pw->user_entry_pixmap = -+ XCreatePixmap (si->dpy, si->passwd_dialog, -+ rects[0].width, rects[0].height, -+ DefaultDepthOfScreen (pw->prompt_screen->screen)); - - XFillRectangle (si->dpy, pw->user_entry_pixmap, gc2, - 0, 0, rects[0].width, rects[0].height); - diff --git a/xscreensaver-5.03-webcollage-default-nonet.patch b/xscreensaver-5.03-webcollage-default-nonet.patch deleted file mode 100644 index 604dad9..0000000 --- a/xscreensaver-5.03-webcollage-default-nonet.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- xscreensaver-5.03/driver/XScreenSaver.ad.in.nonet 2007-07-17 18:01:47.000000000 +0900 -+++ xscreensaver-5.03/driver/XScreenSaver.ad.in 2007-08-29 01:39:14.000000000 +0900 -@@ -304,10 +304,12 @@ - celtic -root \n\ - cwaves -root \n\ - m6502 -root \n\ --- default-n: webcollage -root \n\ -+- default-n: webcollage -root \ -+ -directory @DEFAULT_IMAGE_DIRECTORY@ \n\ - - default-n: "WebCollage (whacked)" \ - webcollage -root -filter \ -- 'vidwhacker -stdin -stdout' \n\ -+ 'vidwhacker -stdin -stdout' \ -+ -directory @DEFAULT_IMAGE_DIRECTORY@ \n\ - - default-n: vidwhacker -root \n\ - \ - @GL_KLUDGE@ GL: gears -root \n\ ---- xscreensaver-5.03/hacks/config/webcollage.xml.nonet 2006-03-20 21:47:40.000000000 +0900 -+++ xscreensaver-5.03/hacks/config/webcollage.xml 2007-08-29 01:33:52.000000000 +0900 -@@ -20,7 +20,7 @@ - - - -- -+ - - <_description> - This program makes collages out of random images pulled off of the diff --git a/xscreensaver-5.04-webcollage-default-nonet.patch b/xscreensaver-5.04-webcollage-default-nonet.patch new file mode 100644 index 0000000..8a07312 --- /dev/null +++ b/xscreensaver-5.04-webcollage-default-nonet.patch @@ -0,0 +1,28 @@ +--- xscreensaver-5.04/driver/XScreenSaver.ad.in.nonet 2007-11-13 17:36:00.000000000 +0900 ++++ xscreensaver-5.04/driver/XScreenSaver.ad.in 2007-11-13 19:09:44.000000000 +0900 +@@ -305,10 +305,12 @@ + cwaves -root \n\ + m6502 -root \n\ + abstractile -root \n\ +-- default-n: webcollage -root \n\ ++- default-n: webcollage -root \ ++ -directory @DEFAULT_IMAGE_DIRECTORY@ \n\ + - default-n: "WebCollage (whacked)" \ + webcollage -root -filter \ +- 'vidwhacker -stdin -stdout' \n\ ++ 'vidwhacker -stdin -stdout' \ ++ -directory @DEFAULT_IMAGE_DIRECTORY@ \n\ + - default-n: vidwhacker -root \n\ + \ + @GL_KLUDGE@ GL: gears -root \n\ +--- xscreensaver-5.04/hacks/config/webcollage.xml.nonet 2006-03-20 21:47:40.000000000 +0900 ++++ xscreensaver-5.04/hacks/config/webcollage.xml 2007-11-13 19:05:29.000000000 +0900 +@@ -20,7 +20,7 @@ + + + +- ++ + + <_description> + This program makes collages out of random images pulled off of the diff --git a/xscreensaver.spec b/xscreensaver.spec index d59231c..821f912 100644 --- a/xscreensaver.spec +++ b/xscreensaver.spec @@ -1,13 +1,13 @@ %define name xscreensaver -%define version 5.03 +%define version 5.04 %define beta_ver %{nil} %if 0%{?fedora} <= 6 %define modular_conf 0 %define fedora_rel 1.12 %else %define modular_conf 1 -%define fedora_rel 14 +%define fedora_rel 1 %endif %define extrarel %{nil} @@ -34,13 +34,11 @@ License: BSD Group: Amusements/Graphics URL: http://www.jwz.org/xscreensaver/ Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz +%if %{modular_conf} Source10: update-xscreensaver-hacks +%endif Patch1: xscreensaver-5.00b5-sanitize-hacks.patch -Patch21: xscreensaver-5.03-webcollage-default-nonet.patch -Patch40: xscreensaver-5.02-pidnumber-write_long.patch -Patch41: xscreensaver-5.03-demo-conf-maxvalue-plus1.patch -Patch42: xscreensaver-5.03-compiler-warning.patch -Patch43: xscreensaver-5.03-screen-depth.patch +Patch21: xscreensaver-5.04-webcollage-default-nonet.patch Requires: xscreensaver-base = %{epoch}:%{version}-%{release} Requires: xscreensaver-extras = %{epoch}:%{version}-%{release} Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release} @@ -187,10 +185,6 @@ for gnome-screensaver compatibility. %patch1 -p1 -b .sanitize-hacks %patch21 -p1 -b .nonet -%patch40 -p1 -b .pidnum_debug -%patch41 -p1 -b .conf_max -%patch42 -p1 -b .warn -%patch43 -p1 -b .screen_depth change_option(){ set +x @@ -572,6 +566,9 @@ exit 0 %defattr(-,root,root,-) %changelog +* Tue Nov 13 2007 Mamoru Tasaka - 1:5.04-1 +- Update to 5.04 + * Thu Nov 1 2007 Mamoru Tasaka - 1:5.03-14 - Patch from upstream to fix screen depth problem (also "really" fix bug 336331).