put the tileset back in (?) and fix wayland

also cleaned up the PKGBUILD quite a bit

5 files changed, 72 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bfbba69e0590..6f452d0c9a41 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = dwarffortress-ironhand
-	pkgdesc = A single-player fantasy game in which you build a dwarven outpost or play an adventurer in a randomly generated world
+	pkgdesc = Build a fortress and try to help your dwarves survive against a deeply generated world.
 	pkgver = 0.47.05
 	pkgrel = 2
 	url = http://www.bay12games.com/dwarves/
@@ -24,18 +24,16 @@ pkgbase = dwarffortress-ironhand
 	optdepends = nvidia-utils: If you have nvidia graphics
 	provides = dwarffortress=0.47.05
 	conflicts = dwarffortress
-	conflicts = dwarffortress-obsidian
-	options = !strip
 	options = !buildflags
-	source = dwarffortress-unfuck-0.47.05.zip::https://github.com/svenstaro/dwarf_fortress_unfuck/archive/0.47.05.zip
+	source = https://github.com/svenstaro/dwarf_fortress_unfuck/archive/0.47.05.zip
+	source = https://github.com/DFgraphics/Ironhand/archive/refs/tags/47.05.zip
 	source = dwarffortress
 	source = dwarffortress.desktop
-	source = Ironhand_47_05.zip::http://dffd.bay12games.com/download.php?id=14804&f=Ironhand_47_05.zip
 	source = dwarffortress.png
 	sha256sums = 1b80b0f76ed2268957b16f4046fa665f0a194d96932fd8d285da829e5a585c25
-	sha256sums = 211eaec6559d4fd5c08341dbed1f27bfab997a57bdf61fd268f9940e244652c5
-	sha256sums = e79e3d945c6cc0da58f4ca30a210c7bf1bc3149fd10406d1262a6214eb40445a
-	sha256sums = b9123465079c14101fa82d40dceec3fd11e5d8527f4af6ae65c1fc7907727414
+	sha256sums = 81ed0703fb93e76b1dd56a40e85bf781e104f1c23fbc66770871cd36e7183a00
+	sha256sums = fb86b0130b7839d7015709da78a236a743a5dbfe41ed8414b53c77e6cdc3da45
+	sha256sums = febeac567c649224aae1614802a3f904e57ce93a014694c6179c98dbfb52c4ca
 	sha256sums = 83183abc70b11944720b0d86f4efd07468f786b03fa52fe429ca8e371f708e0f
 	source_x86_64 = http://www.bay12games.com/dwarves/df_47_05_linux.tar.bz2
 	sha256sums_x86_64 = ac74a6dbb7d7d9621f430405080322ab50c35f6632352ff2ea923f6dc5affca3
diff --git a/PKGBUILD b/PKGBUILD
index d65b761cd95c..ff3366f582cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,12 @@
 # Maintainer: Christian Krause ("wookietreiber") <christian.krause@mailbox.org>
 # Contributor: Nathaniel Stickney <nstickney@gmail.com>
 # shellcheck disable=2034
-# shellcheck disable=2148
 
-pkgname=dwarffortress-ironhand
-_pkgname=dwarffortress
 _pkgver=47_05
+pkgname=dwarffortress-ironhand
 pkgver="0.${_pkgver/_/.}"
 pkgrel=2
-pkgdesc="A single-player fantasy game in which you build a dwarven outpost or play an adventurer in a randomly generated world"
+pkgdesc="Build a fortress and try to help your dwarves survive against a deeply generated world."
 arch=('x86_64' 'i686')
 url="http://www.bay12games.com/dwarves/"
 license=('custom:dwarffortress')
@@ -19,66 +17,63 @@ optdepends=(
   'libpulse: for pulse sound'
   'nvidia-utils: If you have nvidia graphics'
 )
