rpms/xscreensaver/FC-4 xscreensaver-4.22-make-hack-paths-absolute.patch, NONE, 1.1 xscreensaver-4.22-signal-handler-fun.patch, NONE, 1.1 xscreensaver-4.22-warn-about-extras.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 xscreensaver.spec, 1.50, 1.51 xscreensaver-4.21-make-hack-paths-absolute.patch, 1.2, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Aug 12 02:21:57 UTC 2005


Author: rstrode

Update of /cvs/dist/rpms/xscreensaver/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv16617

Modified Files:
	.cvsignore sources xscreensaver.spec 
Added Files:
	xscreensaver-4.22-make-hack-paths-absolute.patch 
	xscreensaver-4.22-signal-handler-fun.patch 
	xscreensaver-4.22-warn-about-extras.patch 
Removed Files:
	xscreensaver-4.21-make-hack-paths-absolute.patch 
Log Message:
- update to xscreensaver 4.22
- tell users why they dont' have screensavers if they dont' have
  extras installed
- Don't call printf in signal handler (126428)


xscreensaver-4.22-make-hack-paths-absolute.patch:
 XScreenSaver.ad.in |  433 +++++++++++++++++++++++++++++------------------------
 1 files changed, 239 insertions(+), 194 deletions(-)

--- NEW FILE xscreensaver-4.22-make-hack-paths-absolute.patch ---
--- xscreensaver-4.22/driver/XScreenSaver.ad.in.make-hack-paths-absolute	2005-08-03 16:56:06.000000000 -0400
+++ xscreensaver-4.22/driver/XScreenSaver.ad.in	2005-08-03 17:07:14.000000000 -0400
@@ -148,276 +148,276 @@
 ! screen savers interactively.
 !
 *programs:								      \
-		 "Qix (solid)" 	qix -root -solid -segments 100		    \n\
-	   "Qix (transparent)" 	qix -root -count 4 -solid -transparent	    \n\
-		"Qix (linear)" 	qix -root -count 5 -solid -transparent	      \
+		 "Qix (solid)" 	@libexecdir@/xscreensaver/qix -root -solid -segments 100		    \n\
+	   "Qix (transparent)" 	@libexecdir@/xscreensaver/qix -root -count 4 -solid -transparent	    \n\
+		"Qix (linear)" 	@libexecdir@/xscreensaver/qix -root -count 5 -solid -transparent	      \
 				  -linear -segments 250 -size 100	    \n\
--		   "Qix (xor)" 	qix -root -linear -count 5 -size 200	      \
+-		   "Qix (xor)" 	@libexecdir@/xscreensaver/qix -root -linear -count 5 -size 200	      \
 				  -spread 30 -segments 75 -solid -xor	    \n\
 									      \
-	  "Attraction (balls)" 	attraction -root -mode balls		    \n\
-	  "Attraction (lines)" 	attraction -root -mode lines -points 3	      \
+	  "Attraction (balls)" 	@libexecdir@/xscreensaver/attraction -root -mode balls		    \n\
+	  "Attraction (lines)" 	@libexecdir@/xscreensaver/attraction -root -mode lines -points 3	      \
 				  -segments 200				    \n\
--	   "Attraction (poly)" 	attraction -root -mode polygons		    \n\
-	"Attraction (splines)" 	attraction -root -mode splines -segments      \
+-	   "Attraction (poly)" 	@libexecdir@/xscreensaver/attraction -root -mode polygons		    \n\
+	"Attraction (splines)" 	@libexecdir@/xscreensaver/attraction -root -mode splines -segments      \
 				  300					    \n\
-	"Attraction (orbital)" 	attraction -root -mode lines -radius 300      \
+	"Attraction (orbital)" 	@libexecdir@/xscreensaver/attraction -root -mode lines -radius 300      \
 				  -orbit -vmult 0.5			    \n\
 									      \
