0.47.04

2 files changed, 30 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b789be815d75..e90129464672 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 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
-	pkgver = 0.44.12
+	pkgver = 0.47.04
 	pkgrel = 1
 	url = http://www.bay12games.com/dwarves/
 	install = dwarffortress.install
@@ -21,25 +21,25 @@ pkgbase = dwarffortress-ironhand
 	optdepends = nvidia-utils: If you have nvidia graphics
 	optdepends = alsa-lib: for alsa sound
 	optdepends = libpulse: for pulse sound
-	provides = dwarffortress=0.44.12
+	provides = dwarffortress=0.47.04
 	conflicts = dwarffortress
 	conflicts = dwarffortress-obsidian
 	options = !strip
 	options = !buildflags
-	source = dwarffortress-unfuck-0.44.12.tar.gz::https://github.com/svenstaro/dwarf_fortress_unfuck/archive/0.44.12.tar.gz
+	source = dwarffortress-unfuck-0.47.04.zip::https://github.com/svenstaro/dwarf_fortress_unfuck/archive/0.47.04.zip
 	source = dwarffortress
 	source = dwarffortress.desktop
-	source = Ironhand_44_12A.zip::http://dffd.bay12games.com/download.php?id=13283&f=Ironhand_44_12A.zip
+	source = Ironhand_47_04.zip::http://dffd.bay12games.com/download.php?id=14804&f=Ironhand_47_04.zip
 	source = dwarffortress.png
-	sha256sums = 2d509739df22277dec9c0dc3f7fa9351c9844c7a2027b143e22ceb2b48c7e301
+	sha256sums = a337437ab917a12e5fb3c8f65720e3f5f6e742900db5754bdc517ad95befdc8b
 	sha256sums = 211eaec6559d4fd5c08341dbed1f27bfab997a57bdf61fd268f9940e244652c5
 	sha256sums = e79e3d945c6cc0da58f4ca30a210c7bf1bc3149fd10406d1262a6214eb40445a
-	sha256sums = 4be4188e87188f43e55d030a833cf28aacde17e5d9d66461c9e8ab5bc3dfe17a
+	sha256sums = 15a756a76ae49bf92d685c75ac8757d0d3af628878be9df371da8f3443e922f1
 	sha256sums = 83183abc70b11944720b0d86f4efd07468f786b03fa52fe429ca8e371f708e0f
-	source_x86_64 = http://www.bay12games.com/dwarves/df_44_12_linux.tar.bz2
-	sha256sums_x86_64 = 5a2d15730d21b41a68da09ce3c3b70c3e2a6fd15b95c6cbfb68578ed2d2db979
-	source_i686 = http://www.bay12games.com/dwarves/df_44_12_linux32.tar.bz2
-	sha256sums_i686 = 06642ed3ee50992a9b2a6a1bd9fb61b9d2e4e72bd6dd05b40870d5a96343b93a
+	source_x86_64 = http://www.bay12games.com/dwarves/df_47_04_linux.tar.bz2
+	sha256sums_x86_64 = 1de5872bf3ac32906a0082129ec88d6879b6ac7059a3513607d628090b1328e6
+	source_i686 = http://www.bay12games.com/dwarves/df_47_04_linux32.tar.bz2
+	sha256sums_i686 = c8feb78b01f1bc0269a8af26766711a3e1a2808c42d07d5a097de972e843df03
 
 pkgname = dwarffortress-ironhand
 
diff --git a/PKGBUILD b/PKGBUILD
index b73802fccc3b..77338b4005ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,9 @@
 
 pkgname=dwarffortress-ironhand
 _pkgname=dwarffortress
-pkgver=0.44.12
-_pkgver=44_12
-_fuckcommit=c39fecafa9d15670cfcf7e3b1a09cae45842a2fb
+_pkgver=47_04
+pkgver="0.${_pkgver/_/.}"
 pkgrel=1
-_tilesetver=44.11
 pkgdesc="A single-player fantasy game in which you build a dwarven outpost or play an adventurer in a randomly generated world"
 arch=('x86_64' 'i686')
 url="http://www.bay12games.com/dwarves/"
