Rebuild [libre/xscreensaver] without BSOD (#2391)

2 files changed, 100 insertions, 12 deletions

diff --git a/libre/xscreensaver/PKGBUILD b/libre/xscreensaver/PKGBUILD
index 0dbe21bb1..e3a09b6b3 100644
--- a/libre/xscreensaver/PKGBUILD
+++ b/libre/xscreensaver/PKGBUILD
@@ -2,6 +2,7 @@
 # Contributor (Arch): Eric Bélanger <eric@archlinux.org>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: André Silva <emulatorman@hyperbola.info>
+# Contributor: freemor <freemor@freemor.ca>
 
 # parabola changes and rationale:
 #  removed nonfree asm files
@@ -10,7 +11,7 @@ pkgname=xscreensaver
 _pkgname=$pkgname-libre
 pkgver=5.42
 pkgrel=1
-pkgrel+=.par1
+pkgrel+=.par2
 pkgdesc="Screen saver and locker for the X Window System"
 pkgdesc+=", without nonfree asm files"
 url='https://www.jwz.org/xscreensaver/'
@@ -21,21 +22,21 @@ depends=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww')
 makedepends=('bc' 'intltool' 'libxpm' 'gdm')
 optdepends=('gdm: for login manager support')
 backup=('etc/pam.d/xscreensaver')
-mksource=(https://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz)
-source=(https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
-	LICENSE)
-mksha512sums=('84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd')
-sha512sums=('297c37b1b8735d7d23d30d360754a84978b17cba8b554b7e2187a89ff70688784f1d3c0f4fb57b849d2ebf0ec04fad3dddb0602181e1ffbccf260d65435a6b25'
-            '863c699479b2ec2775a0d1cba22e615929194a14af164b3513e46a0c04229da6547255a4da8f7f1bbb40906898c124ed3c9ec2436b76b62affcb62385af9783e')
+source=(https://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
+	LICENSE
+	Remove_bsod.patch)
+sha512sums=('84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd'
+            '863c699479b2ec2775a0d1cba22e615929194a14af164b3513e46a0c04229da6547255a4da8f7f1bbb40906898c124ed3c9ec2436b76b62affcb62385af9783e'
+            '376370c40c959e4db022cc07382962b2e2f80925b4f9d3c29fbef1dd0788bfe3ab2741b85da52430566398be7430f9f5468fcf0471f79b72de96f451d51b2f90')
 
-mksource() {
-  cd ${pkgname}-${pkgver}
-  # Deleting dmsc.asm file due which don't have source code supplied
-  rm -v hacks/images/m6502/dmsc.asm
-}
 
 prepare() {
   cd ${pkgname}-${pkgver}
+  # Deleting dmsc.asm file due which don't have source code supplied
+  rm -v hacks/images/m6502/dmsc.asm
+  # Remove BSOD for referneces to non-free (Issue #2391)
+  patch -Nup1 hacks/Makefile.in ../Remove_bsod.patch
+  rm -v hacks/bsod*
   sed 's|-std=c89||' -i configure.in
   autoreconf -fiv
 }
diff --git a/libre/xscreensaver/Remove_bsod.patch b/libre/xscreensaver/Remove_bsod.patch
new file mode 100644
index 000000000..b682749b4
--- /dev/null
+++ b/libre/xscreensaver/Remove_bsod.patch
@@ -0,0 +1,87 @@
+--- 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 @@
+ 		  rd-bomb.c coral.c mountain.c triangle.c lissie.c worm.c \
+ 		  rotor.c ant.c xjack.c xlyap.c xscreensaver-sgigl.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 @@
+ 		  rd-bomb.o coral.o mountain.o triangle.o lissie.o worm.o \
+ 		  rotor.o ant.o xjack.o xlyap.o xscreensaver-sgigl.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 @@
+ 		  slip strange swirl goop starfish munch \
+ 		  fadeplot rd-bomb coral mountain triangle \
+ 		  xjack xlyap cynosure moire2 flow epicycle \
+-		  interference truchet bsod crystal discrete distort kumppa \
++		  interference truchet crystal discrete distort kumppa \
+ 		  demon loop penetrate deluxe compass squiral xflame \
+ 		  wander spotlight phosphor xmatrix petri shadebobs \
+ 		  ccurve blaster bumps ripples xspirograph \
+@@ -214,7 +214,7 @@
+ 		  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 \
+-	          blaster.man blitspin.man bouboule.man braid.man bsod.man \
++	          blaster.man blitspin.man bouboule.man braid.man \
+ 	          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 @@
+ truchet:	 truchet.o	$(HACK_OBJS) $(COL)
+ 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS)
+ 
+-bsod:	 	bsod.o		$(HACK_OBJS) $(GRAB) $(APPLE2) $(PNG)
+-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(APPLE2) $(PNG) $(PNG_LIBS) $(THRL)
+-
+ 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 @@
+ braid.o: $(UTILS_SRC)/yarandom.h
+ braid.o: $(srcdir)/xlockmoreI.h
+ braid.o: $(srcdir)/xlockmore.h
+-bsod.o: $(srcdir)/analogtv.h
+-bsod.o: $(srcdir)/apple2.h
+-bsod.o: ../config.h
+-bsod.o: $(srcdir)/fps.h
+-bsod.o: images/gen/amiga_png.h
+-bsod.o: images/gen/android_png.h
+-bsod.o: images/gen/apple_png.h
+-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/hmac_png.h
+-bsod.o: images/gen/macbomb_png.h
+-bsod.o: images/gen/mac_png.h
+-bsod.o: images/gen/osx_10_2_png.h
+-bsod.o: images/gen/osx_10_3_png.h
+-bsod.o: images/gen/ransomware_png.h
+-bsod.o: images/gen/sun_png.h
+-bsod.o: $(srcdir)/recanim.h
+-bsod.o: $(srcdir)/screenhackI.h
+-bsod.o: $(srcdir)/screenhack.h
+-bsod.o: $(UTILS_SRC)/aligned_malloc.h
+-bsod.o: $(UTILS_SRC)/colors.h
+-bsod.o: $(UTILS_SRC)/font-retry.h
+-bsod.o: $(UTILS_SRC)/grabscreen.h
+-bsod.o: $(UTILS_SRC)/hsv.h
+-bsod.o: $(UTILS_SRC)/resources.h
+-bsod.o: $(UTILS_SRC)/thread_util.h
+-bsod.o: $(UTILS_SRC)/usleep.h
+-bsod.o: $(UTILS_SRC)/visual.h
+-bsod.o: $(UTILS_SRC)/xshm.h
+-bsod.o: $(UTILS_SRC)/yarandom.h
+-bsod.o: $(srcdir)/ximage-loader.h
+ bubbles-default.o: $(srcdir)/bubbles.h
+ bubbles-default.o: ../config.h
+ bubbles-default.o: images/gen/blood10_png.h