-				pyro -root				    \n\
-				rocks -root				    \n\
-				helix -root				    \n\
-				pedal -root				    \n\
-				rorschach -root -offset 7		    \n\
-				hopalong -root				    \n\
-				greynetic -root				    \n\
-				imsmap -root				    \n\
-				slidescreen -root			    \n\
-				decayscreen -root			    \n\
-				jigsaw -root				    \n\
-				blitspin -root -grab			    \n\
-				slip -root				    \n\
-				distort -root				    \n\
-				spotlight -root				    \n\
-	      "Ripples (oily)"	ripples -root -oily -light 2		    \n\
-	      "Ripples (stir)"	ripples -root -oily -light 2 -stir	    \n\
-	   "Ripples (desktop)"	ripples -root -water -light 6		    \n\
-				hypercube -root				    \n\
--				hyperball -root				    \n\
-				halo -root				    \n\
-				maze -root				    \n\
-				noseguy -root				    \n\
-				flame -root				    \n\
--				lmorph -root				    \n\
-				deco -root				    \n\
-				moire -root				    \n\
-				moire2 -root				    \n\
-				lightning -root				    \n\
-				strange -root				    \n\
--				spiral -root				    \n\
-				laser -root				    \n\
-				grav -root				    \n\
-	       "Grav (trails)" 	grav -root -trail -decay		    \n\
-				drift -root				    \n\
-				ifs -root				    \n\
-				julia -root				    \n\
-				penrose -root				    \n\
--				sierpinski -root			    \n\
-				braid -root				    \n\
-				galaxy -root				    \n\
-				bouboule -root				    \n\
-				swirl -root				    \n\
-				flag -root				    \n\
-				sphere -root				    \n\
-				forest -root				    \n\
--				lisa -root				    \n\
--				lissie -root				    \n\
-				goop -root -max-velocity 0.5 -elasticity      \
+				@libexecdir@/xscreensaver/pyro -root				    \n\
+				@libexecdir@/xscreensaver/rocks -root				    \n\
+				@libexecdir@/xscreensaver/helix -root				    \n\
+				@libexecdir@/xscreensaver/pedal -root				    \n\
+				@libexecdir@/xscreensaver/rorschach -root -offset 7		    \n\
+				@libexecdir@/xscreensaver/hopalong -root				    \n\
+				@libexecdir@/xscreensaver/greynetic -root				    \n\
+				@libexecdir@/xscreensaver/imsmap -root				    \n\
+				@libexecdir@/xscreensaver/slidescreen -root			    \n\
+				@libexecdir@/xscreensaver/decayscreen -root			    \n\
+				@libexecdir@/xscreensaver/jigsaw -root				    \n\
+				@libexecdir@/xscreensaver/blitspin -root -grab			    \n\
+				@libexecdir@/xscreensaver/slip -root				    \n\
+				@libexecdir@/xscreensaver/distort -root				    \n\
+				@libexecdir@/xscreensaver/spotlight -root				    \n\
+	      "Ripples (oily)"	@libexecdir@/xscreensaver/ripples -root -oily -light 2		    \n\
+	      "Ripples (stir)"	@libexecdir@/xscreensaver/ripples -root -oily -light 2 -stir	    \n\
+	   "Ripples (desktop)"	@libexecdir@/xscreensaver/ripples -root -water -light 6		    \n\
+				@libexecdir@/xscreensaver/hypercube -root				    \n\
+-				@libexecdir@/xscreensaver/hyperball -root				    \n\
+				@libexecdir@/xscreensaver/halo -root				    \n\
+				@libexecdir@/xscreensaver/maze -root				    \n\
+				@libexecdir@/xscreensaver/noseguy -root				    \n\
+				@libexecdir@/xscreensaver/flame -root				    \n\
+-				@libexecdir@/xscreensaver/lmorph -root				    \n\
+				@libexecdir@/xscreensaver/deco -root				    \n\
+				@libexecdir@/xscreensaver/moire -root				    \n\
+				@libexecdir@/xscreensaver/moire2 -root				    \n\
+				@libexecdir@/xscreensaver/lightning -root				    \n\
+				@libexecdir@/xscreensaver/strange -root				    \n\
+-				@libexecdir@/xscreensaver/spiral -root				    \n\
+				@libexecdir@/xscreensaver/laser -root				    \n\
+				@libexecdir@/xscreensaver/grav -root				    \n\
+	       "Grav (trails)" 	@libexecdir@/xscreensaver/grav -root -trail -decay		    \n\
+				@libexecdir@/xscreensaver/drift -root				    \n\
+				@libexecdir@/xscreensaver/ifs -root				    \n\
+				@libexecdir@/xscreensaver/julia -root				    \n\
+				@libexecdir@/xscreensaver/penrose -root				    \n\
+-				@libexecdir@/xscreensaver/sierpinski -root			    \n\
+				@libexecdir@/xscreensaver/braid -root				    \n\
+				@libexecdir@/xscreensaver/galaxy -root				    \n\
+				@libexecdir@/xscreensaver/bouboule -root				    \n\
+				@libexecdir@/xscreensaver/swirl -root				    \n\
+				@libexecdir@/xscreensaver/flag -root				    \n\
+				@libexecdir@/xscreensaver/sphere -root				    \n\
+				@libexecdir@/xscreensaver/forest -root				    \n\
+-				@libexecdir@/xscreensaver/lisa -root				    \n\
+-				@libexecdir@/xscreensaver/lissie -root				    \n\
+				@libexecdir@/xscreensaver/goop -root -max-velocity 0.5 -elasticity      \
 				  0.9					    \n\
-				starfish -root				    \n\
-	     "Starfish (blob)" 	starfish -root -blob			    \n\
-				munch -root				    \n\
-				mismunch -root				    \n\
-				fadeplot -root				    \n\
-				coral -root -delay 0			    \n\
-				mountain -root				    \n\
-				triangle -root -delay 1			    \n\
--				worm -root				    \n\
--				rotor -root				    \n\
--				ant -root				    \n\
--				demon -root				    \n\
--				loop -root				    \n\
--				vines -root				    \n\
-				kaleidescope -root			    \n\
-				xjack -root				    \n\
-				xlyap -root -randomize			    \n\
-				cynosure -root				    \n\
-				flow -root				    \n\
-				epicycle -root				    \n\
-				interference -root			    \n\
-				truchet -root -randomize		    \n\
-				bsod -root				    \n\
-				crystal -root				    \n\
-				discrete -root				    \n\
-				kumppa -root				    \n\
-				rd-bomb -root				    \n\
-	    "RD-Bomb (mobile)" 	rd-bomb -root -speed 1 -size 0.1	    \n\
-				sonar -root				    \n\
-				t3d -root				    \n\
-				penetrate -root				    \n\
-				deluxe -root				    \n\
-				compass -root				    \n\
-				squiral -root				    \n\
-				xflame -root				    \n\
-				wander -root				    \n\
-	      "Wander (spots)" 	wander -root -advance 0 -size 10 -circles     \
+				@libexecdir@/xscreensaver/starfish -root				    \n\
+	     "Starfish (blob)" 	@libexecdir@/xscreensaver/starfish -root -blob			    \n\
+				@libexecdir@/xscreensaver/munch -root				    \n\
+				@libexecdir@/xscreensaver/mismunch -root				    \n\
+				@libexecdir@/xscreensaver/fadeplot -root				    \n\
+				@libexecdir@/xscreensaver/coral -root -delay 0			    \n\
+				@libexecdir@/xscreensaver/mountain -root				    \n\
+				@libexecdir@/xscreensaver/triangle -root -delay 1			    \n\
+-				@libexecdir@/xscreensaver/worm -root				    \n\
+-				@libexecdir@/xscreensaver/rotor -root				    \n\
+-				@libexecdir@/xscreensaver/ant -root				    \n\
+-				@libexecdir@/xscreensaver/demon -root				    \n\
+-				@libexecdir@/xscreensaver/loop -root				    \n\
+-				@libexecdir@/xscreensaver/vines -root				    \n\
+				@libexecdir@/xscreensaver/kaleidescope -root			    \n\
+				@libexecdir@/xscreensaver/xjack -root				    \n\
+				@libexecdir@/xscreensaver/xlyap -root -randomize			    \n\
+				@libexecdir@/xscreensaver/cynosure -root				    \n\
+				@libexecdir@/xscreensaver/flow -root				    \n\
+				@libexecdir@/xscreensaver/epicycle -root				    \n\
+				@libexecdir@/xscreensaver/interference -root			    \n\
+				@libexecdir@/xscreensaver/truchet -root -randomize		    \n\
+				@libexecdir@/xscreensaver/bsod -root				    \n\
+				@libexecdir@/xscreensaver/crystal -root				    \n\
+				@libexecdir@/xscreensaver/discrete -root				    \n\
+				@libexecdir@/xscreensaver/kumppa -root				    \n\
+				@libexecdir@/xscreensaver/rd-bomb -root				    \n\
+	    "RD-Bomb (mobile)" 	@libexecdir@/xscreensaver/rd-bomb -root -speed 1 -size 0.1	    \n\
+				@libexecdir@/xscreensaver/sonar -root				    \n\
+				@libexecdir@/xscreensaver/t3d -root				    \n\
+				@libexecdir@/xscreensaver/penetrate -root				    \n\
+				@libexecdir@/xscreensaver/deluxe -root				    \n\
+				@libexecdir@/xscreensaver/compass -root				    \n\
+				@libexecdir@/xscreensaver/squiral -root				    \n\
+				@libexecdir@/xscreensaver/xflame -root				    \n\
+				@libexecdir@/xscreensaver/wander -root				    \n\
+	      "Wander (spots)" 	@libexecdir@/xscreensaver/wander -root -advance 0 -size 10 -circles     \
 				  -length 10000 -reset 100000		    \n\
