Update eternity-engine to 3.40.46

3 files changed, 10 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56a2a218f8f2..ea395cb3fef4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
 pkgbase = eternity-engine
 	pkgdesc = An advanced Doom port with vanilla compatibility
-	pkgver = 3.40.37
-	pkgrel = 3
+	pkgver = 3.40.46
+	pkgrel = 1
 	url = http://eternity.youfailit.net/
 	install = eternity-engine.install
 	arch = i686
 	arch = x86_64
-	license = GPL
+	license = GPL3
 	makedepends = cmake
 	depends = sdl
 	depends = sdl_mixer
 	depends = sdl_net
 	depends = zlib
-	source = 0001-findiwads_dir.patch
-	source = http://eternity.mancubus.net/ee-3.40.37-src.zip
-	sha256sums = 2903dd82de5846ceaf7644fc48014a0e99bcd4615480d06e717a5e3f091d98dc
-	sha256sums = b8eede10b320f20625a6a7edb725a7bade12cb320371cfd2f0dfb28f5eb8d385
+	source = http://eternity.mancubus.net/ee-3.40.46-src.zip
+	sha256sums = 27c49450fb814c4d9c81e5f2895cbd825f9c7a9f3d024e824ed6feb70ef6965c
 
 pkgname = eternity-engine
 
diff --git a/0001-findiwads_dir.patch b/0001-findiwads_dir.patch
deleted file mode 100644
index 7e6f85ede55d..000000000000
--- a/0001-findiwads_dir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: source/d_findiwads.cpp
-===================================================================
---- source/d_findiwads.cpp	(revision 2592)
-+++ source/d_findiwads.cpp	(revision 2593)
-@@ -425,6 +425,7 @@
-    // Default Linux locations

-    paths.addNew() = "/usr/local/share/games/doom";

-    paths.addNew() = "/usr/share/games/doom";

-+   paths.addNew() = "/usr/share/doom";

- #endif

- 

-    // add base/game paths

diff --git a/PKGBUILD b/PKGBUILD
index 6a745a5ac29b..79323f108b1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,17 @@
 # Description from DavidPH's experimental PKGBUILD
 
 pkgname=eternity-engine
-pkgver=3.40.37
-pkgrel=3
+pkgver=3.40.46
+pkgrel=1
 pkgdesc="An advanced Doom port with vanilla compatibility"
 url="http://eternity.youfailit.net/"
 arch=('i686' 'x86_64')
-license=('GPL')
+license=('GPL3')
 depends=('sdl' 'sdl_mixer' 'sdl_net' 'zlib')
 makedepends=('cmake')
 install=eternity-engine.install
-source=(0001-findiwads_dir.patch
-        http://eternity.mancubus.net/ee-$pkgver-src.zip)
-sha256sums=('2903dd82de5846ceaf7644fc48014a0e99bcd4615480d06e717a5e3f091d98dc'
-            'b8eede10b320f20625a6a7edb725a7bade12cb320371cfd2f0dfb28f5eb8d385')
-
-prepare() {
-  cd $startdir/src/ee-$pkgver-src
-  patch -p0 -i ../0001-findiwads_dir.patch
-}
+source=(http://eternity.mancubus.net/ee-$pkgver-src.zip)
+sha256sums=('27c49450fb814c4d9c81e5f2895cbd825f9c7a9f3d024e824ed6feb70ef6965c')
 
 build() {
   # Cannot do in-tree build.