dwarffortress-ironhand-0.43.04-1

2 files changed, 46 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b652e93e5f9..ee1b2c792c97 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Apr 18 08:26:31 UTC 2016
+# Tue Jun 28 08:12:27 UTC 2016
 pkgbase = dwarffortress-ironhand
-	pkgdesc = A single-player fantasy game. You control a dwarven outpost or an adventurer in a randomly generated persistent world.
-	pkgver = 0.42.06
+	pkgdesc = A single-player fantasy game in which you build a dwarven outpost or play an adventurer in a randomly generated world
+	pkgver = 0.43.04
 	pkgrel = 1
 	url = http://www.bay12games.com/dwarves/
 	install = dwarffortress.install
@@ -11,30 +11,43 @@ pkgbase = dwarffortress-ironhand
 	license = custom:dwarffortress
 	makedepends = git
 	makedepends = cmake
-	depends = gtk2
-	depends = glu
-	depends = sdl_image
-	depends = libsndfile
-	depends = openal
-	depends = sdl_ttf
-	depends = glew
-	depends = gcc-libs
 	options = !strip
 	options = !buildflags
-	source = http://www.bay12games.com/dwarves/df_42_06_linux.tar.bz2
-	source = git://github.com/svenstaro/dwarf_fortress_unfuck.git#tag=0.42.06
-	source = https://github.com/svenstaro/dwarf_fortress_unfuck/commit/3d409680597679998560c6c9fd4ad45b58e27872.patch
+	source = http://www.bay12games.com/dwarves/df_43_04_linux.tar.bz2
+	source = git://github.com/svenstaro/dwarf_fortress_unfuck.git#tag=0.43.04
 	source = dwarffortress
 	source = dwarffortress.desktop
-	source = http://dffd.bay12games.com/download.php?id=11348&f=Ironhand_42_06B.zip
+	source = http://dffd.bay12games.com/download.php?id=11348&f=Ironhand_43_04A.zip
 	source = dwarffortress.png
-	sha256sums = 03df8e73bf81e4f7bec9e789a83f8bd20b0b968d73131e4051e005db13fec99f
+	sha256sums = 4e56262938f3118d9928069c3624b34cdb2b202da6ce9eea08ed6ebdeccd00eb
 	sha256sums = SKIP
-	sha256sums = 303660f11968bc8a8cb61c91e08334d0e1bc42b58e08759b7edb3b0b9cb08811
 	sha256sums = 7dc1f0ed0d496b21f4f240334f77dc43b728823f3e1c4ea25ce768691346ec07
 	sha256sums = 0c279596f88b5fca4e0676627bfc6739b5da9416cc099abf5865ee6c0fd13435
-	sha256sums = 47e2ebbdaf1f1bb78185609512f4fbba3bd190682a2029195cbf675e25a25391
+	sha256sums = fdfbcd67ae4f58a444c025b35bf6a3c772f0e7a3c1cae22681798a37491b74af
 	sha256sums = 83183abc70b11944720b0d86f4efd07468f786b03fa52fe429ca8e371f708e0f
+	depends_i686 = gtk2
+	depends_i686 = glu
+	depends_i686 = sdl_image
+	depends_i686 = libsndfile
+	depends_i686 = openal
+	depends_i686 = sdl_ttf
+	depends_i686 = glew
+	depends_i686 = gcc-libs
+	depends_x86_64 = lib32-gcc-libs
+	depends_x86_64 = lib32-gtk2
+	depends_x86_64 = lib32-glu
+	depends_x86_64 = lib32-sdl_image
+	depends_x86_64 = lib32-libsndfile
+	depends_x86_64 = lib32-openal
+	depends_x86_64 = lib32-libxdamage
+	depends_x86_64 = lib32-ncurses
+	depends_x86_64 = lib32-sdl_ttf
+	depends_x86_64 = lib32-glew
+	optdepends_x86_64 = lib32-nvidia-utils: If you have nvidia graphics
+	optdepends_x86_64 = lib32-catalyst-utils: If you have ATI graphics
+	optdepends_x86_64 = lib32-alsa-lib: for alsa sound
+	optdepends_x86_64 = lib32-libpulse: for pulse sound
+	makedepends_x86_64 = gcc-multilib
 
 pkgname = dwarffortress-ironhand
 