--				critical -root				    \n\
-				phosphor -root				    \n\
-				xmatrix -root				    \n\
-				petri -root -size 2 -count 20		    \n\
-		     "Petri 2" 	petri -root -minlifespeed 0.02		      \
+-				@libexecdir@/xscreensaver/critical -root				    \n\
+				@libexecdir@/xscreensaver/phosphor -root				    \n\
+				@libexecdir@/xscreensaver/xmatrix -root				    \n\
+				@libexecdir@/xscreensaver/petri -root -size 2 -count 20		    \n\
+		     "Petri 2" 	@libexecdir@/xscreensaver/petri -root -minlifespeed 0.02		      \
 				  -maxlifespeed 0.03 -minlifespan 1	      \
 				  -maxlifespan 1 -instantdeathchan 0	      \
 				  -minorchan 0 -anychan 0.3		    \n\
-				shadebobs -root				    \n\
-				ccurve -root				    \n\
-				blaster -root				    \n\
-				bumps -root				    \n\
-				xteevee -root				    \n\
-				xanalogtv -root				    \n\
-				xspirograph -root			    \n\
-				nerverot -root				    \n\
--	    "NerveRot (dense)"	nerverot -root -count 1000		    \n\
--	    "NerveRot (thick)"	nerverot -root -count 100 -line-width 4       \
+				@libexecdir@/xscreensaver/shadebobs -root				    \n\
+				@libexecdir@/xscreensaver/ccurve -root				    \n\
+				@libexecdir@/xscreensaver/blaster -root				    \n\
+				@libexecdir@/xscreensaver/bumps -root				    \n\
+				@libexecdir@/xscreensaver/xteevee -root				    \n\
+				@libexecdir@/xscreensaver/xanalogtv -root				    \n\
+				@libexecdir@/xscreensaver/xspirograph -root			    \n\
+				@libexecdir@/xscreensaver/nerverot -root				    \n\
+-	    "NerveRot (dense)"	@libexecdir@/xscreensaver/nerverot -root -count 1000		    \n\
+-	    "NerveRot (thick)"	@libexecdir@/xscreensaver/nerverot -root -count 100 -line-width 4       \
 			        -max-nerve-radius 0.8 -nervousness 0.5 -db  \n\
-				xrayswarm -root				    \n\
--	       "Zoom (Fatbits)"	zoom -root				    \n\
-	       "Zoom (Lenses)"	zoom -root -lenses			    \n\
-				rotzoomer -root				    \n\
--	   "RotZoomer (mobile)" rotzoomer -root -move			    \n\
--	   "RotZoomer (sweep)"  rotzoomer -root -sweep			    \n\
-				whirlwindwarp -root			    \n\
- 	            "WhirlyGig"	whirlygig -root				    \n\
- 	            "SpeedMine"	speedmine -root				    \n\
- 	            "SpeedWorm"	speedmine -root -worm			    \n\
- 	                	vermiculate -root			    \n\
- 	                	twang -root				    \n\
- 	                	apollonian -root			    \n\
- 	                	euler2d -root				    \n\
-	     "Euler2d (dense)"	euler2d -root -count 4000 -eulertail 400      \
+				@libexecdir@/xscreensaver/xrayswarm -root				    \n\
+-	       "Zoom (Fatbits)"	@libexecdir@/xscreensaver/zoom -root				    \n\
+	       "Zoom (Lenses)"	@libexecdir@/xscreensaver/zoom -root -lenses			    \n\
+				@libexecdir@/xscreensaver/rotzoomer -root				    \n\
+-	   "RotZoomer (mobile)" @libexecdir@/xscreensaver/rotzoomer -root -move			    \n\
+-	   "RotZoomer (sweep)"  @libexecdir@/xscreensaver/rotzoomer -root -sweep			    \n\
+				@libexecdir@/xscreensaver/whirlwindwarp -root			    \n\
+ 	            "WhirlyGig"	@libexecdir@/xscreensaver/whirlygig -root				    \n\
+ 	            "SpeedMine"	@libexecdir@/xscreensaver/speedmine -root				    \n\
+ 	            "SpeedWorm"	@libexecdir@/xscreensaver/speedmine -root -worm			    \n\
+ 	                	@libexecdir@/xscreensaver/vermiculate -root			    \n\
+ 	                	@libexecdir@/xscreensaver/twang -root				    \n\
+ 	                	@libexecdir@/xscreensaver/apollonian -root			    \n\
+ 	                	@libexecdir@/xscreensaver/euler2d -root				    \n\
+	     "Euler2d (dense)"	@libexecdir@/xscreensaver/euler2d -root -count 4000 -eulertail 400      \
 				  -ncolors 230				    \n\
