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

[Felix Yan]

    Date: Wednesday, April 25, 2018 @ 07:36:51
  Author: felixonmars
Revision: 317811

upgpkg: hedgewars 0.9.24-1

Modified:
  hedgewars/trunk/PKGBUILD

----------+
 PKGBUILD |   62 ++++++++++++++++++++-----------------------------------------
 1 file changed, 21 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-25 07:29:26 UTC (rev 317810)
+++ PKGBUILD	2018-04-25 07:36:51 UTC (rev 317811)
@@ -1,60 +1,40 @@
 # $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 # Contributor: Tinxy <arch at tinx dot eu>
 
 pkgname=hedgewars
-pkgver=0.9.23
-pkgrel=11
+pkgver=0.9.24
+pkgrel=1
 pkgdesc="Turn-based strategy artillery game similiar to Worms"
 arch=('x86_64')
 url="https://hedgewars.org"
 license=('GPL' 'custom')
-depends=('qt4' 'sdl2' 'sdl2_mixer' 'sdl2_image' 'sdl2_net' 'sdl2_ttf'
-	 'lua51' 'ffmpeg' 'glut' 'physfs' 'ghc-libs'
-	 'haskell-entropy'
-	 'haskell-sha'
-	 'haskell-random'
-	 'haskell-regex-tdfa'
-	 'haskell-sandi'
-	 'haskell-hslogger'
-	 'haskell-utf8-string'
-	 'haskell-vector')
-makedepends=('fpc' 'cmake'
-	     # haskell specific
-	     'ghc'
-	     'haskell-network'
-	     'haskell-bytestring-show'
-	     'haskell-mtl'
-	     'haskell-stm'
-	     'haskell-zlib'
-	     'haskell-base-prelude'
-	     # for scaling the icon
-	     'imagemagick')
+depends=('qt5-base' 'sdl2' 'sdl2_mixer' 'sdl2_image' 'sdl2_net' 'sdl2_ttf' 'lua51' 'ffmpeg' 'glut'
+         'physfs' 'ghc-libs' 'haskell-entropy' 'haskell-sha' 'haskell-random' 'haskell-regex-tdfa'
+         'haskell-sandi' 'haskell-hslogger' 'haskell-utf8-string' 'haskell-vector')
+makedepends=('fpc' 'cmake' 'qt5-tools' 'ghc' 'haskell-network' 'haskell-bytestring-show'
+             'haskell-mtl' 'haskell-stm' 'haskell-zlib' 'haskell-base-prelude' 'imagemagick')
 source=("https://www.hedgewars.org/download/releases/hedgewars-src-$pkgver.tar.bz2"
-	"https://src.fedoraproject.org/rpms/hedgewars/raw/master/f/hedgewars-cmake-ghc8-mask.patch")
-sha256sums=('da2e4908042be56d1c0f3cb80a355bde7f0a49f675b050a03228cc3fb22aae89'
-            '3d2b115371b2584c598a158ad04f202b919391dba8f9bfda93972f7f97efbb7a')
+        "https://src.fedoraproject.org/rpms/hedgewars/raw/master/f/hedgewars-cmake-ghc8-mask.patch")
+sha512sums=('6f6d5e6b7b460b70ec7e20fd66e96d7ad82d2d8d90aa5e89522268c71b90016343e3edd8a3186314546044639e9623af6d0ee2df38395ea925e5588280db27b1'
+            '957e6cbe868924f0541cfa5a5e7e507caf798c94a1414911a8b8bc466bc4accb8fdd4d52cc298a5b88f83e93fd323cb2344db89df1be173bf6b0daf336b7b3ce')
 
 prepare() {
-  cd ${pkgname}-src-${pkgver}
-  sed -i 's|instance NFData (Chan a)$|instance NFData (Chan a) where rnf x = seq x ()|' gameServer/CoreTypes.hs
+  cd hedgewars-src-$pkgver
   sed -i 's|set(ghc_flags|set(ghc_flags -dynamic|' gameServer/CMakeLists.txt
-  sed -i 's|execute_process(COMMAND ${GHC_EXECUTABLE}|execute_process(COMMAND ${GHC_EXECUTABLE} -dynamic|' cmake_modules/CheckHaskellModuleExists.cmake
   # Fix GHC 8
-  patch -p1 -i ../hedgewars-cmake-ghc8-mask.patch
+  #patch -p1 -i ../hedgewars-cmake-ghc8-mask.patch
 }
 
 build() {
-  cd ${pkgname}-src-${pkgver}
-  mkdir -p "$srcdir"/bin
-  ln -sf /usr/bin/lrelease-qt4 "$srcdir"/bin/Qt4::lrelease
-  export PATH="$srcdir"/bin:${PATH}
+  cd hedgewars-src-$pkgver
   cmake \
-	-DCMAKE_BUILD_TYPE="Release" \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATA_INSTALL_DIR=/usr/share/hedgewars \
-	-DNOSERVER=0 \
-	.
+    -DCMAKE_BUILD_TYPE="Release" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DDATA_INSTALL_DIR=/usr/share/hedgewars \
+    -DNOSERVER=0 \
+    .
   make
 
   # resize icon
@@ -64,7 +44,7 @@
 }
 
 package() {
-  cd ${pkgname}-src-${pkgver}
+  cd hedgewars-src-$pkgver
   make DESTDIR="$pkgdir" install
   install -D -m644 Fonts_LICENSE.txt "$pkgdir"/usr/share/licenses/${pkgname}/Fonts_LICENSE.txt