-options=('!strip' '!buildflags')
-install=${_pkgname}.install
-# I made a fucking github repo with the sole purpose of unfucking df a bit
-# We try to compile whatever little bit of df is open source
-#source=("dwarffortress-unfuck-$pkgver.tar.gz::https://github.com/svenstaro/dwarf_fortress_unfuck/archive/$pkgver.tar.gz"
-source=("dwarffortress-unfuck-$pkgver.zip::https://github.com/svenstaro/dwarf_fortress_unfuck/archive/$pkgver.zip"
+options=('!buildflags')
+install=dwarffortress.install
+conflicts=(dwarffortress)
+provides=("dwarffortress=$pkgver")
+
+source=(
+  "https://github.com/svenstaro/dwarf_fortress_unfuck/archive/$pkgver.zip"
+  "https://github.com/DFgraphics/Ironhand/archive/refs/tags/${_pkgver/_/.}.zip"
   dwarffortress
   dwarffortress.desktop
-  "Ironhand_$_pkgver.zip::http://dffd.bay12games.com/download.php?id=14804&f=Ironhand_$_pkgver.zip"
-  dwarffortress.png)
+  dwarffortress.png
+)
 source_x86_64=(http://www.bay12games.com/dwarves/df_"${_pkgver}"_linux.tar.bz2)
 source_i686=(http://www.bay12games.com/dwarves/df_"${_pkgver}"_linux32.tar.bz2)
-# sha256sums=('2d509739df22277dec9c0dc3f7fa9351c9844c7a2027b143e22ceb2b48c7e301'
+
 sha256sums=(
   '1b80b0f76ed2268957b16f4046fa665f0a194d96932fd8d285da829e5a585c25'
-  '211eaec6559d4fd5c08341dbed1f27bfab997a57bdf61fd268f9940e244652c5'
-  'e79e3d945c6cc0da58f4ca30a210c7bf1bc3149fd10406d1262a6214eb40445a'
-  'b9123465079c14101fa82d40dceec3fd11e5d8527f4af6ae65c1fc7907727414'
+  '81ed0703fb93e76b1dd56a40e85bf781e104f1c23fbc66770871cd36e7183a00'
+  'fb86b0130b7839d7015709da78a236a743a5dbfe41ed8414b53c77e6cdc3da45'
+  'febeac567c649224aae1614802a3f904e57ce93a014694c6179c98dbfb52c4ca'
   '83183abc70b11944720b0d86f4efd07468f786b03fa52fe429ca8e371f708e0f'
 )
 sha256sums_x86_64=('ac74a6dbb7d7d9621f430405080322ab50c35f6632352ff2ea923f6dc5affca3')
 sha256sums_i686=('542b29e4aae6ba71ae2e56e176c041ec0f6471e9c299db98695d4b0ddfd96ac9')
 
-conflicts=(dwarffortress dwarffortress-obsidian)
-provides=("dwarffortress=$pkgver")
+prepare() {
+  # install the tileset
+  cp -r "$srcdir"/Ironhand-"${pkgver#0.}"/* "$srcdir"/df_linux/
+
+  # http://www.bay12games.com/dwarves/mantisbt/view.php?id=9893
+  rm "$srcdir"/df_linux/libs/{libgcc_s.so.1,libstdc++.so.6}
+}
 
 build() {
-  # shellcheck disable=2154
   cd "$srcdir"/dwarf_fortress_unfuck-"$pkgver" || exit
   cmake .
   make
 }
 
 package() {
-  # shellcheck disable=2154
+  # install game files
   install -dm755 "$pkgdir"/opt/
-  cp -r "$srcdir"/df_linux "$pkgdir"/opt/"$_pkgname"
-  rm -r "$pkgdir"/opt/"$_pkgname"/df "$pkgdir"/opt/"$_pkgname"/libs/* "$pkgdir"/opt/"$_pkgname"/g_src
-
-  # cp -r "$srcdir/Dwarf Fortress"/* "$pkgdir"/opt/"$_pkgname"
-
-  find "$pkgdir"/opt/"$_pkgname" -type d -exec chmod 755 {} +
-  find "$pkgdir"/opt/"$_pkgname" -type f -exec chmod 644 {} +
+  cp -r "$srcdir"/df_linux "$pkgdir"/opt/dwarffortress
+  install -Dm644 "$srcdir"/dwarf_fortress_unfuck-"$pkgver"/libgraphics.so \
+    "$pkgdir"/opt/dwarffortress/libs/libgraphics.so
 
-  install -Dm755 "$srcdir"/df_linux/libs/Dwarf_Fortress "$pkgdir"/opt/"$_pkgname"/libs/Dwarf_Fortress
-  # install -Dm755 "$srcdir"/dwarf_fortress_unfuck-"$pkgver"/libgraphics.so "$pkgdir"/opt/"$_pkgname"/libs/libgraphics.so
-  install -Dm755 "$srcdir"/dwarf_fortress_unfuck-"$pkgver"/libgraphics.so "$pkgdir"/opt/"$_pkgname"/libs/libgraphics.so
-  install -Dm755 "$srcdir"/dwarffortress "$pkgdir"/usr/bin/"$_pkgname"
+  # fix the permissions (just in case)
+  find "$pkgdir"/opt/dwarffortress -type d -exec chmod 755 {} +
+  find "$pkgdir"/opt/dwarffortress -type f -exec chmod 644 {} +
+  chmod 755 "$pkgdir"/opt/dwarffortress/libs/Dwarf_Fortress
 
-  # No idea why we need this. Really. This isn't being loaded dynamically, it's not linked and
-  # in general there is no indication this is being used. However, it doesn't work without this symlink.
-  ln -s /usr/lib/libpng.so "$pkgdir"/opt/"$_pkgname"/libs/libpng.so.3
-
-  # Set pkgname in runscript
-  sed -i "s/^pkgname=.*/pkgname=$_pkgname/" "$pkgdir"/usr/bin/"$_pkgname"
-
-  # Desktop launcher with icon
-  install -Dm644 "$srcdir"/dwarffortress.desktop "$pkgdir"/usr/share/applications/"$_pkgname".desktop
-  install -Dm644 "$srcdir"/dwarffortress.png "$pkgdir"/usr/share/pixmaps/"$_pkgname".png
-  install -Dm644 "$srcdir"/df_linux/readme.txt "$pkgdir"/usr/share/licenses/"$pkgname"/readme.txt
+  # install launcher script, .desktop, icon, and license
+  install -Dm755 "$srcdir"/dwarffortress "$pkgdir"/usr/bin/dwarffortress
+  install -Dm644 "$srcdir"/dwarffortress.desktop \
+    "$pkgdir"/usr/share/applications/dwarffortress.desktop
+  install -Dm644 "$srcdir"/dwarffortress.png \
+    "$pkgdir"/usr/share/pixmaps/dwarffortress.png
+  install -Dm644 "$srcdir"/df_linux/readme.txt \
+    "$pkgdir"/usr/share/licenses/"$pkgname"/readme.txt
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/dwarffortress b/dwarffortress
index 381ce6bcbcc9..dff2adcf2269 100644
--- a/dwarffortress
+++ b/dwarffortress
@@ -1,20 +1,21 @@
-#!/bin/bash
-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.
+#!/usr/bin/env bash
 
-pkgname=dwarffortress #To be set by PKGBUILD
+# Debian/Ubuntu patch bug
+export SDL_DISABLE_LOCK_KEYS=1
 
-if [[ ! -d "$HOME/.$pkgname" ]]; then
-    mkdir -p "$HOME/.$pkgname/data"
-    ln -s /opt/"$pkgname"/raw "$HOME/.$pkgname/raw"
-    ln -s /opt/"$pkgname"/libs "$HOME/.$pkgname/libs"
-    cp -rn /opt/"$pkgname"/data/init "$HOME/.$pkgname/data/init"
-fi
+# Force xwayland
+[ "$SDL_VIDEODRIVER" == wayland ] && export SDL_VIDEODRIVER=x11
 
-for link in announcement art dipscript help index initial_movies movies shader.fs shader.vs sound speech; do
-    cp -r /opt/"$pkgname"/data/$link "$HOME/.$pkgname/data/$link"
-done
+if [ ! -d "$HOME"/.dwarffortress ]; then
+    mkdir -p "$HOME"/.dwarffortress/data
+    ln -s /opt/dwarffortress/raw "$HOME"/.dwarffortress/raw
+    ln -s /opt/dwarffortress/libs "$HOME"/.dwarffortress/libs
+    cp -rn /opt/dwarffortress/data/init "$HOME"/.dwarffortress/data/init
+    for i in announcement art dipscript help index initial_movies movies \
+        shader.fs shader.vs sound speech; do
+        cp -r /opt/dwarffortress/data/"$i" "$HOME"/.dwarffortress/data/"$i"
+    done
+fi
 
-cd "$HOME/.$pkgname"
+cd "$HOME"/.dwarffortress || exit
 exec ./libs/Dwarf_Fortress "$@"
-
diff --git a/dwarffortress.desktop b/dwarffortress.desktop
index 79559907bc9c..dc06ae55b635 100644
--- a/dwarffortress.desktop
+++ b/dwarffortress.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=Dwarf Fortress
+Name=Dwarf Fortress (Ironhand tileset)
 GenericName=Dwarf Fortress
-Comment=A single-player fantasy game.
+Comment=Build a fortress and try to help your dwarves survive against a deeply generated world.
 Exec=dwarffortress
 Icon=/usr/share/pixmaps/dwarffortress.png
 Terminal=false
 Type=Application
-Categories=Game;
\ No newline at end of file
+Categories=Game;
diff --git a/dwarffortress.install b/dwarffortress.install
index c22d3851f14e..1798b71c6d28 100644
--- a/dwarffortress.install
+++ b/dwarffortress.install
@@ -1,9 +1,11 @@
-post_upgrade() {
-    echo "You might have delete your ~/.dwarffortress directory to get the new file layout."
-    echo "Of course, you can backup your saves."
-    echo "This might also be necessary if you have custom keybinds."
+post_install() {
+    cat <<EOF
+You might have delete your ~/.dwarffortress directory to get the new file
+layout. Of course, you can back up your saves. This might also be necessary if
+you have custom keybinds."
+EOF
 }
 
-post_install() {
-    post_upgrade
+post_upgrade() {
+    post_install
 }