-- 	                	juggle -root				    \n\
- 	                	polyominoes -root			    \n\
-- 	                	thornbird -root				    \n\
- 	                	fluidballs -root			    \n\
- 	                	anemone -root				    \n\
- 	                	halftone -root				    \n\
- 	                	metaballs -root				    \n\
- 	                	eruption -root				    \n\
- 	                	popsquares -root			    \n\
- 	                	barcode -root				    \n\
- 	                	piecewise -root				    \n\
- 	                	cloudlife -root				    \n\
-		   "FontGlide"	fontglide -root -page			    \n\
-	"FontGlide (scroller)"	fontglide -root -scroll			    \n\
-				apple2 -root				    \n\
-                                bubbles -root				    \n\
-				pong -root				    \n\
-				wormhole -root				    \n\
-				pacman -root				    \n\
-				fuzzyflakes -root			    \n\
-				anemotaxis -root			    \n\
-				memscroller -root			    \n\
-				substrate -root				    \n\
-	 "Substrate (circles)"  substrate -root -circle-percent 33          \n\
-				intermomentary -root			    \n\
-				interaggregate -root			    \n\
-				fireworkx -root				    \n\
-				fiberlamp -root				    \n\
-				boxfit -root				    \n\
+- 	                	@libexecdir@/xscreensaver/juggle -root				    \n\
+ 	                	@libexecdir@/xscreensaver/polyominoes -root			    \n\
+- 	                	@libexecdir@/xscreensaver/thornbird -root				    \n\
+ 	                	@libexecdir@/xscreensaver/fluidballs -root			    \n\
+ 	                	@libexecdir@/xscreensaver/anemone -root				    \n\
+ 	                	@libexecdir@/xscreensaver/halftone -root				    \n\
+ 	                	@libexecdir@/xscreensaver/metaballs -root				    \n\
+ 	                	@libexecdir@/xscreensaver/eruption -root				    \n\
+ 	                	@libexecdir@/xscreensaver/popsquares -root			    \n\
+ 	                	@libexecdir@/xscreensaver/barcode -root				    \n\
+ 	                	@libexecdir@/xscreensaver/piecewise -root				    \n\
+ 	                	@libexecdir@/xscreensaver/cloudlife -root				    \n\
+		   "FontGlide"	@libexecdir@/xscreensaver/fontglide -root -page			    \n\
+	"FontGlide (scroller)"	@libexecdir@/xscreensaver/fontglide -root -scroll			    \n\
+				@libexecdir@/xscreensaver/apple2 -root				    \n\
+                                @libexecdir@/xscreensaver/bubbles -root				    \n\
+				@libexecdir@/xscreensaver/pong -root				    \n\
+				@libexecdir@/xscreensaver/wormhole -root				    \n\
+				@libexecdir@/xscreensaver/pacman -root				    \n\
+				@libexecdir@/xscreensaver/fuzzyflakes -root			    \n\
+				@libexecdir@/xscreensaver/anemotaxis -root			    \n\
+				@libexecdir@/xscreensaver/memscroller -root			    \n\
+				@libexecdir@/xscreensaver/substrate -root				    \n\
+	 "Substrate (circles)"  @libexecdir@/xscreensaver/substrate -root -circle-percent 33          \n\
+				@libexecdir@/xscreensaver/intermomentary -root			    \n\
+				@libexecdir@/xscreensaver/interaggregate -root			    \n\
+				@libexecdir@/xscreensaver/fireworkx -root				    \n\
+				@libexecdir@/xscreensaver/fiberlamp -root				    \n\
+				@libexecdir@/xscreensaver/boxfit -root				    \n\
 - default-n:			webcollage -root			    \n\
 - default-n:  "WebCollage (whacked)"					      \
 				webcollage -root -filter		      \
 				  'vidwhacker -stdin -stdout'		    \n\
-- default-n:			vidwhacker -root			    \n\
+- default-n:			@libexecdir@/xscreensaver/vidwhacker -root			    \n\
 									      \
- at GL_KLUDGE@ GL:			gears -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/gears -root				    \n\
 @GL_KLUDGE@ GL:	"Gears (planetary)" gears -root -planetary		    \n\
- at GL_KLUDGE@ GL:			superquadrics -root			    \n\
- at GL_KLUDGE@ GL:			morph3d -root				    \n\
- at GL_KLUDGE@ GL:			cage -root				    \n\
- at GL_KLUDGE@ GL:			moebius -root				    \n\
- at GL_KLUDGE@ GL:			stairs -root				    \n\
- at GL_KLUDGE@ GL:			pipes -root				    \n\
- at GL_KLUDGE@ GL:			sproingies -root			    \n\
- at GL_KLUDGE@ GL:			rubik -root				    \n\
- at GL_KLUDGE@ GL:			atlantis -root -gradient		    \n\
- at GL_KLUDGE@ GL:			lament -root				    \n\
- at GL_KLUDGE@ GL:			bubble3d -root				    \n\
- at GL_KLUDGE@ GL:			glplanet -root				    \n\
- at GL_KLUDGE@ GL:			flurry -root -preset random		    \n\
- at GL_KLUDGE@ GL:			pulsar -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/superquadrics -root			    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/morph3d -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/cage -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/moebius -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/stairs -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/pipes -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/sproingies -root			    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/rubik -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/atlantis -root -gradient		    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/lament -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/bubble3d -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/glplanet -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/flurry -root -preset random		    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/pulsar -root				    \n\
 -	   GL:	   "Pulsar (textures)"					      \
-				  pulsar -root -texture -mipmap		      \
+				  @libexecdir@/xscreensaver/pulsar -root -texture -mipmap		      \
 				  -texture_quality -light -fog		    \n\
- at GLE_KLUDGE@GL:			extrusion -root				    \n\
- at GL_KLUDGE@ GL:			sierpinski3d -root			    \n\
- at GL_KLUDGE@ GL:			menger -root				    \n\
- at GL_KLUDGE@ GL:	 "GFlux"	gflux -root				    \n\
- at GL_KLUDGE@ GL:	 "GFlux (grab)"	gflux -root -mode grab			    \n\
- at GL_KLUDGE@ GL:			stonerview -root			    \n\
- at GL_KLUDGE@ GL:			starwars -root				    \n\
- at GL_KLUDGE@ GL:			gltext -root				    \n\
+ at GLE_KLUDGE@GL:			@libexecdir@/xscreensaver/extrusion -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/sierpinski3d -root			    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/menger -root				    \n\
+ at GL_KLUDGE@ GL:	 "GFlux"	@libexecdir@/xscreensaver/gflux -root				    \n\
+ at GL_KLUDGE@ GL:	 "GFlux (grab)"	@libexecdir@/xscreensaver/gflux -root -mode grab			    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/stonerview -root			    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/starwars -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/gltext -root				    \n\
 @GL_KLUDGE@ GL:	"GLText (clock)" gltext -text "%A%n%d %b %Y%n%r" -root	    \n\
