From: Samuli Suominen Date: Mon, 19 Feb 2007 21:01:50 +0000 (+0000) Subject: Clean unused patches too. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d09d88f91c45adfb390f4aa77cba271601fd07a3;p=gentoo.git Clean unused patches too. Package-Manager: portage-2.1.2-r9 --- diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 90e137f15929..71bce910dfa8 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -26,18 +26,6 @@ AUX xscreensaver-4.24-words.patch 530 RMD160 c9a494f1af1d26076a01e9df58992715057 MD5 e31491a2c6541da4a97afff5f7427abd files/xscreensaver-4.24-words.patch 530 RMD160 c9a494f1af1d26076a01e9df58992715057fdca0 files/xscreensaver-4.24-words.patch 530 SHA256 c5dbaf93b151c3f4b4d2a9aca875840f62b7205d836f0eb9cc20cbd53507e1fc files/xscreensaver-4.24-words.patch 530 -AUX xscreensaver-5.00-gentoo.patch 5690 RMD160 7b33957657e884c4c40e0fe2e2e767b630496d60 SHA1 a8b68d552e56c4d06d9050a4d136f86c896f6003 SHA256 cbd703a47df6207a3d7784e984760e03a87de2ed09403ac99433126575fc8e25 -MD5 bb1456cec15a55637099aece5605050b files/xscreensaver-5.00-gentoo.patch 5690 -RMD160 7b33957657e884c4c40e0fe2e2e767b630496d60 files/xscreensaver-5.00-gentoo.patch 5690 -SHA256 cbd703a47df6207a3d7784e984760e03a87de2ed09403ac99433126575fc8e25 files/xscreensaver-5.00-gentoo.patch 5690 -AUX xscreensaver-5.00-get_float_resource.patch 502 RMD160 465d24c7e7f08274245a03819fe234cbda57dfbc SHA1 490a2c0669fbd31b3b48ce37a96e99e56b84acf6 SHA256 b2c11edaa5b4fd74c05c81bf653638f67307887b1935335d2c2bc5b0d14bd1f3 -MD5 31e3cbe0e50786e737e4de8ff9831817 files/xscreensaver-5.00-get_float_resource.patch 502 -RMD160 465d24c7e7f08274245a03819fe234cbda57dfbc files/xscreensaver-5.00-get_float_resource.patch 502 -SHA256 b2c11edaa5b4fd74c05c81bf653638f67307887b1935335d2c2bc5b0d14bd1f3 files/xscreensaver-5.00-get_float_resource.patch 502 -AUX xscreensaver-5.00-nsfw.patch 6673 RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad SHA1 eb2465eb92bc8ad696cb6413cfd0d8c211ad1df6 SHA256 74d5ed26063ba56af8a912ddd19bed2ebf65d45f39a4a7b9b742d6e6b775f91d -MD5 ea86cf0c30999d0d79519d2b3573b2ff files/xscreensaver-5.00-nsfw.patch 6673 -RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad files/xscreensaver-5.00-nsfw.patch 6673 -SHA256 74d5ed26063ba56af8a912ddd19bed2ebf65d45f39a4a7b9b742d6e6b775f91d files/xscreensaver-5.00-nsfw.patch 6673 AUX xscreensaver-5.01-gentoo.patch 6361 RMD160 39a88128072ce5a16e14ef92ceb8a5b106e92eef SHA1 6854525b9ecd12062d860d8c62e40dcbba192cd6 SHA256 f8398a05d1b17a35a4247e2c24ea36d90b63f0772e2bcacc3482879c15073fe2 MD5 ace9e196f6ff547af4d792225ad50597 files/xscreensaver-5.01-gentoo.patch 6361 RMD160 39a88128072ce5a16e14ef92ceb8a5b106e92eef files/xscreensaver-5.01-gentoo.patch 6361 diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.00-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.00-gentoo.patch deleted file mode 100644 index ace6b251d51f..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.00-gentoo.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff -Nru xscreensaver-5.00.vanilla/configure.in xscreensaver-5.00/configure.in ---- xscreensaver-5.00.vanilla/configure.in 2006-05-24 00:07:00.000000000 +0200 -+++ xscreensaver-5.00/configure.in 2006-06-04 11:35:01.000000000 +0200 -@@ -717,6 +717,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 \ -@@ -747,7 +749,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 \ -@@ -4054,41 +4055,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 -Nru xscreensaver-5.00.vanilla/driver/XScreenSaver.ad.in xscreensaver-5.00/driver/XScreenSaver.ad.in ---- xscreensaver-5.00.vanilla/driver/XScreenSaver.ad.in 2006-05-24 01:01:34.000000000 +0200 -+++ xscreensaver-5.00/driver/XScreenSaver.ad.in 2006-06-04 11:36:55.000000000 +0200 -@@ -31,36 +31,36 @@ - *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 - *verbose: False - *timestamp: True - *fade: True - *unfade: False - *fadeSeconds: 0:00:03 - *fadeTicks: 20 --*splash: True -+*splash: False - *splashDuration: 0:00:05 - *visualID: default - *captureStderr: True - *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 -@@ -117,7 +117,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 -Nru xscreensaver-5.00.vanilla/driver/xscreensaver.c xscreensaver-5.00/driver/xscreensaver.c ---- xscreensaver-5.00.vanilla/driver/xscreensaver.c 2006-05-18 01:35:54.000000000 +0200 -+++ xscreensaver-5.00/driver/xscreensaver.c 2006-06-04 11:37:16.000000000 +0200 -@@ -1626,10 +1626,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 -Nru xscreensaver-5.00.vanilla/hacks/webcollage xscreensaver-5.00/hacks/webcollage ---- xscreensaver-5.00.vanilla/hacks/webcollage 2006-05-18 01:58:51.000000000 +0200 -+++ xscreensaver-5.00/hacks/webcollage 2006-06-04 11:37:18.000000000 +0200 -@@ -845,7 +845,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) { diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.00-get_float_resource.patch b/x11-misc/xscreensaver/files/xscreensaver-5.00-get_float_resource.patch deleted file mode 100644 index 2eb5958612f1..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.00-get_float_resource.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- utils/resources.c.orig 2006-08-12 14:39:01.000000000 +0200 -+++ utils/resources.c 2006-08-12 14:39:47.000000000 +0200 -@@ -123,9 +123,9 @@ - get_float_resource (Display *dpy, char *res_name, char *res_class) - { - double val; -- char c, *s = get_string_resource (dpy, res_name, res_class); -+ char *s = get_string_resource (dpy, res_name, res_class); - if (! s) return 0.0; -- if (1 == sscanf (s, " %lf %c", &val, &c)) -+ if (1 == sscanf (s, " %lf", &val)) - { - free (s); - return val; diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.00-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-5.00-nsfw.patch deleted file mode 100644 index 0d1d810dba46..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.00-nsfw.patch +++ /dev/null @@ -1,146 +0,0 @@ -diff -Nru xscreensaver-5.00.vanilla/driver/XScreenSaver.ad.in xscreensaver-5.00/driver/XScreenSaver.ad.in ---- xscreensaver-5.00.vanilla/driver/XScreenSaver.ad.in 2006-05-24 01:01:34.000000000 +0200 -+++ xscreensaver-5.00/driver/XScreenSaver.ad.in 2006-06-04 11:39:04.000000000 +0200 -@@ -302,10 +302,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\ -@@ -488,7 +484,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-5.00.vanilla/driver/XScreenSaver_ad.h xscreensaver-5.00/driver/XScreenSaver_ad.h ---- xscreensaver-5.00.vanilla/driver/XScreenSaver_ad.h 2006-05-24 01:01:34.000000000 +0200 -+++ xscreensaver-5.00/driver/XScreenSaver_ad.h 2006-06-04 11:39:04.000000000 +0200 -@@ -203,10 +203,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\ -@@ -359,7 +355,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-5.00.vanilla/hacks/Makefile.in xscreensaver-5.00/hacks/Makefile.in ---- xscreensaver-5.00.vanilla/hacks/Makefile.in 2006-05-24 01:01:36.000000000 +0200 -+++ xscreensaver-5.00/hacks/Makefile.in 2006-06-04 11:39:04.000000000 +0200 -@@ -102,7 +102,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 \ -@@ -111,7 +111,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 - - # Programs that are mentioned in XScreenSaver.ad, and that have XML files, - # but that are not shipped with xscreensaver itself. -@@ -139,7 +139,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 \ -@@ -171,7 +171,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 \ -@@ -208,7 +208,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 \ -@@ -1520,7 +1520,6 @@ - wander.o: ../config.h - wander.o: $(srcdir)/screenhackI.h - wander.o: $(srcdir)/screenhack.h --webcollage-helper.o: ../config.h - whirlwindwarp.o: ../config.h - whirlwindwarp.o: $(srcdir)/screenhackI.h - whirlwindwarp.o: $(srcdir)/screenhack.h -diff -Nru xscreensaver-5.00.vanilla/hacks/glx/glsnake.c xscreensaver-5.00/hacks/glx/glsnake.c ---- xscreensaver-5.00.vanilla/hacks/glx/glsnake.c 2006-05-03 21:39:21.000000000 +0200 -+++ xscreensaver-5.00/hacks/glx/glsnake.c 2006-06-04 11:40:30.000000000 +0200 -@@ -565,21 +565,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, -@@ -995,9 +980,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 } -- }, - { "PictureComingSoon", - { 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-5.00.vanilla/po/POTFILES.in xscreensaver-5.00/po/POTFILES.in ---- xscreensaver-5.00.vanilla/po/POTFILES.in 2006-05-24 01:01:41.000000000 +0200 -+++ xscreensaver-5.00/po/POTFILES.in 2006-06-04 11:39:04.000000000 +0200 -@@ -203,7 +203,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