[patch] disable webcollage screensaver

03_all_webcollage_disable.patch (text/plain), 5.41 KB, created by Wormo (RETIRED) on 2008-12-03 08:17:21 UTC

diff -ur xscreensaver-5.07-orig/driver/XScreenSaver.ad.in xscreensaver-5.07/driver/XScreenSaver.ad.in
--- xscreensaver-5.07-orig/driver/XScreenSaver.ad.in	2008-12-03 06:36:38.000000000 -0800
+++ xscreensaver-5.07/driver/XScreenSaver.ad.in	2008-12-03 06:38:40.000000000 -0800
@@ -255,7 +255,6 @@
 				squiral -root				    \n\
 				t3d -root				    \n\
 				wander -root				    \n\
--				webcollage -root			    \n\
 				xflame -root				    \n\
 				xmatrix -root				    \n\
 @GL_KLUDGE@ GL: 				gflux -root				    \n\
@@ -500,7 +499,6 @@
 *hacks.timetunnel.name:     TimeTunnel
 *hacks.topblock.name:       TopBlock
 *hacks.vidwhacker.name:     VidWhacker
-*hacks.webcollage.name:     WebCollage
 *hacks.whirlwindwarp.name:  WhirlWindWarp
 *hacks.xanalogtv.name:      XAnalogTV
 *hacks.xrayswarm.name:      XRaySwarm
diff -ur xscreensaver-5.07-orig/hacks/Makefile.in xscreensaver-5.07/hacks/Makefile.in
--- xscreensaver-5.07-orig/hacks/Makefile.in	2008-12-03 06:36:38.000000000 -0800
+++ xscreensaver-5.07/hacks/Makefile.in	2008-12-03 06:41:19.000000000 -0800
@@ -103,7 +103,7 @@
 		  blaster.c bumps.c ripples.c xspirograph.c \
 		  nerverot.c xrayswarm.c hyperball.c zoom.c whirlwindwarp.c \
 		  rotzoomer.c whirlygig.c speedmine.c vermiculate.c \
-		  xpm-pixmap.c webcollage-helper.c twang.c apollonian.c \
+		  xpm-pixmap.c twang.c apollonian.c \
 		  euler2d.c juggle.c polyominoes.c thornbird.c fluidballs.c \
 		  anemone.c halftone.c metaballs.c eruption.c popsquares.c \
 		  barcode.c piecewise.c cloudlife.c fontglide.c apple2.c \
@@ -113,8 +113,7 @@
 		  intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \
 		  boxfit.c interaggregate.c celtic.c cwaves.c m6502.c \
 		  asm6502.c abstractile.c lcdscrub.c \
-		  webcollage-cocoa.m webcollage-helper-cocoa.m
-SCRIPTS		= vidwhacker webcollage ljlatest
+SCRIPTS		= vidwhacker ljlatest
 
 # Programs that are mentioned in XScreenSaver.ad, and that have XML files,
 # but that are not shipped with xscreensaver itself.
@@ -142,7 +141,7 @@
 		  blaster.o bumps.o ripples.o xspirograph.o \
 		  nerverot.o xrayswarm.o hyperball.o zoom.o whirlwindwarp.o \
 		  rotzoomer.o whirlygig.o speedmine.o vermiculate.o \
-		  xpm-pixmap.o webcollage-helper.o twang.o apollonian.o \
+		  xpm-pixmap.o twang.o apollonian.o \
 		  euler2d.o juggle.o polyominoes.o thornbird.o fluidballs.o \
 		  anemone.o halftone.o metaballs.o eruption.o popsquares.o \
 		  barcode.o piecewise.o cloudlife.o fontglide.o apple2.o \
@@ -150,8 +149,8 @@
 		  mismunch.o pacman.o pacman_ai.o pacman_level.o \
 		  fuzzyflakes.o anemotaxis.o memscroller.o substrate.o \
 		  intermomentary.o fireworkx.o fiberlamp.o boxfit.o \