@@ -17,36 +15,35 @@ license=('custom:dwarffortress')
 depends=(gtk2 glu sdl_image libsndfile openal sdl_ttf glew gcc-libs glib2)
 makedepends=(git cmake)
 optdepends=('nvidia-utils: If you have nvidia graphics'
-            'alsa-lib: for alsa sound'
-            'libpulse: for pulse sound')
+  'alsa-lib: for alsa sound'
+  'libpulse: for pulse sound')
 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/$_fuckcommit.zip"
-        dwarffortress
-        dwarffortress.desktop
-        "Ironhand_44_12A.zip::http://dffd.bay12games.com/download.php?id=13283&f=Ironhand_44_12A.zip"
-        dwarffortress.png)
+source=("dwarffortress-unfuck-$pkgver.zip::https://github.com/svenstaro/dwarf_fortress_unfuck/archive/$pkgver.zip"
+  dwarffortress
+  dwarffortress.desktop
+  "Ironhand_$_pkgver.zip::http://dffd.bay12games.com/download.php?id=14804&f=Ironhand_$_pkgver.zip"
+  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=('347d06b2d3a9f7d4a83d7081d81f69fdf2e94f2611e561c29490cf026aae5cc6'
-            '211eaec6559d4fd5c08341dbed1f27bfab997a57bdf61fd268f9940e244652c5'
-            'e79e3d945c6cc0da58f4ca30a210c7bf1bc3149fd10406d1262a6214eb40445a'
-            '4be4188e87188f43e55d030a833cf28aacde17e5d9d66461c9e8ab5bc3dfe17a'
-            '83183abc70b11944720b0d86f4efd07468f786b03fa52fe429ca8e371f708e0f')
-sha256sums_x86_64=('5a2d15730d21b41a68da09ce3c3b70c3e2a6fd15b95c6cbfb68578ed2d2db979')
-sha256sums_i686=('06642ed3ee50992a9b2a6a1bd9fb61b9d2e4e72bd6dd05b40870d5a96343b93a')
+sha256sums=('a337437ab917a12e5fb3c8f65720e3f5f6e742900db5754bdc517ad95befdc8b'
+  '211eaec6559d4fd5c08341dbed1f27bfab997a57bdf61fd268f9940e244652c5'
+  'e79e3d945c6cc0da58f4ca30a210c7bf1bc3149fd10406d1262a6214eb40445a'
+  '15a756a76ae49bf92d685c75ac8757d0d3af628878be9df371da8f3443e922f1'
+  '83183abc70b11944720b0d86f4efd07468f786b03fa52fe429ca8e371f708e0f')
+sha256sums_x86_64=('1de5872bf3ac32906a0082129ec88d6879b6ac7059a3513607d628090b1328e6')
+sha256sums_i686=('c8feb78b01f1bc0269a8af26766711a3e1a2808c42d07d5a097de972e843df03')
 
 conflicts=(dwarffortress dwarffortress-obsidian)
 provides=("dwarffortress=$pkgver")
 
 build() {
   # shellcheck disable=2154
-  # cd "$srcdir"/dwarf_fortress_unfuck-"$pkgver" || exit
-  cd "$srcdir"/dwarf_fortress_unfuck-"$_fuckcommit" || exit
+  cd "$srcdir"/dwarf_fortress_unfuck-"$pkgver" || exit
   cmake .
   make
 }
@@ -57,14 +54,14 @@ package() {
   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"
+  # 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 {} +
 
   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-"$_fuckcommit"/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"
 
   # No idea why we need this. Really. This isn't being loaded dynamically, it's not linked and
@@ -76,7 +73,7 @@ package() {
 
   # 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"/dwarffortress.png "$pkgdir"/usr/share/pixmaps/"$_pkgname".png
   install -Dm644 "$srcdir"/df_linux/readme.txt "$pkgdir"/usr/share/licenses/"$pkgname"/readme.txt
 }