From fece81a70b81acdd408a263ceeb6cdad75a3be51 Mon Sep 17 00:00:00 2001
From: Freemor <freemor@freemor.ca>
Date: Sat, 20 Jul 2019 14:50:26 -0300
Subject: Rebuild [libre/xscreensaver] without BSOD (#2391)

---
 libre/xscreensaver/PKGBUILD | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'libre/xscreensaver/PKGBUILD')

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
 }
-- 
cgit v1.2.3