1 |
drac 08/01/01 16:44:55 |
2 |
|
3 |
Modified: xscreensaver-5.04-nsfw.patch |
4 |
Log: |
5 |
Update offensive patch, do less. |
6 |
(Portage version: 2.1.4_rc12) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: xscreensaver-5.04-nsfw.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- xscreensaver-5.04-nsfw.patch 30 Dec 2007 19:39:32 -0000 1.1 |
22 |
+++ xscreensaver-5.04-nsfw.patch 1 Jan 2008 16:44:55 -0000 1.2 |
23 |
@@ -1,158 +1,61 @@ |
24 |
-diff -ur xscreensaver-5.04.orig/driver/XScreenSaver.ad.in xscreensaver-5.04/driver/XScreenSaver.ad.in |
25 |
---- xscreensaver-5.04.orig/driver/XScreenSaver.ad.in 2007-11-13 10:36:00.000000000 +0200 |
26 |
-+++ xscreensaver-5.04/driver/XScreenSaver.ad.in 2007-12-30 21:13:12.000000000 +0200 |
27 |
-@@ -305,10 +305,6 @@ |
28 |
- cwaves -root \n\ |
29 |
- m6502 -root \n\ |
30 |
- abstractile -root \n\ |
31 |
--- default-n: webcollage -root \n\ |
32 |
--- default-n: "WebCollage (whacked)" \ |
33 |
-- webcollage -root -filter \ |
34 |
-- 'vidwhacker -stdin -stdout' \n\ |
35 |
- - default-n: vidwhacker -root \n\ |
36 |
- \ |
37 |
- @GL_KLUDGE@ GL: gears -root \n\ |
38 |
-@@ -495,7 +491,6 @@ |
39 |
- *hacks.xanalogtv.name: XAnalogTV |
40 |
- *hacks.xspirograph.name: XSpiroGraph |
41 |
- *hacks.nerverot.name: NerveRot |
42 |
--*hacks.webcollage.name: WebCollage |
43 |
- *hacks.vidwhacker.name: VidWhacker |
44 |
- *hacks.morph3d.name: Morph3D |
45 |
- *hacks.bubble3d.name: Bubble3D |
46 |
+diff -ur xscreensaver-5.04.orig/hacks/barcode.c xscreensaver-5.04/hacks/barcode.c |
47 |
+--- xscreensaver-5.04.orig/hacks/barcode.c 2006-04-06 09:40:32.000000000 +0300 |
48 |
++++ xscreensaver-5.04/hacks/barcode.c 2008-01-01 18:21:08.000000000 +0200 |
49 |
+@@ -131,7 +131,6 @@ |
50 |
+ "children", |
51 |
+ "chocolate", |
52 |
+ "CLONE", |
53 |
+- "cock", |
54 |
+ "constriction", |
55 |
+ "contrition", |
56 |
+ "cop", |
57 |
+@@ -265,7 +264,6 @@ |
58 |
+ "punishment", |
59 |
+ "punk rock", |
60 |
+ "punk", |
61 |
+- "pussy", |
62 |
+ "quagmire", |
63 |
+ "quarantine", |
64 |
+ "quartz", |
65 |
+@@ -333,8 +331,6 @@ |
66 |
+ "vegetarian", |
67 |
+ "venom", |
68 |
+ "verifiability", |
69 |
+- "viagra", |
70 |
+- "vibrator", |
71 |
+ "victim", |
72 |
+ "vignette", |
73 |
+ "villainy", |
74 |
diff -ur xscreensaver-5.04.orig/hacks/glx/glsnake.c xscreensaver-5.04/hacks/glx/glsnake.c |
75 |
--- xscreensaver-5.04.orig/hacks/glx/glsnake.c 2006-05-03 22:39:21.000000000 +0300 |
76 |
-+++ xscreensaver-5.04/hacks/glx/glsnake.c 2007-12-30 21:15:41.000000000 +0200 |
77 |
-@@ -565,21 +565,6 @@ |
78 |
++++ xscreensaver-5.04/hacks/glx/glsnake.c 2008-01-01 18:18:34.000000000 +0200 |
79 |
+@@ -565,17 +565,17 @@ |
80 |
ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, |
81 |
ZERO, PIN, ZERO } |
82 |
}, |
83 |
- { "erect penis", /* thanks benno */ |
84 |
-- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, |
85 |
-- PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, |
86 |
-- ZERO, ZERO } |
87 |
-- }, |
88 |
++ { "shuffle board", /* thanks benno */ |
89 |
+ { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, |
90 |
+ PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, |
91 |
+ ZERO, ZERO } |
92 |
+ }, |
93 |
- { "flaccid penis", |
94 |
-- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, |
95 |
-- PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, |
96 |
-- ZERO, ZERO } |
97 |
-- }, |
98 |
++ { "flaccid anchor", |
99 |
+ { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, |
100 |
+ PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, |
101 |
+ ZERO, ZERO } |
102 |
+ }, |
103 |
- { "vagina", |
104 |
-- { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, |
105 |
-- LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, |
106 |
-- PIN, RIGHT, ZERO } |
107 |
-- }, |
108 |
- { "mask", |
109 |
- { ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, ZERO, ZERO, PIN, |
110 |
- ZERO, ZERO, PIN, ZERO, PIN, ZERO, PIN, ZERO, ZERO, PIN, ZERO, |
111 |
-@@ -995,9 +980,6 @@ |
112 |
++ { "engagement ring", |
113 |
+ { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, |
114 |
+ LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, |
115 |
+ PIN, RIGHT, ZERO } |
116 |
+@@ -995,7 +995,7 @@ |
117 |
{ "Parrot", |
118 |
{ ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } |
119 |
}, |
120 |
- { "Penis", |
121 |
-- { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } |
122 |
-- }, |
123 |
- { "PictureComingSoon", |
124 |
- { LEFT, LEFT, ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, PIN, LEFT, RIGHT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, ZERO, RIGHT, RIGHT, ZERO } |
125 |
++ { "Shuttle", |
126 |
+ { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } |
127 |
}, |
128 |
-diff -ur xscreensaver-5.04.orig/hacks/Makefile.in xscreensaver-5.04/hacks/Makefile.in |
129 |
---- xscreensaver-5.04.orig/hacks/Makefile.in 2007-11-13 10:39:36.000000000 +0200 |
130 |
-+++ xscreensaver-5.04/hacks/Makefile.in 2007-12-30 21:19:15.000000000 +0200 |
131 |
-@@ -103,7 +103,7 @@ |
132 |
- blaster.c bumps.c ripples.c xspirograph.c \ |
133 |
- nerverot.c xrayswarm.c hyperball.c zoom.c whirlwindwarp.c \ |
134 |
- rotzoomer.c whirlygig.c speedmine.c vermiculate.c \ |
135 |
-- xpm-pixmap.c webcollage-helper.c twang.c apollonian.c \ |
136 |
-+ xpm-pixmap.c twang.c apollonian.c \ |
137 |
- euler2d.c juggle.c polyominoes.c thornbird.c fluidballs.c \ |
138 |
- anemone.c halftone.c metaballs.c eruption.c popsquares.c \ |
139 |
- barcode.c piecewise.c cloudlife.c fontglide.c apple2.c \ |
140 |
-@@ -112,9 +112,8 @@ |
141 |
- fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \ |
142 |
- intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \ |
143 |
- boxfit.c interaggregate.c celtic.c cwaves.c m6502.c \ |
144 |
-- asm6502.c abstractile.c \ |
145 |
-- webcollage-cocoa.m webcollage-helper-cocoa.m |
146 |
--SCRIPTS = vidwhacker webcollage ljlatest |
147 |
-+ asm6502.c abstractile.c |
148 |
-+SCRIPTS = vidwhacker ljlatest |
149 |
- |
150 |
- # Programs that are mentioned in XScreenSaver.ad, and that have XML files, |
151 |
- # but that are not shipped with xscreensaver itself. |
152 |
-@@ -142,7 +141,7 @@ |
153 |
- blaster.o bumps.o ripples.o xspirograph.o \ |
154 |
- nerverot.o xrayswarm.o hyperball.o zoom.o whirlwindwarp.o \ |
155 |
- rotzoomer.o whirlygig.o speedmine.o vermiculate.o \ |
156 |
-- xpm-pixmap.o webcollage-helper.o twang.o apollonian.o \ |
157 |
-+ xpm-pixmap.o twang.o apollonian.o \ |
158 |
- euler2d.o juggle.o polyominoes.o thornbird.o fluidballs.o \ |
159 |
- anemone.o halftone.o metaballs.o eruption.o popsquares.o \ |
160 |
- barcode.o piecewise.o cloudlife.o fontglide.o apple2.o \ |
161 |
-@@ -150,8 +149,8 @@ |
162 |
- mismunch.o pacman.o pacman_ai.o pacman_level.o \ |
163 |
- fuzzyflakes.o anemotaxis.o memscroller.o substrate.o \ |
164 |
- intermomentary.o fireworkx.o fiberlamp.o boxfit.o \ |
165 |
-- interaggregate.o celtic.o cwaves.o webcollage-cocoa.o \ |
166 |
-- webcollage-helper-cocoa.o m6502.0 asm6502.o abstractile.o |
167 |
-+ interaggregate.o celtic.o cwaves.o \ |
168 |
-+ m6502.0 asm6502.o abstractile.o |
169 |
- |
170 |
- NEXES = attraction blitspin bouboule braid bubbles decayscreen deco \ |
171 |
- drift flag flame forest vines galaxy grav greynetic halo \ |
172 |
-@@ -175,7 +174,7 @@ |
173 |
- celtic cwaves m6502 abstractile \ |
174 |
- @JPEG_EXES@ |
175 |
- SEXES = sonar |
176 |
--JPEG_EXES = webcollage-helper |
177 |
-+JPEG_EXES = |
178 |
- EXES = $(NEXES) $(SEXES) |
179 |
- |
180 |
- HACK_OBJS_1 = $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ |
181 |
-@@ -211,7 +210,7 @@ |
182 |
- spotlight.man squiral.man starfish.man strange.man \ |
183 |
- swirl.man t3d.man thornbird.man triangle.man truchet.man \ |
184 |
- twang.man vermiculate.man vidwhacker.man vines.man \ |
185 |
-- wander.man webcollage.man whirlwindwarp.man whirlygig.man \ |
186 |
-+ wander.man whirlwindwarp.man whirlygig.man \ |
187 |
- worm.man xflame.man xjack.man xlyap.man xmatrix.man \ |
188 |
- xrayswarm.man xspirograph.man xsublim.man \ |
189 |
- zoom.man halftone.man eruption.man metaballs.man \ |
190 |
-@@ -988,9 +987,6 @@ |
191 |
- xsublim: xsublim.o $(HACK_OBJS_1) |
192 |
- $(CC_HACK) -o $@ $@.o $(HACK_OBJS_1) $(HACK_LIBS) |
193 |
- |
194 |
--webcollage-helper: webcollage-helper.o |
195 |
-- $(CC_HACK) -o $@ $@.o $(XPM_LIBS) $(JPEG_LIBS) |
196 |
-- |
197 |
- |
198 |
- ############################################################################## |
199 |
- # |
200 |
-@@ -2521,17 +2517,6 @@ |
201 |
- wander.o: $(UTILS_SRC)/usleep.h |
202 |
- wander.o: $(UTILS_SRC)/visual.h |
203 |
- wander.o: $(UTILS_SRC)/yarandom.h |
204 |
--webcollage-cocoa.o: ../config.h |
205 |
--webcollage-cocoa.o: $(srcdir)/screenhackI.h |
206 |
--webcollage-cocoa.o: $(srcdir)/screenhack.h |
207 |
--webcollage-cocoa.o: $(UTILS_SRC)/colors.h |
208 |
--webcollage-cocoa.o: $(UTILS_SRC)/grabscreen.h |
209 |
--webcollage-cocoa.o: $(UTILS_SRC)/hsv.h |
210 |
--webcollage-cocoa.o: $(UTILS_SRC)/resources.h |
211 |
--webcollage-cocoa.o: $(UTILS_SRC)/usleep.h |
212 |
--webcollage-cocoa.o: $(UTILS_SRC)/visual.h |
213 |
--webcollage-cocoa.o: $(UTILS_SRC)/yarandom.h |
214 |
--webcollage-helper.o: ../config.h |
215 |
- whirlwindwarp.o: ../config.h |
216 |
- whirlwindwarp.o: $(srcdir)/screenhackI.h |
217 |
- whirlwindwarp.o: $(srcdir)/screenhack.h |
218 |
-diff -ur xscreensaver-5.04.orig/po/POTFILES.in xscreensaver-5.04/po/POTFILES.in |
219 |
---- xscreensaver-5.04.orig/po/POTFILES.in 2007-11-13 10:39:40.000000000 +0200 |
220 |
-+++ xscreensaver-5.04/po/POTFILES.in 2007-12-30 21:19:50.000000000 +0200 |
221 |
-@@ -210,7 +210,6 @@ |
222 |
- hacks/config/vines.xml |
223 |
- hacks/config/voronoi.xml |
224 |
- hacks/config/wander.xml |
225 |
--hacks/config/webcollage.xml |
226 |
- hacks/config/whirlwindwarp.xml |
227 |
- hacks/config/whirlygig.xml |
228 |
- hacks/config/worm.xml |
229 |
+ { "PictureComingSoon", |
230 |
|
231 |
|
232 |
|
233 |
-- |
234 |
gentoo-commits@g.o mailing list |