dwarffortress-ironhand-0.43.05-1

5 files changed, 61 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ee1b2c792c97..735fd195ada9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Jun 28 08:12:27 UTC 2016
+# Fri Jul  8 06:17:51 UTC 2016
 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.43.04
+	pkgver = 0.43.05
 	pkgrel = 1
 	url = http://www.bay12games.com/dwarves/
 	install = dwarffortress.install
@@ -11,43 +11,36 @@ 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
+	depends = glib2
+	optdepends = nvidia-utils: If you have nvidia graphics
+	optdepends = catalyst-utils: If you have ATI graphics
+	optdepends = alsa-lib: for alsa sound
+	optdepends = libpulse: for pulse sound
+	provides = dwarffortress=0.43.05
+	conflicts = dwarffortress
+	conflicts = dwarffortress-obsidian
 	options = !strip
 	options = !buildflags
-	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 = http://www.bay12games.com/dwarves/df_43_05_linux.tar.bz2
+	source = git://github.com/svenstaro/dwarf_fortress_unfuck.git#tag=0.43.05
 	source = dwarffortress
 	source = dwarffortress.desktop
-	source = http://dffd.bay12games.com/download.php?id=11348&f=Ironhand_43_04A.zip
+	source = Ironhand_43_05A.zip::http://dffd.bay12games.com/download.php?id=11349&f=Ironhand_43_05A.zip
 	source = dwarffortress.png
-	sha256sums = 4e56262938f3118d9928069c3624b34cdb2b202da6ce9eea08ed6ebdeccd00eb
+	sha256sums = 856c13170e8beefb5419ae71ee26c85db9716b3ebd4c7348aa44b896bd490be4
 	sha256sums = SKIP
-	sha256sums = 7dc1f0ed0d496b21f4f240334f77dc43b728823f3e1c4ea25ce768691346ec07
-	sha256sums = 0c279596f88b5fca4e0676627bfc6739b5da9416cc099abf5865ee6c0fd13435
-	sha256sums = fdfbcd67ae4f58a444c025b35bf6a3c772f0e7a3c1cae22681798a37491b74af
+	sha256sums = 211eaec6559d4fd5c08341dbed1f27bfab997a57bdf61fd268f9940e244652c5
+	sha256sums = e79e3d945c6cc0da58f4ca30a210c7bf1bc3149fd10406d1262a6214eb40445a
+	sha256sums = 442c02fc034c8cb6eb648e5688068bbf237b325c63e5f84249ed3d02db985ac9
 	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 8c64f9d83597..fe368b288cd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,40 @@
 # Maintainer: Christian Krause ("wookietreiber") <kizkizzbangbang@googlemail.com>
 
 pkgname=dwarffortress-ironhand
-pkgver=0.43.04
-_pkgver=43_04
+_pkgname=dwarffortress
+pkgver=0.43.05
+_pkgver=43_05
 pkgrel=1
 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_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)
+depends=(gtk2 glu sdl_image libsndfile openal sdl_ttf glew gcc-libs glib2)
 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')
+optdepends=('nvidia-utils: If you have nvidia graphics'
+            'catalyst-utils: If you have ATI graphics'
+            'alsa-lib: for alsa sound'
+            'libpulse: for pulse sound')
 options=('!strip' '!buildflags')
-install=dwarffortress.install
+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=(http://www.bay12games.com/dwarves/df_${_pkgver}_linux.tar.bz2
         git://github.com/svenstaro/dwarf_fortress_unfuck.git#tag=${pkgver}
         dwarffortress
         dwarffortress.desktop
-        "http://dffd.bay12games.com/download.php?id=11348&f=Ironhand_${_pkgver}A.zip"
+        "Ironhand_${_pkgver}A.zip::http://dffd.bay12games.com/download.php?id=11349&f=Ironhand_43_05A.zip"
         dwarffortress.png)
-
-sha256sums=('4e56262938f3118d9928069c3624b34cdb2b202da6ce9eea08ed6ebdeccd00eb'
+sha256sums=('856c13170e8beefb5419ae71ee26c85db9716b3ebd4c7348aa44b896bd490be4'
             'SKIP'
-            '7dc1f0ed0d496b21f4f240334f77dc43b728823f3e1c4ea25ce768691346ec07'
-            '0c279596f88b5fca4e0676627bfc6739b5da9416cc099abf5865ee6c0fd13435'
-            'fdfbcd67ae4f58a444c025b35bf6a3c772f0e7a3c1cae22681798a37491b74af'
+            '211eaec6559d4fd5c08341dbed1f27bfab997a57bdf61fd268f9940e244652c5'
+            'e79e3d945c6cc0da58f4ca30a210c7bf1bc3149fd10406d1262a6214eb40445a'
+            '442c02fc034c8cb6eb648e5688068bbf237b325c63e5f84249ed3d02db985ac9'
             '83183abc70b11944720b0d86f4efd07468f786b03fa52fe429ca8e371f708e0f')
 
+conflicts=(dwarffortress dwarffortress-obsidian)
+provides=(dwarffortress=$pkgver)
+
 build() {
   cd $srcdir/dwarf_fortress_unfuck
 
@@ -44,29 +44,28 @@ build() {
 
 package() {
   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/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 {} +
+  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/libgraphics.so $pkgdir/opt/$pkgname/libs/libgraphics.so
-  install -Dm755 $srcdir/dwarffortress $pkgdir/usr/bin/$pkgname
+  install -Dm755 $srcdir/df_linux/libs/Dwarf_Fortress $pkgdir/opt/$_pkgname/libs/Dwarf_Fortress
+  install -Dm755 $srcdir/dwarf_fortress_unfuck/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
   # in general there is no indication this is being used. However, it doesn't work without this symlink.
-  [[ $CARCH == "x86_64" ]] && ln -s /usr/lib32/libpng.so $pkgdir/opt/$pkgname/libs/libpng.so.3
-  [[ $CARCH == "i686" ]] && ln -s /usr/lib/libpng.so $pkgdir/opt/$pkgname/libs/libpng.so.3
+  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
+  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/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
 }
diff --git a/dwarffortress b/dwarffortress
index 176e1b3a9f66..381ce6bcbcc9 100644
--- a/dwarffortress
+++ b/dwarffortress
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/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.
 
diff --git a/dwarffortress.desktop b/dwarffortress.desktop
index fc2115788410..79559907bc9c 100644
--- a/dwarffortress.desktop
+++ b/dwarffortress.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=Dwarf Fortress Ironhand
-GenericName=Dwarf Fortress Ironhand
+Name=Dwarf Fortress
+GenericName=Dwarf Fortress
 Comment=A single-player fantasy game.
-Exec=dwarffortress-ironhand
-Icon=/usr/share/pixmaps/dwarffortress-ironhand.png
+Exec=dwarffortress
+Icon=/usr/share/pixmaps/dwarffortress.png
 Terminal=false
 Type=Application
-Categories=Game;
+Categories=Game;
\ No newline at end of file
diff --git a/dwarffortress.install b/dwarffortress.install
index 299e76d383c1..c22d3851f14e 100644
--- a/dwarffortress.install
+++ b/dwarffortress.install
@@ -1,6 +1,7 @@
 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() {