diff --git a/PKGBUILD b/PKGBUILD
index f452478fefde..8c64f9d83597 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,40 @@
 # Maintainer: Christian Krause ("wookietreiber") <kizkizzbangbang@googlemail.com>
 
 pkgname=dwarffortress-ironhand
-pkgver=0.42.06
-_pkgver=42_06
+pkgver=0.43.04
+_pkgver=43_04
 pkgrel=1
-pkgdesc="A single-player fantasy game. You control a dwarven outpost or an adventurer in a randomly generated persistent world."
+pkgdesc="A single-player fantasy game in which you build a dwarven outpost or play an adventurer in a randomly generated world"
 arch=(i686 x86_64)
 url="http://www.bay12games.com/dwarves/"
 license=('custom:dwarffortress')
-depends=(gtk2 glu sdl_image libsndfile openal sdl_ttf glew gcc-libs)
+depends_i686=(gtk2 glu sdl_image libsndfile openal sdl_ttf glew gcc-libs)
+depends_x86_64=(lib32-gcc-libs lib32-gtk2 lib32-glu lib32-sdl_image lib32-libsndfile lib32-openal
+                lib32-libxdamage lib32-ncurses lib32-sdl_ttf lib32-glew)
 makedepends=(git cmake)
+makedepends_x86_64=(gcc-multilib)
+optdepends_x86_64=('lib32-nvidia-utils: If you have nvidia graphics'
+                   'lib32-catalyst-utils: If you have ATI graphics'
+                   'lib32-alsa-lib: for alsa sound'
+                   'lib32-libpulse: for pulse sound')
 options=('!strip' '!buildflags')
 install=dwarffortress.install
-if [[ $CARCH == 'x86_64' ]]; then
-  makedepends+=(gcc-multilib)
-  depends=(gcc-libs-multilib lib32-gtk2 lib32-glu lib32-sdl_image lib32-libsndfile lib32-openal
-           lib32-libxdamage lib32-ncurses lib32-sdl_ttf lib32-glew)
-  optdepends=('lib32-nvidia-utils: If you have nvidia graphics'
-              'lib32-catalyst-utils: If you have ATI graphics'
-              'lib32-alsa-lib: for alsa sound'
-              'lib32-libpulse: for pulse sound')
-fi
 # 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=(http://www.bay12games.com/dwarves/df_${_pkgver}_linux.tar.bz2
         git://github.com/svenstaro/dwarf_fortress_unfuck.git#tag=${pkgver}
-        https://github.com/svenstaro/dwarf_fortress_unfuck/commit/3d409680597679998560c6c9fd4ad45b58e27872.patch
         dwarffortress
         dwarffortress.desktop
-        'http://dffd.bay12games.com/download.php?id=11348&f=Ironhand_42_06B.zip'
+        "http://dffd.bay12games.com/download.php?id=11348&f=Ironhand_${_pkgver}A.zip"
         dwarffortress.png)
-sha256sums=('03df8e73bf81e4f7bec9e789a83f8bd20b0b968d73131e4051e005db13fec99f'
+
+sha256sums=('4e56262938f3118d9928069c3624b34cdb2b202da6ce9eea08ed6ebdeccd00eb'
             'SKIP'
-            '303660f11968bc8a8cb61c91e08334d0e1bc42b58e08759b7edb3b0b9cb08811'
             '7dc1f0ed0d496b21f4f240334f77dc43b728823f3e1c4ea25ce768691346ec07'
             '0c279596f88b5fca4e0676627bfc6739b5da9416cc099abf5865ee6c0fd13435'
-            '47e2ebbdaf1f1bb78185609512f4fbba3bd190682a2029195cbf675e25a25391'
+            'fdfbcd67ae4f58a444c025b35bf6a3c772f0e7a3c1cae22681798a37491b74af'
             '83183abc70b11944720b0d86f4efd07468f786b03fa52fe429ca8e371f708e0f')
 
-prepare() {
-  cd $srcdir/dwarf_fortress_unfuck
-
-  patch -Np1 -i $srcdir/3d409680597679998560c6c9fd4ad45b58e27872.patch
-}
-
 build() {
   cd $srcdir/dwarf_fortress_unfuck