[arch-commits] Commit in dwarffortress/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Tuesday, July 5, 2016 @ 23:25:54
  Author: svenstaro
Revision: 182359

upgpkg: dwarffortress 0.43.05-1

upstream release 0.43.05

Modified:
  dwarffortress/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-05 20:58:55 UTC (rev 182358)
+++ PKGBUILD	2016-07-05 23:25:54 UTC (rev 182359)
@@ -3,22 +3,19 @@
 # Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com>
 # Contributor: djnm <nmihalich [at} gmail dott com>
 pkgname=dwarffortress
-pkgver=0.43.04
-_pkgver=43_04
+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=${pkgname}.install
 # I made a fucking github repo with the sole purpose of unfucking df a bit
@@ -28,7 +25,7 @@
         dwarffortress
         dwarffortress.desktop
         dwarffortress.png)
-sha256sums=('4e56262938f3118d9928069c3624b34cdb2b202da6ce9eea08ed6ebdeccd00eb'
+sha256sums=('856c13170e8beefb5419ae71ee26c85db9716b3ebd4c7348aa44b896bd490be4'
             'SKIP'
             '211eaec6559d4fd5c08341dbed1f27bfab997a57bdf61fd268f9940e244652c5'
             'e79e3d945c6cc0da58f4ca30a210c7bf1bc3149fd10406d1262a6214eb40445a'
@@ -55,8 +52,7 @@
 
   # 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