- at GL_KLUDGE@ GL:	 		molecule -root -shells			    \n\
- at GL_KLUDGE@ GL:			dangerball -root			    \n\
- at GL_KLUDGE@ GL:			circuit -root				    \n\
- at GL_KLUDGE@ GL:			engine -root				    \n\
- at GL_KLUDGE@ GL:			flipscreen3d -root			    \n\
- at GL_KLUDGE@ GL:			glsnake -root				    \n\
- at GL_KLUDGE@ GL:			boxed -root				    \n\
--	   GL:	"GLForestFire"		glforestfire -root		    \n\
--	   GL:	"GLForestFire (rain)"	glforestfire -root -count 0	    \n\
--	   GL:			sballs -root				    \n\
- at GL_KLUDGE@ GL:			cubenetic -root				    \n\
- at GL_KLUDGE@ GL:			spheremonics -root			    \n\
- at GL_KLUDGE@ GL:			lavalite -root				    \n\
- at GL_KLUDGE@ GL:			queens -root				    \n\
- at GL_KLUDGE@ GL:			endgame -root				    \n\
--	   GL:			glblur -root				    \n\
- at GL_KLUDGE@ GL:			atunnel -root				    \n\
- at GL_KLUDGE@ GL:			flyingtoasters -root			    \n\
- at GL_KLUDGE@ GL:			bouncingcow -root			    \n\
- at GL_KLUDGE@ GL:			jigglypuff -root -random		    \n\
- at GL_KLUDGE@ GL:			klein -root -random			    \n\
- at GL_KLUDGE@ GL:	"HyperTorus (striped)" hypertorus -root			    \n\
- at GL_KLUDGE@ GL:	"HyperTorus (solid)"   hypertorus -root -solid -transparent \n\
- at GL_KLUDGE@ GL:			glmatrix -root				    \n\
- at GL_KLUDGE@ GL:			cubestorm -root				    \n\
- at GL_KLUDGE@ GL:			glknots -root				    \n\
- at GL_KLUDGE@ GL:			blocktube -root				    \n\
- at GL_KLUDGE@ GL:			flipflop -root				    \n\
- at GL_KLUDGE@ GL:			antspotlight -root			    \n\
--	   GL:			glslideshow -root			    \n\
- at GL_KLUDGE@ GL:			polytopes -root				    \n\
- at GL_KLUDGE@ GL:			gleidescope -root			    \n\
-- 	   GL:			mirrorblob -root			    \n\
+ at GL_KLUDGE@ GL:	 		@libexecdir@/xscreensaver/molecule -root -shells			    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/dangerball -root			    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/circuit -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/engine -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/flipscreen3d -root			    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/glsnake -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/boxed -root				    \n\
+-	   GL:	"GLForestFire"		@libexecdir@/xscreensaver/glforestfire -root		    \n\
+-	   GL:	"GLForestFire (rain)"	@libexecdir@/xscreensaver/glforestfire -root -count 0	    \n\
+-	   GL:			@libexecdir@/xscreensaver/sballs -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/cubenetic -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/spheremonics -root			    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/lavalite -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/queens -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/endgame -root				    \n\
+-	   GL:			@libexecdir@/xscreensaver/glblur -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/atunnel -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/flyingtoasters -root			    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/bouncingcow -root			    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/jigglypuff -root -random		    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/klein -root -random			    \n\
+ at GL_KLUDGE@ GL:	"HyperTorus (striped)" @libexecdir@/xscreensaver/hypertorus -root			    \n\
+ at GL_KLUDGE@ GL:	"HyperTorus (solid)"   @libexecdir@/xscreensaver/hypertorus -root -solid -transparent \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/glmatrix -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/cubestorm -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/glknots -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/blocktube -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/flipflop -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/antspotlight -root			    \n\
+-	   GL:			@libexecdir@/xscreensaver/glslideshow -root			    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/polytopes -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/gleidescope -root			    \n\
+- 	   GL:			@libexecdir@/xscreensaver/mirrorblob -root			    \n\
 @GL_KLUDGE@ GL:	    "MirrorBlob (color only)"				      \
-                                mirrorblob -root -colour -no-texture	    \n\
- at GL_KLUDGE@ GL:			blinkbox -root				    \n\
- at GL_KLUDGE@ GL:			noof -root				    \n\
- at GL_KLUDGE@ GL:			polyhedra -root				    \n\
--	   GL:                  antinspect -root                            \n\
- at GL_KLUDGE@ GL:			providence -root			    \n\
- at GL_KLUDGE@ GL:	"Pinion (large gears)"	pinion -root			    \n\
- at GL_KLUDGE@ GL:	"Pinion (small gears)"	pinion -root -size 0.2 -scroll 0.3  \n\
- at GL_KLUDGE@ GL:			boing -root -lighting -smooth		    \n\
--	   GL:                  carousel -root                              \n\
- at GL_KLUDGE@ GL:			fliptext -root				    \n\
--	   GL:                  antmaze -root                               \n\
- at GL_KLUDGE@ GL:			tangram -root				    \n\
- at GL_KLUDGE@ GL:			crackberg -root -flat -lit -crack	      \
+                                @libexecdir@/xscreensaver/mirrorblob -root -colour -no-texture	    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/blinkbox -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/noof -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/polyhedra -root				    \n\
+-	   GL:                  @libexecdir@/xscreensaver/antinspect -root                            \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/providence -root			    \n\
+ at GL_KLUDGE@ GL:	"Pinion (large gears)"	@libexecdir@/xscreensaver/pinion -root			    \n\
+ at GL_KLUDGE@ GL:	"Pinion (small gears)"	@libexecdir@/xscreensaver/pinion -root -size 0.2 -scroll 0.3  \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/boing -root -lighting -smooth		    \n\
+-	   GL:                  @libexecdir@/xscreensaver/carousel -root                              \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/fliptext -root				    \n\
+-	   GL:                  @libexecdir@/xscreensaver/antmaze -root                               \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/tangram -root				    \n\
+ at GL_KLUDGE@ GL:			@libexecdir@/xscreensaver/crackberg -root -flat -lit -crack	      \
 				 -color random				    \n\
 									      \
