Fix Eternity Engine again.

3 files changed, 25 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec504b700fe6..56a2a218f8f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = eternity-engine
 	pkgdesc = An advanced Doom port with vanilla compatibility
 	pkgver = 3.40.37
-	pkgrel = 2
+	pkgrel = 3
 	url = http://eternity.youfailit.net/
 	install = eternity-engine.install
 	arch = i686
@@ -12,7 +12,9 @@ pkgbase = eternity-engine
 	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
 
 pkgname = eternity-engine
diff --git a/0001-findiwads_dir.patch b/0001-findiwads_dir.patch
new file mode 100644
index 000000000000..7e6f85ede55d
--- /dev/null
+++ b/0001-findiwads_dir.patch
@@ -0,0 +1,12 @@
+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 85f42a00702f..6a745a5ac29b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=eternity-engine
 pkgver=3.40.37
-pkgrel=2
+pkgrel=3
 pkgdesc="An advanced Doom port with vanilla compatibility"
 url="http://eternity.youfailit.net/"
 arch=('i686' 'x86_64')
@@ -12,8 +12,15 @@ license=('GPL')
 depends=('sdl' 'sdl_mixer' 'sdl_net' 'zlib')
 makedepends=('cmake')
 install=eternity-engine.install
-source=(http://eternity.mancubus.net/ee-$pkgver-src.zip)
-sha256sums=('b8eede10b320f20625a6a7edb725a7bade12cb320371cfd2f0dfb28f5eb8d385')
+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
+}
 
 build() {
   # Cannot do in-tree build.
@@ -21,7 +28,6 @@ build() {
   cd $startdir/src/ee-build
   cmake ../ee-$pkgver-src -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
   make || return 1
-  make
 }
 
 package() {