| 1 |
drac 07/12/30 19:39:32 |
| 2 |
|
| 3 |
Added: xscreensaver-5.04-desktop-entry.patch |
| 4 |
xscreensaver-5.04-nsfw.patch |
| 5 |
digest-xscreensaver-5.04 |
| 6 |
Removed: xscreensaver-5.02-gdmflexiserver.patch |
| 7 |
digest-xscreensaver-5.02-r2 |
| 8 |
xscreensaver-5.02-pam.patch |
| 9 |
xscreensaver-5.02-nsfw.patch |
| 10 |
Log: |
| 11 |
Version bump. Use global use flag for setuid screensavers. Use up to date .desktop file from tarball patched to f.d.o desktop entry standard. Pass --with-x-app-defaults to econf instead of moving files around in D. Remove old version. |
| 12 |
(Portage version: 2.1.4_rc11) |
| 13 |
|
| 14 |
Revision Changes Path |
| 15 |
1.1 x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch |
| 16 |
|
| 17 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch?rev=1.1&view=markup |
| 18 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch?rev=1.1&content-type=text/plain |
| 19 |
|
| 20 |
Index: xscreensaver-5.04-desktop-entry.patch |
| 21 |
=================================================================== |
| 22 |
diff -ur xscreensaver-5.04.orig/driver/screensaver-properties.desktop.in xscreensaver-5.04/driver/screensaver-properties.desktop.in |
| 23 |
--- xscreensaver-5.04.orig/driver/screensaver-properties.desktop.in 2003-12-15 13:16:12.000000000 +0200 |
| 24 |
+++ xscreensaver-5.04/driver/screensaver-properties.desktop.in 2007-12-30 21:00:15.000000000 +0200 |
| 25 |
@@ -1,8 +1,8 @@ |
| 26 |
[Desktop Entry] |
| 27 |
Exec=xscreensaver-demo |
| 28 |
-Icon=xscreensaver.xpm |
| 29 |
+Icon=xscreensaver |
| 30 |
Terminal=false |
| 31 |
_Name=Screensaver |
| 32 |
_Comment=Change screensaver properties |
| 33 |
Type=Application |
| 34 |
-Categories=Application;Settings;Appearance;AdvancedSettings; |
| 35 |
+Categories=Settings;DesktopSettings;Security; |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.1 x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch?rev=1.1&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch?rev=1.1&content-type=text/plain |
| 43 |
|
| 44 |
Index: xscreensaver-5.04-nsfw.patch |
| 45 |
=================================================================== |
| 46 |
diff -ur xscreensaver-5.04.orig/driver/XScreenSaver.ad.in xscreensaver-5.04/driver/XScreenSaver.ad.in |
| 47 |
--- xscreensaver-5.04.orig/driver/XScreenSaver.ad.in 2007-11-13 10:36:00.000000000 +0200 |
| 48 |
+++ xscreensaver-5.04/driver/XScreenSaver.ad.in 2007-12-30 21:13:12.000000000 +0200 |
| 49 |
@@ -305,10 +305,6 @@ |
| 50 |
cwaves -root \n\ |
| 51 |
m6502 -root \n\ |
| 52 |
abstractile -root \n\ |
| 53 |
-- default-n: webcollage -root \n\ |
| 54 |
-- default-n: "WebCollage (whacked)" \ |
| 55 |
- webcollage -root -filter \ |
| 56 |
- 'vidwhacker -stdin -stdout' \n\ |
| 57 |
- default-n: vidwhacker -root \n\ |
| 58 |
\ |
| 59 |
@GL_KLUDGE@ GL: gears -root \n\ |
| 60 |
@@ -495,7 +491,6 @@ |
| 61 |
*hacks.xanalogtv.name: XAnalogTV |
| 62 |
*hacks.xspirograph.name: XSpiroGraph |
| 63 |
*hacks.nerverot.name: NerveRot |
| 64 |
-*hacks.webcollage.name: WebCollage |
| 65 |
*hacks.vidwhacker.name: VidWhacker |
| 66 |
*hacks.morph3d.name: Morph3D |
| 67 |
*hacks.bubble3d.name: Bubble3D |
| 68 |
diff -ur xscreensaver-5.04.orig/hacks/glx/glsnake.c xscreensaver-5.04/hacks/glx/glsnake.c |
| 69 |
--- xscreensaver-5.04.orig/hacks/glx/glsnake.c 2006-05-03 22:39:21.000000000 +0300 |
| 70 |
+++ xscreensaver-5.04/hacks/glx/glsnake.c 2007-12-30 21:15:41.000000000 +0200 |
| 71 |
@@ -565,21 +565,6 @@ |
| 72 |
ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, |
| 73 |
ZERO, PIN, ZERO } |
| 74 |
}, |
| 75 |
- { "erect penis", /* thanks benno */ |
| 76 |
- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, |
| 77 |
- PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, |
| 78 |
- ZERO, ZERO } |
| 79 |
- }, |
| 80 |
- { "flaccid penis", |
| 81 |
- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, |
| 82 |
- PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, |
| 83 |
- ZERO, ZERO } |
| 84 |
- }, |
| 85 |
- { "vagina", |
| 86 |
- { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, |
| 87 |
- LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, |
| 88 |
- PIN, RIGHT, ZERO } |
| 89 |
- }, |
| 90 |
{ "mask", |
| 91 |
{ ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, ZERO, ZERO, PIN, |
| 92 |
ZERO, ZERO, PIN, ZERO, PIN, ZERO, PIN, ZERO, ZERO, PIN, ZERO, |
| 93 |
@@ -995,9 +980,6 @@ |
| 94 |
{ "Parrot", |
| 95 |
{ ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } |
| 96 |
}, |
| 97 |
- { "Penis", |
| 98 |
- { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } |
| 99 |
- }, |
| 100 |
{ "PictureComingSoon", |
| 101 |
{ LEFT, LEFT, ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, PIN, LEFT, RIGHT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, ZERO, RIGHT, RIGHT, ZERO } |
| 102 |
}, |
| 103 |
diff -ur xscreensaver-5.04.orig/hacks/Makefile.in xscreensaver-5.04/hacks/Makefile.in |
| 104 |
--- xscreensaver-5.04.orig/hacks/Makefile.in 2007-11-13 10:39:36.000000000 +0200 |
| 105 |
+++ xscreensaver-5.04/hacks/Makefile.in 2007-12-30 21:19:15.000000000 +0200 |
| 106 |
@@ -103,7 +103,7 @@ |
| 107 |
blaster.c bumps.c ripples.c xspirograph.c \ |
| 108 |
nerverot.c xrayswarm.c hyperball.c zoom.c whirlwindwarp.c \ |
| 109 |
rotzoomer.c whirlygig.c speedmine.c vermiculate.c \ |
| 110 |
- xpm-pixmap.c webcollage-helper.c twang.c apollonian.c \ |
| 111 |
+ xpm-pixmap.c twang.c apollonian.c \ |
| 112 |
euler2d.c juggle.c polyominoes.c thornbird.c fluidballs.c \ |
| 113 |
anemone.c halftone.c metaballs.c eruption.c popsquares.c \ |
| 114 |
barcode.c piecewise.c cloudlife.c fontglide.c apple2.c \ |
| 115 |
@@ -112,9 +112,8 @@ |
| 116 |
fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \ |
| 117 |
intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \ |
| 118 |
boxfit.c interaggregate.c celtic.c cwaves.c m6502.c \ |
| 119 |
- asm6502.c abstractile.c \ |
| 120 |
- webcollage-cocoa.m webcollage-helper-cocoa.m |
| 121 |
-SCRIPTS = vidwhacker webcollage ljlatest |
| 122 |
+ asm6502.c abstractile.c |
| 123 |
+SCRIPTS = vidwhacker ljlatest |
| 124 |
|
| 125 |
# Programs that are mentioned in XScreenSaver.ad, and that have XML files, |
| 126 |
# but that are not shipped with xscreensaver itself. |
| 127 |
@@ -142,7 +141,7 @@ |
| 128 |
blaster.o bumps.o ripples.o xspirograph.o \ |
| 129 |
nerverot.o xrayswarm.o hyperball.o zoom.o whirlwindwarp.o \ |
| 130 |
rotzoomer.o whirlygig.o speedmine.o vermiculate.o \ |
| 131 |
- xpm-pixmap.o webcollage-helper.o twang.o apollonian.o \ |
| 132 |
+ xpm-pixmap.o twang.o apollonian.o \ |
| 133 |
euler2d.o juggle.o polyominoes.o thornbird.o fluidballs.o \ |
| 134 |
anemone.o halftone.o metaballs.o eruption.o popsquares.o \ |
| 135 |
barcode.o piecewise.o cloudlife.o fontglide.o apple2.o \ |
| 136 |
@@ -150,8 +149,8 @@ |
| 137 |
mismunch.o pacman.o pacman_ai.o pacman_level.o \ |
| 138 |
fuzzyflakes.o anemotaxis.o memscroller.o substrate.o \ |
| 139 |
intermomentary.o fireworkx.o fiberlamp.o boxfit.o \ |
| 140 |
- interaggregate.o celtic.o cwaves.o webcollage-cocoa.o \ |
| 141 |
- webcollage-helper-cocoa.o m6502.0 asm6502.o abstractile.o |
| 142 |
+ interaggregate.o celtic.o cwaves.o \ |
| 143 |
+ m6502.0 asm6502.o abstractile.o |
| 144 |
|
| 145 |
NEXES = attraction blitspin bouboule braid bubbles decayscreen deco \ |
| 146 |
drift flag flame forest vines galaxy grav greynetic halo \ |
| 147 |
@@ -175,7 +174,7 @@ |
| 148 |
celtic cwaves m6502 abstractile \ |
| 149 |
@JPEG_EXES@ |
| 150 |
SEXES = sonar |
| 151 |
-JPEG_EXES = webcollage-helper |
| 152 |
+JPEG_EXES = |
| 153 |
EXES = $(NEXES) $(SEXES) |
| 154 |
|
| 155 |
HACK_OBJS_1 = $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ |
| 156 |
@@ -211,7 +210,7 @@ |
| 157 |
spotlight.man squiral.man starfish.man strange.man \ |
| 158 |
swirl.man t3d.man thornbird.man triangle.man truchet.man \ |
| 159 |
twang.man vermiculate.man vidwhacker.man vines.man \ |
| 160 |
- wander.man webcollage.man whirlwindwarp.man whirlygig.man \ |
| 161 |
+ wander.man whirlwindwarp.man whirlygig.man \ |
| 162 |
worm.man xflame.man xjack.man xlyap.man xmatrix.man \ |
| 163 |
xrayswarm.man xspirograph.man xsublim.man \ |
| 164 |
zoom.man halftone.man eruption.man metaballs.man \ |
| 165 |
@@ -988,9 +987,6 @@ |
| 166 |
xsublim: xsublim.o $(HACK_OBJS_1) |
| 167 |
$(CC_HACK) -o $@ $@.o $(HACK_OBJS_1) $(HACK_LIBS) |
| 168 |
|
| 169 |
-webcollage-helper: webcollage-helper.o |
| 170 |
- $(CC_HACK) -o $@ $@.o $(XPM_LIBS) $(JPEG_LIBS) |
| 171 |
- |
| 172 |
|
| 173 |
############################################################################## |
| 174 |
# |
| 175 |
@@ -2521,17 +2517,6 @@ |
| 176 |
wander.o: $(UTILS_SRC)/usleep.h |
| 177 |
wander.o: $(UTILS_SRC)/visual.h |
| 178 |
wander.o: $(UTILS_SRC)/yarandom.h |
| 179 |
-webcollage-cocoa.o: ../config.h |
| 180 |
-webcollage-cocoa.o: $(srcdir)/screenhackI.h |
| 181 |
-webcollage-cocoa.o: $(srcdir)/screenhack.h |
| 182 |
-webcollage-cocoa.o: $(UTILS_SRC)/colors.h |
| 183 |
-webcollage-cocoa.o: $(UTILS_SRC)/grabscreen.h |
| 184 |
-webcollage-cocoa.o: $(UTILS_SRC)/hsv.h |
| 185 |
-webcollage-cocoa.o: $(UTILS_SRC)/resources.h |
| 186 |
-webcollage-cocoa.o: $(UTILS_SRC)/usleep.h |
| 187 |
-webcollage-cocoa.o: $(UTILS_SRC)/visual.h |
| 188 |
-webcollage-cocoa.o: $(UTILS_SRC)/yarandom.h |
| 189 |
-webcollage-helper.o: ../config.h |
| 190 |
whirlwindwarp.o: ../config.h |
| 191 |
whirlwindwarp.o: $(srcdir)/screenhackI.h |
| 192 |
whirlwindwarp.o: $(srcdir)/screenhack.h |
| 193 |
diff -ur xscreensaver-5.04.orig/po/POTFILES.in xscreensaver-5.04/po/POTFILES.in |
| 194 |
--- xscreensaver-5.04.orig/po/POTFILES.in 2007-11-13 10:39:40.000000000 +0200 |
| 195 |
+++ xscreensaver-5.04/po/POTFILES.in 2007-12-30 21:19:50.000000000 +0200 |
| 196 |
@@ -210,7 +210,6 @@ |
| 197 |
hacks/config/vines.xml |
| 198 |
hacks/config/voronoi.xml |
| 199 |
hacks/config/wander.xml |
| 200 |
-hacks/config/webcollage.xml |
| 201 |
hacks/config/whirlwindwarp.xml |
| 202 |
hacks/config/whirlygig.xml |
| 203 |
hacks/config/worm.xml |
| 204 |
|
| 205 |
|
| 206 |
|
| 207 |
1.1 x11-misc/xscreensaver/files/digest-xscreensaver-5.04 |
| 208 |
|
| 209 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/digest-xscreensaver-5.04?rev=1.1&view=markup |
| 210 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/digest-xscreensaver-5.04?rev=1.1&content-type=text/plain |
| 211 |
|
| 212 |
Index: digest-xscreensaver-5.04 |
| 213 |
=================================================================== |
| 214 |
MD5 1d27b5ddecdb49c806d1e91ca82fc43e xscreensaver-5.04.tar.gz 5438905 |
| 215 |
RMD160 cf8c59a1aff1139c8d205bb734a17bc706f75287 xscreensaver-5.04.tar.gz 5438905 |
| 216 |
SHA256 d1200b497795e6e32853e434a81be0cba718a3a46457b378cad7ac9d0dfba6d7 xscreensaver-5.04.tar.gz 5438905 |
| 217 |
|
| 218 |
|
| 219 |
|
| 220 |
-- |
| 221 |
gentoo-commits@g.o mailing list |
Archives