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

[Sven-Hendrik Haase]

    Date: Monday, May 19, 2014 @ 04:56:13
  Author: svenstaro
Revision: 111462

upgpkg: 0ad a16-1

upstream release a16

Modified:
  0ad/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-19 02:23:16 UTC (rev 111461)
+++ PKGBUILD	2014-05-19 02:56:13 UTC (rev 111462)
@@ -12,7 +12,7 @@
 license=('GPL2' 'CCPL')
 depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
          'libxml2' 'openal' 'sdl' 'wxgtk2.8' 'zlib' 'libgl' '0ad-data' 'glu'
-         'gloox' 'miniupnpc' 'icu')
+         'gloox' 'miniupnpc' 'icu' 'nspr')
 makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm')
 source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
         "http://trac.wildfiregames.com/raw-attachment/ticket/2552/miniupnpc_api.patch")
@@ -22,6 +22,7 @@
 prepare() {
   cd "$srcdir/$pkgname-$_pkgver/"
   patch -p0 -i "../miniupnpc_api.patch"
+  sed -i "s/env python/env python2/g" libraries/source/cxxtest-4.3/bin/cxxtestgen
 }
 
 build() {
@@ -39,17 +40,17 @@
 
   cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
 
-  make CONFIG=Release
+  make
 }
 
 package() {
-  install -d "${pkgdir}"/usr/{bin,lib/0ad,share/"${pkgname}"/data/l10n}
+  install -d "${pkgdir}"/usr/{bin,lib/0ad,share/"${pkgname}"/data}
   cd "$srcdir/$pkgname-$_pkgver"
 
   install -Dm755 binaries/system/pyrogenesis "${pkgdir}/usr/bin"
   install -Dm755 binaries/system/*.so "${pkgdir}/usr/lib/0ad"
 
-  cp -r binaries/data/l10n/ ${pkgdir}/usr/share/${pkgname}/data/l10n
+  cp -r binaries/data/l10n/ ${pkgdir}/usr/share/${pkgname}/data/
 
   install -Dm755 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
   install -Dm644 build/resources/${pkgname}.desktop \
@@ -57,3 +58,9 @@
   install -Dm644 build/resources/${pkgname}.png \
     "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
 }
+
+# Fails?
+#check() {
+#  cd "$srcdir/$pkgname-$_pkgver"
+#  LD_LIBRARY_PATH=binaries/system binaries/system/test
+#}