--				xdaliclock -root -builtin3 -cycle	    \n\
-- default-n:			xearth -nofork -nostars -ncolors 50	      \
+-				@libexecdir@/xscreensaver/xdaliclock -root -builtin3 -cycle	    \n\
+- default-n:			@libexecdir@/xscreensaver/xearth -nofork -nostars -ncolors 50	      \
 				  -night 3 -wait 0 -timewarp 400.0 -pos	      \
 				  sunrel/38/-30				    \n\
--				xplanet -vroot -wait 1 -timewarp 90000        \
+-				@libexecdir@/xscreensaver/xplanet -vroot -wait 1 -timewarp 90000        \
                                   -label -origin moon			    \n\
--				xmountains -b -M -Z 0 -r 1		    \n\
--	"XMountains (top)"	xmountains -b -M -Z 0 -r 1 -m		    \n\
--                               xaos -root -autopilot -nogui -delay 10000     \
+-				@libexecdir@/xscreensaver/xmountains -b -M -Z 0 -r 1		    \n\
+-	"XMountains (top)"	@libexecdir@/xscreensaver/xmountains -b -M -Z 0 -r 1 -m		    \n\
+-                               @libexecdir@/xscreensaver/xaos -root -autopilot -nogui -delay 10000     \
                                   -maxframerate 30                            \
                                   -incoloring -1 -outcoloring -1            \n\
--				xfishtank -d -s                             \n\
--				xsnow                                       \n\
--				goban -root                                 \n\
--				electricsheep                               \n\
--				cosmos -root                                \n\
--	   GL:                  sphereEversion --root                       \n\
--	   GL:                  fireflies -root                             \n
+-				@libexecdir@/xscreensaver/xfishtank -d -s                             \n\
+-				@libexecdir@/xscreensaver/xsnow                                       \n\
+-				@libexecdir@/xscreensaver/goban -root                                 \n\
+-				@libexecdir@/xscreensaver/electricsheep                               \n\
+-				@libexecdir@/xscreensaver/cosmos -root                                \n\
+-	   GL:                  @libexecdir@/xscreensaver/sphereEversion --root                       \n\
+-	   GL:                  @libexecdir@/xscreensaver/fireflies -root                             \n
 
 
 

xscreensaver-4.22-signal-handler-fun.patch:
 subprocs.c |  159 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 139 insertions(+), 20 deletions(-)

--- NEW FILE xscreensaver-4.22-signal-handler-fun.patch ---
--- xscreensaver-4.22/driver/subprocs.c.signal-handler-fun	2005-06-04 15:50:23.000000000 -0400
+++ xscreensaver-4.22/driver/subprocs.c	2005-08-10 14:22:27.000000000 -0400
@@ -412,8 +412,15 @@
   saver_info *si = global_si_kludge;	/* I hate C so much... */
 
   if (si->prefs.debug_p)
-    fprintf(stderr, "%s: got SIGCHLD%s\n", blurb(),
-	    (block_sigchld_handler ? " (blocked)" : ""));
+    {
+      write (STDERR_FILENO, blurb(), strlen (blurb()));
+      write (STDERR_FILENO, ": got SIGCHLD", strlen (": got SIGCHLD"));
+
+      if (block_sigchld_handler)
+        write (STDERR_FILENO, " (blocked)\n", strlen (" (blocked)\n"));
+      else
+        write (STDERR_FILENO, "\n", strlen ("\n"));
+    }
 
   if (block_sigchld_handler < 0)
     abort();
@@ -430,6 +437,43 @@
 
 
 #ifndef VMS
