Update to 5.2

3 files changed, 9 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf8a1a815068..467f3282ab31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Jun 17 01:52:33 UTC 2018
+# Wed Jun 20 17:34:10 UTC 2018
 pkgbase = crispy-doom
 	pkgdesc = Vanilla-compatible enhanced Doom engine
-	pkgver = 5.1
-	pkgrel = 2
+	pkgver = 5.2
+	pkgrel = 1
 	url = http://fabiangreffrath.github.io/crispy-doom
 	install = crispy-doom.install
 	arch = i686
@@ -17,10 +17,8 @@ pkgbase = crispy-doom
 	optdepends = freedm: Free deathmatch game
 	optdepends = freedoom1: Free Ultimate Doom-compatible game
 	optdepends = freedoom2: Free Doom II/Final Doom-compatible game
-	source = https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-5.1.tar.gz
-	source = 0001-bash-completion-Build-from-actual-shell-script-templ.patch
-	sha512sums = 7b0a78e6521781f46997b3a9d0fb4bcdbae249bab1d2c926e3e48087dfc7f6963ae99291b0294e7555f96c3ddc6412d592a9020f20694d200f1ef7c3a8432a66
-	sha512sums = 88521a56d4075942e0219ce435d6c4e0a1f0ce4e5160730c33129b849230250c5fd7554b39d4838e5dd5aeedaf927e5b275642b795befd257dc799ff48870e1b
+	source = https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-5.2.tar.gz
+	sha512sums = 2ef03adaa04489dc1c3b335847e1fc23067a0d08b13637e9e79ae50d4116a6959c4312eee5f05601d830bd44a2104d39d659975499279292c65c677b4616e5d3
 
 pkgname = crispy-doom
 
diff --git a/0001-bash-completion-Build-from-actual-shell-script-templ.patch b/0001-bash-completion-Build-from-actual-shell-script-templ.patch
deleted file mode 100644
index 96f5cbb8e2f0..000000000000
--- a/0001-bash-completion-Build-from-actual-shell-script-templ.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 4e2e2fda27108e7ed65797a4e3b43cac35eee445 Mon Sep 17 00:00:00 2001
-From: Mike Swanson <mikeonthecomputer@gmail.com>
-Date: Sat, 27 Jan 2018 04:49:08 -0800
-Subject: [PATCH] bash-completion: Build from actual shell script templates.
-
-At some point, the Makefile was inerrantly modified so that it
-generated manpage sources instead of shell script, making completions
-very screwed up.
----
- man/bash-completion/Makefile.am | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/man/bash-completion/Makefile.am b/man/bash-completion/Makefile.am
-index c831b02b..cc1eb5e0 100644
---- a/man/bash-completion/Makefile.am
-+++ b/man/bash-completion/Makefile.am
-@@ -17,28 +17,27 @@ BASH_COMPLETION_SCRIPTLETS = \
- bashcompletion_DATA = $(BASH_COMPLETION_SCRIPTLETS)
- CLEANFILES = $(BASH_COMPLETION_SCRIPTLETS)
- 
--MANDIR = $(top_srcdir)/man
--DOCGEN = $(MANDIR)/docgen
--DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@"
-+DOCGEN = $(top_srcdir)/man/docgen
-+DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@" -z "@PACKAGE_SHORTNAME@"
- 
- @PROGRAM_PREFIX@doom: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
- 	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
--                  -g doom -b $(MANDIR)/doom.template \
-+                  -g doom -b doom.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/doom > $@
- 
- @PROGRAM_PREFIX@heretic: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
- 	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
--                  -g heretic -b $(MANDIR)/heretic.template \
-+                  -g heretic -b heretic.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/heretic > $@
- 
- @PROGRAM_PREFIX@hexen: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
- 	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
--                  -g hexen -b $(MANDIR)/hexen.template \
-+                  -g hexen -b hexen.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/hexen > $@
- 
- @PROGRAM_PREFIX@strife: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
- 	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
--                  -g strife -b $(MANDIR)/strife.template \
-+                  -g strife -b strife.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/strife > $@
- 
- EXTRA_DIST = \
--- 
-2.17.1
-
diff --git a/PKGBUILD b/PKGBUILD
index f019f820a0e8..71b0b0baf7c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=crispy-doom
 pkgdesc="Vanilla-compatible enhanced Doom engine"
-pkgver=5.1
-pkgrel=2
+pkgver=5.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://fabiangreffrath.github.io/crispy-doom"
 license=('GPL2')
@@ -13,10 +13,8 @@ optdepends=('freedm: Free deathmatch game'
             'freedoom1: Free Ultimate Doom-compatible game'
             'freedoom2: Free Doom II/Final Doom-compatible game')
 install=crispy-doom.install
-source=(https://github.com/fabiangreffrath/$pkgname/archive/$pkgname-$pkgver.tar.gz
-        0001-bash-completion-Build-from-actual-shell-script-templ.patch)
-sha512sums=('7b0a78e6521781f46997b3a9d0fb4bcdbae249bab1d2c926e3e48087dfc7f6963ae99291b0294e7555f96c3ddc6412d592a9020f20694d200f1ef7c3a8432a66'
-            '88521a56d4075942e0219ce435d6c4e0a1f0ce4e5160730c33129b849230250c5fd7554b39d4838e5dd5aeedaf927e5b275642b795befd257dc799ff48870e1b')
+source=(https://github.com/fabiangreffrath/$pkgname/archive/$pkgname-$pkgver.tar.gz)
+sha512sums=('2ef03adaa04489dc1c3b335847e1fc23067a0d08b13637e9e79ae50d4116a6959c4312eee5f05601d830bd44a2104d39d659975499279292c65c677b4616e5d3')
 
 prepare() {
   # GitHub's generated archive prefix kind of sucks.