summaryrefslogtreecommitdiff
path: root/libre/xscreensaver/Remove_bsod.patch
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2021-07-01 22:19:09 -0400
committerDavid P <megver83@parabola.nu>2021-07-01 22:19:09 -0400
commit9783f8f5a2bd3bd5ed479b3826428e93ae5d5211 (patch)
tree2f2ea6f6f3d004ea9522e4aadb54bc9605535034 /libre/xscreensaver/Remove_bsod.patch
parentc87c26b07dbe0e7059643eaf19afba372b69650f (diff)
downloadabslibre-9783f8f5a2bd3bd5ed479b3826428e93ae5d5211.tar.gz
abslibre-9783f8f5a2bd3bd5ed479b3826428e93ae5d5211.tar.bz2
abslibre-9783f8f5a2bd3bd5ed479b3826428e93ae5d5211.zip
updpkg: libre/xscreensaver 6.00-2.parabola1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'libre/xscreensaver/Remove_bsod.patch')
-rw-r--r--libre/xscreensaver/Remove_bsod.patch25
1 files changed, 15 insertions, 10 deletions
diff --git a/libre/xscreensaver/Remove_bsod.patch b/libre/xscreensaver/Remove_bsod.patch
index b682749b4..55a228d8c 100644
--- a/libre/xscreensaver/Remove_bsod.patch
+++ b/libre/xscreensaver/Remove_bsod.patch
@@ -1,24 +1,26 @@
---- a/hacks/Makefile.in 2018-12-28 20:21:49.000000000 -0400
-+++ b/hacks/Makefile.in 2019-07-20 07:28:35.915050337 -0300
-@@ -104,7 +104,7 @@
+diff --git a/hacks/Makefile.in b/hacks/Makefile.in
+index ef6ee5c..6f4ee46 100644
+--- a/hacks/Makefile.in
++++ b/hacks/Makefile.in
+@@ -104,7 +104,7 @@ SRCS = xscreensaver-getimage.c \
rd-bomb.c coral.c mountain.c triangle.c lissie.c worm.c \
- rotor.c ant.c xjack.c xlyap.c xscreensaver-sgigl.c \
+ rotor.c ant.c xjack.c xlyap.c \
cynosure.c moire2.c flow.c epicycle.c interference.c \
- truchet.c bsod.c crystal.c discrete.c distort.c kumppa.c \
+ truchet.c crystal.c discrete.c distort.c kumppa.c \
demon.c loop.c t3d.c penetrate.c deluxe.c compass.c \
squiral.c xflame.c wander.c spotlight.c critical.c \
phosphor.c xmatrix.c petri.c shadebobs.c xsublim.c ccurve.c \
-@@ -145,7 +145,7 @@
+@@ -142,7 +142,7 @@ OBJS = attraction.o blitspin.o bouboule.o braid.o bubbles.o \
rd-bomb.o coral.o mountain.o triangle.o lissie.o worm.o \
- rotor.o ant.o xjack.o xlyap.o xscreensaver-sgigl.o \
+ rotor.o ant.o xjack.o xlyap.o xscreensaver-getimage.o \
cynosure.o moire2.o flow.o epicycle.o interference.o \
- truchet.o bsod.o crystal.o discrete.o distort.o kumppa.o \
+ truchet.o crystal.o discrete.o distort.o kumppa.o \
demon.o loop.o t3d.o penetrate.o deluxe.o compass.o \
squiral.o xflame.o wander.o spotlight.o critical.o \
phosphor.o xmatrix.o petri.o shadebobs.o xsublim.o ccurve.o \
-@@ -174,7 +174,7 @@
+@@ -171,7 +171,7 @@ EXES = attraction blitspin bouboule braid decayscreen deco \
slip strange swirl goop starfish munch \
fadeplot rd-bomb coral mountain triangle \
xjack xlyap cynosure moire2 flow epicycle \
@@ -27,7 +29,7 @@
demon loop penetrate deluxe compass squiral xflame \
wander spotlight phosphor xmatrix petri shadebobs \
ccurve blaster bumps ripples xspirograph \
-@@ -214,7 +214,7 @@
+@@ -210,7 +210,7 @@ HDRS = screenhack.h screenhackI.h fps.h fpsI.h xlockmore.h \
apple2.h analogtv.h pacman.h pacman_ai.h pacman_level.h \
asm6502.h delaunay.h recanim.h
MEN = anemone.man apollonian.man attraction.man \
@@ -36,7 +38,7 @@
bumps.man ccurve.man compass.man coral.man \
crystal.man cynosure.man decayscreen.man \
deco.man deluxe.man demon.man discrete.man distort.man \
-@@ -688,9 +688,6 @@
+@@ -661,9 +661,6 @@ interference: interference.o $(HACK_OBJS) $(COL) $(SHM) $(THRO) $(DBE)
truchet: truchet.o $(HACK_OBJS) $(COL)
$(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(HACK_LIBS)
@@ -46,7 +48,7 @@
apple2: apple2.o apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(PNG)
$(CC_HACK) -o $@ $@.o apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(PNG) $(PNG_LIBS) $(TEXT_LIBS) $(THRL)
-@@ -1293,38 +1290,6 @@
+@@ -1294,41 +1291,6 @@ braid.o: $(UTILS_SRC)/xft.h
braid.o: $(UTILS_SRC)/yarandom.h
braid.o: $(srcdir)/xlockmoreI.h
braid.o: $(srcdir)/xlockmore.h
@@ -60,6 +62,8 @@
-bsod.o: images/gen/atari_png.h
-bsod.o: images/gen/atm_png.h
-bsod.o: images/gen/dvd_png.h
+-bsod.o: images/gen/gnome1_png.h
+-bsod.o: images/gen/gnome2_png.h
-bsod.o: images/gen/hmac_png.h
-bsod.o: images/gen/macbomb_png.h
-bsod.o: images/gen/mac_png.h
@@ -79,6 +83,7 @@
-bsod.o: $(UTILS_SRC)/thread_util.h
-bsod.o: $(UTILS_SRC)/usleep.h
-bsod.o: $(UTILS_SRC)/visual.h
+-bsod.o: $(UTILS_SRC)/xft.h
-bsod.o: $(UTILS_SRC)/xshm.h
-bsod.o: $(UTILS_SRC)/yarandom.h
-bsod.o: $(srcdir)/ximage-loader.h