Date: Thursday, April 2, 2015 @ 14:06:44 Author: spupykin Revision: 130535
Modified: hedgewars/trunk/PKGBUILD Deleted: hedgewars/trunk/fix-ghc-7.8-build-failure.diff --------------------------------+ PKGBUILD | 11 ++++------- fix-ghc-7.8-build-failure.diff | 13 ------------- 2 files changed, 4 insertions(+), 20 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-04-02 11:51:45 UTC (rev 130534) +++ PKGBUILD 2015-04-02 12:06:44 UTC (rev 130535) @@ -3,7 +3,7 @@ pkgname=hedgewars pkgver=0.9.21.1 -pkgrel=1 +pkgrel=2 pkgdesc="Turn-based strategy artillery game similiar to Worms" arch=('i686' 'x86_64') url="http://hedgewars.org" @@ -23,16 +23,13 @@ 'haskell-zlib' 'haskell-random') source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 - hedgewars.png - 'fix-ghc-7.8-build-failure.diff') + hedgewars.png) md5sums=('5c87b1ff54c861ae0cae6a9c1198f957' - 'eeb14d50df39063549ac5eca9dbc65d1' - '84a85365cbbf7a1aabe4d0f37bd5f03f') + 'eeb14d50df39063549ac5eca9dbc65d1') prepare() { cd $pkgname-src-* -# patch -Np1 -i ${srcdir}/fix-ghc-7.8-build-failure.diff -# sed -i 's|\[ ! -a Hedgewars.app \]|\\[ ! -a Hedgewars.app \\]|' tools/CMakeLists.txt + sed -i 's|instance NFData (Chan a)$|instance NFData (Chan a) where rnf x = seq x ()|' gameServer/CoreTypes.hs } build() { Deleted: fix-ghc-7.8-build-failure.diff =================================================================== --- fix-ghc-7.8-build-failure.diff 2015-04-02 11:51:45 UTC (rev 130534) +++ fix-ghc-7.8-build-failure.diff 2015-04-02 12:06:44 UTC (rev 130535) @@ -1,13 +0,0 @@ -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)) -