+
+static const char *
+no_malloc_number_to_string (long num)
+{
+  static char string[128] = "";
+  int num_digits;
+  Bool negative_p = False;
+
+  num_digits = 0;
+
+  if (num == 0)
+    return "0";
+
+  if (num < 0)
+    {
+      negative_p = True;
+      num = -num;
+    }
+
+  while ((num > 0) && (num_digits < sizeof(string - 1)))
+    {
+      int digit;
+      digit = (int) num % 10;
+      num_digits++;
+      string[sizeof(string) - 1 - num_digits] = digit + '0';
+      num /= 10;
+    }
+
+  if (negative_p)
+    {
+      num_digits++;
+      string[sizeof(string) - 1 - num_digits] = '-';
+    }
+
+  return string + sizeof(string) - 1 - num_digits;
+}
+
 static void
 await_dying_children (saver_info *si)
 {
@@ -443,12 +487,27 @@
 
       if (si->prefs.debug_p)
 	{
+          const char *string;
+
 	  if (kid < 0 && errno)
-	    fprintf (stderr, "%s: waitpid(-1) ==> %ld (%d)\n", blurb(),
-		     (long) kid, errno);
-	  else
-	    fprintf (stderr, "%s: waitpid(-1) ==> %ld\n", blurb(),
-		     (long) kid);
+            {
+              write (STDERR_FILENO, blurb(), strlen (blurb()));
+              write (STDERR_FILENO, ": waitpid(-1) ==> ", strlen (": waitpid(-1) ==> "));
+              string = no_malloc_number_to_string ((long) kid);
+              write (STDERR_FILENO, string, strlen (string));
+              write (STDERR_FILENO, " (", strlen (" ("));
+              string = no_malloc_number_to_string ((long) errno);
+              write (STDERR_FILENO, string, strlen (string));
+              write (STDERR_FILENO, ")\n", strlen (")\n"));
+            }
+          else
+            {
+              write (STDERR_FILENO, blurb(), strlen (blurb()));
+              write (STDERR_FILENO, ": waitpid(-1) ==> ", strlen (": waitpid(-1) ==> "));
+              string = no_malloc_number_to_string ((long) kid);
+              write (STDERR_FILENO, string, strlen (string));
+              write (STDERR_FILENO, "\n", strlen ("\n"));
+            }
 	}
 
       /* 0 means no more children to reap.
@@ -471,6 +530,7 @@
   struct screenhack_job *job = find_job (kid);
   const char *name = job ? job->name : "<unknown>";
   int screen_no = job ? job->screen : 0;
+  const char *string;
 
   if (WIFEXITED (wait_status))
     {
@@ -488,12 +548,36 @@
       if (!job ||
 	  (exit_status != 0 &&
 	   (p->verbose_p || job->status != job_killed)))
-	fprintf (stderr,
-		 "%s: %d: child pid %lu (%s) exited abnormally (code %d).\n",
-		 blurb(), screen_no, (unsigned long) kid, name, exit_status);
+        {
+          write (STDERR_FILENO, blurb(), strlen (blurb()));
+          write (STDERR_FILENO, ": ", strlen (": "));
+          string = no_malloc_number_to_string ((long) screen_no);
+          write (STDERR_FILENO, string, strlen (string));
+          write (STDERR_FILENO, ": child pid ", strlen (": child pid "));
+          string = no_malloc_number_to_string ((long) kid);
+          write (STDERR_FILENO, string, strlen (string));
+          write (STDERR_FILENO, " (", strlen (" ("));
+          write (STDERR_FILENO, name, strlen (name));
+          write (STDERR_FILENO, ") exited abnormally (code ", 
+                 strlen (") exited abnormally (code " ));
+          string = no_malloc_number_to_string ((long) exit_status);
+          write (STDERR_FILENO, string, strlen (string));
+          write (STDERR_FILENO, ").\n", strlen (").\n")); 
+        }
       else if (p->verbose_p)
-	fprintf (stderr, "%s: %d: child pid %lu (%s) exited normally.\n",
-		 blurb(), screen_no, (unsigned long) kid, name);
+        {
+          write (STDERR_FILENO, blurb(), strlen (blurb()));
+          write (STDERR_FILENO, ": ", strlen (": "));
+          string = no_malloc_number_to_string ((long) screen_no);
+          write (STDERR_FILENO, string, strlen (string));
+          write (STDERR_FILENO, ": child pid ", strlen (": child pid "));
+          string = no_malloc_number_to_string ((long) kid);
+          write (STDERR_FILENO, string, strlen (string));
+          write (STDERR_FILENO, " (", strlen (" ("));
+          write (STDERR_FILENO, name, strlen (name));
+          write (STDERR_FILENO, ") exited normally.\n", 
+                 strlen (") exited normally.\n"));
+        }
 
       if (job)
 	job->status = job_dead;
@@ -504,9 +588,22 @@
 	  !job ||
 	  job->status != job_killed ||
 	  WTERMSIG (wait_status) != SIGTERM)
-	fprintf (stderr, "%s: %d: child pid %lu (%s) terminated with %s.\n",
-		 blurb(), screen_no, (unsigned long) kid, name,
-		 signal_name (WTERMSIG(wait_status)));
+        {
+          write (STDERR_FILENO, blurb(), strlen (blurb()));
+          write (STDERR_FILENO, ": ", strlen (": "));
+          string = no_malloc_number_to_string ((long) screen_no);
+          write (STDERR_FILENO, string, strlen (string));
+          write (STDERR_FILENO, ": child pid ", strlen (": child pid "));
+          string = no_malloc_number_to_string ((long) kid);
+          write (STDERR_FILENO, string, strlen (string));
+          write (STDERR_FILENO, " (", strlen (" ("));
+          write (STDERR_FILENO, name, strlen (name));
+          write (STDERR_FILENO, ") terminated with signal ", 
+                 strlen (") terminated with signal "));
+          string = no_malloc_number_to_string (WTERMSIG(wait_status));
+          write (STDERR_FILENO, string, strlen (string));
+          write (STDERR_FILENO, ".\n", strlen (".\n"));
+        }
 
       if (job)
 	job->status = job_dead;
@@ -514,17 +611,39 @@
   else if (WIFSTOPPED (wait_status))
     {
       if (p->verbose_p)
-	fprintf (stderr, "%s: child pid %lu (%s) stopped with %s.\n",
-		 blurb(), (unsigned long) kid, name,
-		 signal_name (WSTOPSIG (wait_status)));
+        {
+          write (STDERR_FILENO, blurb(), strlen (blurb()));
+          write (STDERR_FILENO, ": ", strlen (": "));
+          string = no_malloc_number_to_string ((long) screen_no);
+          write (STDERR_FILENO, string, strlen (string));
+          write (STDERR_FILENO, ": child pid ", strlen (": child pid "));
+          string = no_malloc_number_to_string ((long) kid);
+          write (STDERR_FILENO, string, strlen (string));
+          write (STDERR_FILENO, " (", strlen (" ("));
+          write (STDERR_FILENO, name, strlen (name));
+          write (STDERR_FILENO, ") stopped with signal ", 
+                 strlen (")stopped with signal "));
+          string = no_malloc_number_to_string (WSTOPSIG(wait_status));
+          write (STDERR_FILENO, string, strlen (string));
+          write (STDERR_FILENO, ".\n", strlen (".\n"));
+        }
 
       if (job)
 	job->status = job_stopped;
     }
   else
     {
-      fprintf (stderr, "%s: child pid %lu (%s) died in a mysterious way!",
-	       blurb(), (unsigned long) kid, name);
+      write (STDERR_FILENO, blurb(), strlen (blurb()));
+      write (STDERR_FILENO, ": ", strlen (": "));
+      string = no_malloc_number_to_string ((long) screen_no);
+      write (STDERR_FILENO, string, strlen (string));
+      write (STDERR_FILENO, ": child pid ", strlen (": child pid "));
+      string = no_malloc_number_to_string ((long) kid);
+      write (STDERR_FILENO, string, strlen (string));
+      write (STDERR_FILENO, " (", strlen (" ("));
+      write (STDERR_FILENO, name, strlen (name));
+      write (STDERR_FILENO, ") died in a mysterious way!",
+             strlen (") died in a mysterious way!"));
       if (job)
 	job->status = job_dead;
     }

xscreensaver-4.22-warn-about-extras.patch:
 demo-Gtk.c               |   11 +++++++++--
 xscreensaver-demo.glade2 |   43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

--- NEW FILE xscreensaver-4.22-warn-about-extras.patch ---
--- xscreensaver-4.22/driver/demo-Gtk.c.warn-about-extras	2005-03-20 18:20:32.000000000 -0500
+++ xscreensaver-4.22/driver/demo-Gtk.c	2005-08-11 22:05:34.000000000 -0400
@@ -190,6 +190,7 @@
   int *list_elt_to_hack_number;	/* table for sorting the hack list */
   int *hack_number_to_list_elt;	/* the inverse table */
   Bool *hacks_available_p;	/* whether hacks are on $PATH */
+  int total_available;        /* how many are on $PATH */
   int list_count;		/* how many items are in the list: this may be
                                    less than p->screenhacks_count, if some are
                                    suppressed. */
@@ -3315,13 +3316,16 @@
     calloc (sizeof(int), p->screenhacks_count + 1);
   s->hacks_available_p = (Bool *)
     calloc (sizeof(Bool), p->screenhacks_count + 1);
+  s->total_available = 0;
 
   /* Check which hacks actually exist on $PATH
    */
   for (i = 0; i < p->screenhacks_count; i++)
     {
       screenhack *hack = p->screenhacks[i];
-      s->hacks_available_p[i] = on_path_p (hack->command);
+      int on = on_path_p (hack->command) ? 1 : 0;
+      s->hacks_available_p[i] = on;
+      s->total_available += on;
     }
 
   /* Initialize list->hack table to unsorted mapping, omitting nonexistent
@@ -3473,11 +3477,14 @@
     Bool available_p = (hack_number >= 0
                         ? s->hacks_available_p [hack_number]
                         : True);
+    Bool nothing_p = (s->total_available < 5);
+
 #ifdef HAVE_GTK2
     GtkWidget *notebook = name_to_widget (s, "preview_notebook");
     gtk_notebook_set_page (GTK_NOTEBOOK (notebook),
 			   (s->running_preview_error_p
-                            ? (available_p ? 1 : 2)
+                            ? (available_p ? 1 :
+                               nothing_p ? 3 : 2)
                             : 0));
 #else /* !HAVE_GTK2 */
     if (s->running_preview_error_p)
--- xscreensaver-4.22/driver/xscreensaver-demo.glade2.warn-about-extras	2005-03-21 20:22:08.000000000 -0500
+++ xscreensaver-4.22/driver/xscreensaver-demo.glade2	2005-08-11 21:58:29.000000000 -0400
@@ -814,6 +814,49 @@
 			      <property name="type">tab</property>
 			    </packing>
 			  </child>
+ 
+	       <child>
+		 <widget class="GtkLabel" id="nothing_label">
+		   <property name="visible">True</property>
+		   <property name="label" translatable="yes">Very few (or no) screen savers appear to be available.
+ 
+ This probably means that the "xscreensaver-extras" and
+ "xscreensaver-gl-extras" packages are not installed.</property>
+		   <property name="use_underline">False</property>
+		   <property name="use_markup">False</property>
+		   <property name="justify">GTK_JUSTIFY_CENTER</property>
+		   <property name="wrap">False</property>
+		   <property name="selectable">False</property>
+		   <property name="xalign">0.5</property>
+		   <property name="yalign">0.5</property>
+		   <property name="xpad">0</property>
+		   <property name="ypad">0</property>
+		 </widget>
+		 <packing>
+		   <property name="tab_expand">False</property>
+		   <property name="tab_fill">True</property>
+		 </packing>
+	       </child>
+ 
+	       <child>
+		 <widget class="GtkLabel" id="nothing_tab">
+		   <property name="visible">True</property>
+		   <property name="label" translatable="yes">nothing</property>
+		   <property name="use_underline">False</property>
+		   <property name="use_markup">False</property>
+		   <property name="justify">GTK_JUSTIFY_LEFT</property>
+		   <property name="wrap">False</property>
+		   <property name="selectable">False</property>
+		   <property name="xalign">0.5</property>
+		   <property name="yalign">0.5</property>
+		   <property name="xpad">0</property>
+		   <property name="ypad">0</property>
+		 </widget>
+		 <packing>
+		   <property name="type">tab</property>
+		 </packing>
+	       </child>
+
 			</widget>
 		      </child>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Mar 2005 15:49:13 -0000	1.11
+++ .cvsignore	12 Aug 2005 02:21:54 -0000	1.12
@@ -1,2 +1 @@
-xscreensaver-4.18.tar.gz
-xscreensaver-4.21.tar.gz
+xscreensaver-4.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Mar 2005 15:49:14 -0000	1.12
+++ sources	12 Aug 2005 02:21:54 -0000	1.13
@@ -1 +1 @@
-3ea7d0bc9b7159523855296e175d7ac7  xscreensaver-4.21.tar.gz
+9f37c428f034e581026e243445378195  xscreensaver-4.22.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/FC-4/xscreensaver.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xscreensaver.spec	11 May 2005 14:54:48 -0000	1.50
+++ xscreensaver.spec	12 Aug 2005 02:21:54 -0000	1.51
@@ -1,10 +1,10 @@
 %define	name xscreensaver
-%define	version 4.21
+%define	version 4.22
 
 Summary:	X screen saver and locker
 Name:		%{name}
 Version:	%{version}
-Release:	4
+Release:	6.fc4
 Epoch:		1
 License:	BSD
 Group:		Amusements/Graphics
@@ -14,8 +14,10 @@
 Patch0:		xscreensaver-4.21-change-defaults.patch
 Patch1:		xscreensaver-4.16-sanitize-hacks.patch
 Patch2:         xscreensaver-4.21-dont-ping-if-not-root.patch
-Patch3:		xscreensaver-4.21-make-hack-paths-absolute.patch
+Patch3:		xscreensaver-4.22-make-hack-paths-absolute.patch
 Patch4:         xscreensaver-4.21-use-hack-basename.patch
+Patch5:         xscreensaver-4.22-signal-handler-fun.patch
+Patch6:         xscreensaver-4.22-warn-about-extras.patch
 Buildroot:	%{_tmppath}/%{name}-root
 
 # find_lang
@@ -74,6 +76,8 @@
 %patch2 -p1 -b .dont-ping-if-not-root
 %patch3 -p1 -b .make-hack-paths-absolute
 %patch4 -p1 -b .use-hack-basename
+%patch5 -p1 -b .signal-handler-fun
+%patch6 -p1 -b .warn-about-extras
 
 if [ -x %{_datadir}/libtool/config.guess ]; then
   # use system-wide copy
@@ -202,6 +206,12 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Aug 11 2005 Ray Strode <rstrode at redhat.com> 1:4.22-6.fc4
+- update to xscreensaver 4.22
+- tell users why they dont' have screensavers if they dont' have
+  extras installed
+- Don't call printf in signal handler (126428)
+
 * Wed May 11 2005 Ray Strode <rstrode at redhat.com> 1:4.21-4
 - Allow configuration gui to support hacks with absolute paths
   (bug 157417). 


--- xscreensaver-4.21-make-hack-paths-absolute.patch DELETED ---




More information about the fedora-cvs-commits mailing list