Fixed preloading libs which made it crash

3 files changed, 4 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5217540142dc..2caafc630046 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,7 +18,7 @@ pkgbase = dwarffortress-phoebus
 	source = LICENSE
 	md5sums = 599f9fdd71a57048ead9fadb091d5061
 	md5sums = 5b8ee45e906d021c053f816e443c2983
-	md5sums = 5766ed7195876418b497d912d2f1512a
+	md5sums = 915f9b8efc7e2ea9e233bc6a9606038e
 	md5sums = eddfb4bd478f9c64e6801bda7c7791ba
 
 pkgname = dwarffortress-phoebus
diff --git a/PKGBUILD b/PKGBUILD
index cc16cd67f8fc..b38175e3985c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,7 @@ source=('https://github.com/washlet/Phoebus/releases/download/43.05d/Phoebus_0.4
 
 md5sums=('599f9fdd71a57048ead9fadb091d5061'
          '5b8ee45e906d021c053f816e443c2983'
-         '5766ed7195876418b497d912d2f1512a'
+	 '915f9b8efc7e2ea9e233bc6a9606038e'
          'eddfb4bd478f9c64e6801bda7c7791ba')
 
 prepare() {
@@ -35,7 +35,7 @@ prepare() {
 	mv "$srcdir"/raw/objects/* "$srcdir"/df_linux/raw/objects/
 
 	cp -a --no-preserve=ownership "$srcdir"/data/art/* "$srcdir"/df_linux/data/art/
-	cp -a --no-preserve=ownership "$srcdir"/data/init/phoebus/* "$srcdir"/df_linux/data/init/
+	cp -a --no-preserve=ownership "$srcdir"/data/init/* "$srcdir"/df_linux/data/init/
 
 	chmod -R a+rx "$srcdir"/df_linux/libs/Dwarf_Fortress
 	chmod -R a+rx "$srcdir"/df_linux/data/*
@@ -45,7 +45,6 @@ prepare() {
 	chmod a+rx "$srcdir"/df_linux/*
 	chmod a+r "$srcdir"/df_linux/sdl/sdl\ license.txt
 }
-
 package() {
 
 	install -d "$pkgdir"/usr/lib32/"$pkgname"
@@ -60,4 +59,3 @@ package() {
 	chmod a+rw "$pkgdir"/usr/lib32/"$pkgname"/data/save/current # save dir is worldwrite
 	chmod a+w "$pkgdir"/usr/lib32/"$pkgname"/data/index # crashes otherwise
 }
-
diff --git a/dwarf-fortress b/dwarf-fortress
index e6e2fa21b1cf..638fbda2525f 100644
--- a/dwarf-fortress
+++ b/dwarf-fortress
@@ -2,5 +2,5 @@
 cd /usr/lib32/dwarffortress-phoebus
 export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch.
 #export SDL_VIDEO_CENTERED=1 # Centre the screen.  Messes up resizing.
-LD_PRELOAD="/usr/lib32/libz.so.1 /usr/lib32/dwarffortress-phoebus/libgraphics.so /usr/lib32/libgcc_s.so.1 /usr/lib32/libstdc++.so.6" \
+#LD_PRELOAD="/usr/lib32/libz.so.1 /usr/lib32/dwarffortress-phoebus/libgraphics.so /usr/lib32/libgcc_s.so.1 /usr/lib32/libstdc++.so.6" \
 /usr/lib32/dwarffortress-phoebus/libs/Dwarf_Fortress $* # Go, go, go! :)