[arch-commits] Commit in hedgewars/trunk (PKGBUILD fix-ghc-7.8-build-failure.diff)

[Thomas Dziedzic]

    Date: Monday, April 28, 2014 @ 05:49:41
  Author: td123
Revision: 110287

upgpkg: hedgewars 0.9.20.5-2

rebuild hedgewars for ghc 7.8.2-2

Added:
  hedgewars/trunk/fix-ghc-7.8-build-failure.diff
Modified:
  hedgewars/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   12 +++++++++---
 fix-ghc-7.8-build-failure.diff |   13 +++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-28 03:00:47 UTC (rev 110286)
+++ PKGBUILD	2014-04-28 03:49:41 UTC (rev 110287)
@@ -3,7 +3,7 @@
 
 pkgname=hedgewars
 pkgver=0.9.20.5
-pkgrel=1
+pkgrel=2
 pkgdesc="turn based strategy, artillery, action and comedy game, featuring the
  antics of pink hedgehogs with attitude as they battle from the depths of hell
  to the depths of space."
@@ -22,17 +22,23 @@
 	     'haskell-vector'
 	     'haskell-random')
 source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
-	hedgewars.png)
+        hedgewars.png
+        'fix-ghc-7.8-build-failure.diff')
 md5sums=('c61eb01466e86da656e1e74ad70a3217'
-         'eeb14d50df39063549ac5eca9dbc65d1')
+         'eeb14d50df39063549ac5eca9dbc65d1'
+         '84a85365cbbf7a1aabe4d0f37bd5f03f')
 
 build() {
   cd $pkgname-src-*
+
+  patch -Np1 -i ${srcdir}/fix-ghc-7.8-build-failure.diff
+
   cmake \
 	-DCMAKE_BUILD_TYPE="Release" \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DDATA_INSTALL_DIR=/usr/share/hedgewars \
 	-DNOSERVER=0 .
+
   make
 }
 

Added: fix-ghc-7.8-build-failure.diff
===================================================================
--- fix-ghc-7.8-build-failure.diff	                        (rev 0)
+++ fix-ghc-7.8-build-failure.diff	2014-04-28 03:49:41 UTC (rev 110287)
@@ -0,0 +1,13 @@
+diff --git a/gameServer/Actions.hs b/gameServer/Actions.hs
+index 2cebe4f..355ee26 100644
+--- a/gameServer/Actions.hs
++++ b/gameServer/Actions.hs
+@@ -562,7 +562,7 @@ processAction (AddClient cl) = do
+     si <- gets serverInfo
+     newClId <- io $ do
+         ci <- addClient rnc cl
+-        _ <- Exception.mask (forkIO . clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci)
++        _ <- Exception.mask (\x -> forkIO $ clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci x)
+ 
+         infoM "Clients" (show ci ++ ": New client. Time: " ++ show (connectTime cl))
+