diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2007-05-27 09:28:48 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2007-05-27 09:28:48 +0000 |
commit | da9438cb9745369307f4d8a35a3fa9573295b6cf (patch) | |
tree | bec4ec6b16d5ad21ba2258ec5b9df32b659b60aa /x11-misc/xscreensaver/files | |
parent | Version bump (thanks to hawking) (diff) | |
download | historical-da9438cb9745369307f4d8a35a3fa9573295b6cf.tar.gz historical-da9438cb9745369307f4d8a35a3fa9573295b6cf.tar.bz2 historical-da9438cb9745369307f4d8a35a3fa9573295b6cf.zip |
Remove old version.
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'x11-misc/xscreensaver/files')
7 files changed, 0 insertions, 310 deletions
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.24 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.24 deleted file mode 100644 index 5f81760603b3..000000000000 --- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.24 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 174b6a7cebd892c1a6c2d56bf5ac5af6 xscreensaver-4.24.tar.gz 4936993 -RMD160 a7cb8262991d6783bd0da843bc6dbdce6976e287 xscreensaver-4.24.tar.gz 4936993 -SHA256 73140a9f209921543a6562442b5d68801883b3fff3b6be751bec934f4b456474 xscreensaver-4.24.tar.gz 4936993 diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.24-app-defaults.patch b/x11-misc/xscreensaver/files/xscreensaver-4.24-app-defaults.patch deleted file mode 100644 index 58f82ba181e9..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-4.24-app-defaults.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nru xscreensaver-4.24.vanilla/configure.in xscreensaver-4.24/configure.in ---- xscreensaver-4.24.vanilla/configure.in 2006-02-12 11:45:45.000000000 +0100 -+++ xscreensaver-4.24/configure.in 2006-02-12 11:49:37.000000000 +0100 -@@ -715,6 +715,8 @@ - # Look for the directory under a standard set of common directories. - # Check X11 before X11Rn because it's often a symlink to the current release. - for ac_dir in \ -+ /usr/lib/X11/app-defaults \ -+ \ - /usr/X11/lib/app-defaults \ - /usr/X11R6/lib/app-defaults \ - /usr/X11R6/lib/X11/app-defaults \ -@@ -745,7 +747,6 @@ - /usr/x386/lib/X11/app-defaults \ - /usr/XFree86/lib/X11/app-defaults \ - \ -- /usr/lib/X11/app-defaults \ - /usr/local/lib/X11/app-defaults \ - /usr/unsupported/lib/X11/app-defaults \ - /usr/athena/lib/X11/app-defaults \ diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.24-norpm.patch b/x11-misc/xscreensaver/files/xscreensaver-4.24-norpm.patch deleted file mode 100644 index c248fd8c4dc0..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-4.24-norpm.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Nru xscreensaver-4.24.vanilla/configure.in xscreensaver-4.24/configure.in ---- xscreensaver-4.24.vanilla/configure.in 2006-02-12 11:45:45.000000000 +0100 -+++ xscreensaver-4.24/configure.in 2006-02-12 11:50:23.000000000 +0100 -@@ -4070,41 +4070,7 @@ - # Now let's warn if there's a previous RPM version already installed. - # But don't bother with this test if we are currently *building* an RPM. - --if test -z "$RPM_PACKAGE_VERSION" ; then -- -- rpmnames="xscreensaver xscreensaver-base xscreensaver-extras" -- -- # M4 sucks!! -- changequote(X,Y) -- rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \ -- sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \ -- head -1` -- changequote([,]) -- -- if test \! -z "$rpmv" ; then -- rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'` -- rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/attraction$@\1@p'` -- -- warning=no -- warnL "There is already an installed RPM of xscreensaver $rpmv" -- warn2 'on this system. You might want to remove it ("rpm -ve")' -- warn2 'before running "make install" in this directory.' -- echo "" -- warn2 "Alternately, you could build this version of xscreensaver" -- warn2 'as an RPM, and then install that. An "xscreensaver.spec"' -- warn2 'file is included. Try "rpmbuild -v -ba xscreensaver.spec".' -- warn2 "See the RPM documentation for more info." -- echo "" -- -- if test "$rpmbdir" = "$rpmhdir" ; then -- warn2 "The RPM version was installed in $rpmbdir/." -- do_dir_warning=yes -- else -- warn2 "The RPM version was installed in $rpmbdir/," -- warn2 "with demos in $rpmhdir/." -- fi -- fi --fi -+# Nope - breaks compilation with sandbox violation - - if test "${bindir}" = "${HACKDIR}" ; then - do_dir_warning=yes diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.24-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-4.24-nsfw.patch deleted file mode 100644 index b43947890c8e..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-4.24-nsfw.patch +++ /dev/null @@ -1,146 +0,0 @@ -diff -Nru xscreensaver-4.24.vanilla/driver/XScreenSaver.ad.in xscreensaver-4.24/driver/XScreenSaver.ad.in ---- xscreensaver-4.24.vanilla/driver/XScreenSaver.ad.in 2006-02-12 11:45:45.000000000 +0100 -+++ xscreensaver-4.24/driver/XScreenSaver.ad.in 2006-02-12 11:52:42.000000000 +0100 -@@ -318,10 +318,6 @@ - fiberlamp -root \n\ - boxfit -root \n\ - celtic -root \n\ --- default-n: webcollage -root \n\ --- default-n: "WebCollage (whacked)" \ -- webcollage -root -filter \ -- 'vidwhacker -stdin -stdout' \n\ - - default-n: vidwhacker -root \n\ - \ - @GL_KLUDGE@ GL: gears -root \n\ -@@ -508,7 +504,6 @@ - *hacks.xanalogtv.name: XAnalogTV - *hacks.xspirograph.name: XSpiroGraph - *hacks.nerverot.name: NerveRot --*hacks.webcollage.name: WebCollage - *hacks.vidwhacker.name: VidWhacker - *hacks.morph3d.name: Morph3D - *hacks.bubble3d.name: Bubble3D -diff -Nru xscreensaver-4.24.vanilla/driver/XScreenSaver_ad.h xscreensaver-4.24/driver/XScreenSaver_ad.h ---- xscreensaver-4.24.vanilla/driver/XScreenSaver_ad.h 2006-02-12 11:45:45.000000000 +0100 -+++ xscreensaver-4.24/driver/XScreenSaver_ad.h 2006-02-12 11:52:42.000000000 +0100 -@@ -219,10 +219,6 @@ - fiberlamp -root \\n\ - boxfit -root \\n\ - celtic -root \\n\ --- default-n: webcollage -root \\n\ --- default-n: \"WebCollage (whacked)\" \ -- webcollage -root -filter \ -- 'vidwhacker -stdin -stdout' \\n\ - - default-n: vidwhacker -root \\n\ - \ - GL: gears -root \\n\ -@@ -379,7 +375,6 @@ - "*hacks.xanalogtv.name: XAnalogTV", - "*hacks.xspirograph.name: XSpiroGraph", - "*hacks.nerverot.name: NerveRot", --"*hacks.webcollage.name: WebCollage", - "*hacks.vidwhacker.name: VidWhacker", - "*hacks.morph3d.name: Morph3D", - "*hacks.bubble3d.name: Bubble3D", -diff -Nru xscreensaver-4.24.vanilla/hacks/Makefile.in xscreensaver-4.24/hacks/Makefile.in ---- xscreensaver-4.24.vanilla/hacks/Makefile.in 2006-02-12 11:45:44.000000000 +0100 -+++ xscreensaver-4.24/hacks/Makefile.in 2006-02-12 11:52:42.000000000 +0100 -@@ -100,7 +100,7 @@ - blaster.c bumps.c ripples.c xteevee.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 \ -@@ -109,7 +109,7 @@ - fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \ - intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \ - boxfit.c interaggregate.c celtic.c --SCRIPTS = vidwhacker webcollage ljlatest -+SCRIPTS = vidwhacker ljlatest - - OBJS = attraction.o blitspin.o bouboule.o braid.o bubbles.o \ - bubbles-default.o decayscreen.o deco.o drift.o flag.o \ -@@ -130,7 +130,7 @@ - blaster.o bumps.o ripples.o xteevee.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 \ -@@ -162,7 +162,7 @@ - celtic \ - @JPEG_EXES@ - SEXES = sonar --JPEG_EXES = webcollage-helper -+JPEG_EXES = - EXES = $(NEXES) $(SEXES) - - HACK_OBJS_1 = $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ -@@ -198,7 +198,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 xteevee.man \ - zoom.man halftone.man eruption.man metaballs.man \ -@@ -1471,7 +1471,6 @@ - vines.o: $(srcdir)/xlockmore.h - wander.o: ../config.h - wander.o: $(srcdir)/screenhack.h --webcollage-helper.o: ../config.h - whirlwindwarp.o: ../config.h - whirlwindwarp.o: $(srcdir)/screenhack.h - whirlygig.o: ../config.h -diff -Nru xscreensaver-4.24.vanilla/hacks/glx/glsnake.c xscreensaver-4.24/hacks/glx/glsnake.c ---- xscreensaver-4.24.vanilla/hacks/glx/glsnake.c 2006-02-12 11:45:44.000000000 +0100 -+++ xscreensaver-4.24/hacks/glx/glsnake.c 2006-02-12 11:53:29.000000000 +0100 -@@ -563,21 +563,6 @@ - ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, - ZERO, PIN, ZERO } - }, -- { "erect penis", /* thanks benno */ -- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, -- PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, -- ZERO, ZERO } -- }, -- { "flaccid penis", -- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, -- PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, -- ZERO, ZERO } -- }, -- { "vagina", -- { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, -- LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, -- PIN, RIGHT, ZERO } -- }, - { "mask", - { ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, ZERO, ZERO, PIN, - ZERO, ZERO, PIN, ZERO, PIN, ZERO, PIN, ZERO, ZERO, PIN, ZERO, -@@ -993,9 +978,6 @@ - { "Parrot", - { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } - }, -- { "Penis", -- { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } -- }, - { "PictureCommingSoon", - { LEFT, LEFT, ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, PIN, LEFT, RIGHT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, ZERO, RIGHT, RIGHT, ZERO } - }, -diff -Nru xscreensaver-4.24.vanilla/po/POTFILES.in xscreensaver-4.24/po/POTFILES.in ---- xscreensaver-4.24.vanilla/po/POTFILES.in 2006-02-12 11:45:44.000000000 +0100 -+++ xscreensaver-4.24/po/POTFILES.in 2006-02-12 11:52:42.000000000 +0100 -@@ -200,7 +200,6 @@ - hacks/config/vidwhacker.xml - hacks/config/vines.xml - hacks/config/wander.xml --hacks/config/webcollage.xml - hacks/config/whirlwindwarp.xml - hacks/config/whirlygig.xml - hacks/config/worm.xml diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.24-settings.patch b/x11-misc/xscreensaver/files/xscreensaver-4.24-settings.patch deleted file mode 100644 index c9a3bfcd636a..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-4.24-settings.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Nru xscreensaver-4.24.vanilla/driver/XScreenSaver.ad.in xscreensaver-4.24/driver/XScreenSaver.ad.in ---- xscreensaver-4.24.vanilla/driver/XScreenSaver.ad.in 2006-02-12 11:45:45.000000000 +0100 -+++ xscreensaver-4.24/driver/XScreenSaver.ad.in 2006-02-12 12:00:11.000000000 +0100 -@@ -31,19 +31,19 @@ - *mode: random - *timeout: 0:10:00 - *cycle: 0:10:00 --*lockTimeout: 0:00:00 -+*lockTimeout: 0:20:00 - *passwdTimeout: 0:00:30 --*dpmsEnabled: False --*dpmsStandby: 2:00:00 --*dpmsSuspend: 2:00:00 --*dpmsOff: 4:00:00 --*grabDesktopImages: True -+*dpmsEnabled: True -+*dpmsStandby: 1:00:00 -+*dpmsSuspend: 1:00:00 -+*dpmsOff: 2:00:00 -+*grabDesktopImages: False - *grabVideoFrames: False - *chooseRandomImages: @DEFAULT_IMAGES_P@ - *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ - *nice: 10 - *memoryLimit: 0 --*lock: False -+*lock: True - *lockVTs: True - *verbose: False - *timestamp: True -@@ -51,17 +51,17 @@ - *unfade: False - *fadeSeconds: 0:00:03 - *fadeTicks: 20 --*splash: True -+*splash: False - *splashDuration: 0:00:05 - *visualID: default - *captureStderr: False - *ignoreUninstalledPrograms: False - --*textMode: file --*textLiteral: XScreenSaver --*textFile: @DEFAULT_TEXT_FILE@ --*textProgram: fortune --*textURL: http://www.livejournal.com/stats/latest-rss.bml -+*textMode: literal -+*textLiteral: Gentoo Linux -+*textFile: /etc/gentoo-release -+*textProgram: /usr/bin/fortune -+*textURL: http://planet.gentoo.org/rss20.xml - - *overlayTextForeground: #FFFF00 - *overlayTextBackground: #000000 -@@ -118,7 +118,10 @@ - - ! The format used for printing the date and time in the password dialog box - ! (see the strftime(3) manual page for details.) --*dateFormat: %d-%b-%y (%a); %I:%M %p -+! Preferred time representation for the current locale -+*dateFormat: %x %X -+! Xscreensaver's default -+! *dateFormat: %d-%b-%y (%a); %I:%M %p - ! To show the time only: - ! *dateFormat: %I:%M %p - ! For 24 hour time: diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.24-silent.patch b/x11-misc/xscreensaver/files/xscreensaver-4.24-silent.patch deleted file mode 100644 index 1f034bf2692b..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-4.24-silent.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nru xscreensaver-4.24.vanilla/driver/xscreensaver.c xscreensaver-4.24/driver/xscreensaver.c ---- xscreensaver-4.24.vanilla/driver/xscreensaver.c 2006-02-12 11:45:45.000000000 +0100 -+++ xscreensaver-4.24/driver/xscreensaver.c 2006-02-12 11:51:47.000000000 +0100 -@@ -1653,10 +1653,12 @@ - if (hint.res_class) XFree (hint.res_class); - } - -+ /* - fprintf (stderr, "%s: %d: unrecognised ClientMessage \"%s\" received\n", - blurb(), screen, (str ? str : "(null)")); - fprintf (stderr, "%s: %d: for window 0x%lx (%s)\n", - blurb(), screen, (unsigned long) w, wdesc); -+ */ - if (str) XFree (str); - } - diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.24-words.patch b/x11-misc/xscreensaver/files/xscreensaver-4.24-words.patch deleted file mode 100644 index 0e4a30ce65b2..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-4.24-words.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nru xscreensaver-4.24.vanilla/hacks/webcollage xscreensaver-4.24/hacks/webcollage ---- xscreensaver-4.24.vanilla/hacks/webcollage 2006-02-12 11:45:44.000000000 +0100 -+++ xscreensaver-4.24/hacks/webcollage 2006-02-12 11:50:53.000000000 +0100 -@@ -837,7 +837,8 @@ - - - sub pick_dictionary() { -- my @dicts = ("/usr/dict/words", -+ my @dicts = ("/usr/share/dict/cracklib-small", -+ "/usr/dict/words", - "/usr/share/dict/words", - "/usr/share/lib/dict/words"); - foreach my $f (@dicts) { |