-		  interaggregate.o celtic.o cwaves.o webcollage-cocoa.o \
-		  webcollage-helper-cocoa.o m6502.0 asm6502.o abstractile.o \
+		  interaggregate.o celtic.o cwaves.o \
+		  m6502.0 asm6502.o abstractile.o \
 		  lcdscrub.o
 
 NEXES		= attraction blitspin bouboule braid bubbles decayscreen deco \
@@ -176,7 +175,7 @@
 		  celtic cwaves m6502 abstractile lcdscrub \
 		  @JPEG_EXES@
 SEXES		= sonar
-JPEG_EXES	= webcollage-helper
+JPEG_EXES	=
 EXES		= $(NEXES) $(SEXES)
 
 HACK_OBJS_1	= fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
@@ -213,7 +212,7 @@
 	          spotlight.man squiral.man starfish.man strange.man \
 	          swirl.man t3d.man thornbird.man triangle.man truchet.man \
 	          twang.man vermiculate.man vidwhacker.man vines.man \
-	          wander.man webcollage.man whirlwindwarp.man whirlygig.man \
+	          wander.man whirlwindwarp.man whirlygig.man \
 	          worm.man xflame.man xjack.man xlyap.man xmatrix.man \
 	          xrayswarm.man xspirograph.man xsublim.man \
 	          zoom.man halftone.man eruption.man metaballs.man \
@@ -434,8 +433,7 @@
 check_men:
 	@badmen="" ;							\
 	 for exe in $(EXES) $(SCRIPTS); do				\
-	   if ! [ -f $(srcdir)/$$exe.man				\
-		  -o "$$exe" = webcollage-helper ]; then		\
+	   if ! [ -f $(srcdir)/$$exe.man ]; then		\
 	     badmen="$$badmen $$exe" ;					\
 	   fi ;								\
 	 done ;								\
@@ -987,10 +985,6 @@
 xsublim:	xsublim.o	$(HACK_OBJS_1)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS_1) $(HACK_LIBS)
 
-webcollage-helper: webcollage-helper.o
-	$(CC_HACK) -o $@ $@.o	$(XPM_LIBS) $(JPEG_LIBS)
-
-
 ##############################################################################
 #
 # DO NOT DELETE: updated by make distdepend
@@ -2669,18 +2663,6 @@
 wander.o: $(UTILS_SRC)/usleep.h
 wander.o: $(UTILS_SRC)/visual.h
 wander.o: $(UTILS_SRC)/yarandom.h
-webcollage-cocoa.o: ../config.h
-webcollage-cocoa.o: $(srcdir)/fps.h
-webcollage-cocoa.o: $(srcdir)/screenhackI.h
-webcollage-cocoa.o: $(srcdir)/screenhack.h
-webcollage-cocoa.o: $(UTILS_SRC)/colors.h
-webcollage-cocoa.o: $(UTILS_SRC)/grabscreen.h
-webcollage-cocoa.o: $(UTILS_SRC)/hsv.h
-webcollage-cocoa.o: $(UTILS_SRC)/resources.h
-webcollage-cocoa.o: $(UTILS_SRC)/usleep.h
-webcollage-cocoa.o: $(UTILS_SRC)/visual.h
-webcollage-cocoa.o: $(UTILS_SRC)/yarandom.h
-webcollage-helper.o: ../config.h
 whirlwindwarp.o: ../config.h
 whirlwindwarp.o: $(srcdir)/fps.h
 whirlwindwarp.o: $(srcdir)/screenhackI.h
diff -ur xscreensaver-5.07-orig/po/POTFILES.in xscreensaver-5.07/po/POTFILES.in
--- xscreensaver-5.07-orig/po/POTFILES.in	2008-12-03 06:36:38.000000000 -0800
+++ xscreensaver-5.07/po/POTFILES.in	2008-12-03 06:36:54.000000000 -0800
@@ -209,7 +209,6 @@
 hacks/config/vines.xml
 hacks/config/voronoi.xml
 hacks/config/wander.xml
-hacks/config/webcollage.xml
 hacks/config/whirlwindwarp.xml
 hacks/config/whirlygig.xml
 hacks/config/worm.xml