diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-05 04:02:14 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-05 04:02:14 +0000 |
| commit | d7918d0226da2805ff09c48963d2c79e1327c630 (patch) | |
| tree | 7899e81c92db3791af5dd17e05c3be10e8a9c007 /community/hedgewars | |
| parent | bc80cf7c2a23a9d9580f3db36652165fd307b598 (diff) | |
Mon May 5 03:56:02 UTC 2014
Diffstat (limited to 'community/hedgewars')
| -rw-r--r-- | community/hedgewars/PKGBUILD | 14 | ||||
| -rw-r--r-- | community/hedgewars/fix-ghc-7.8-build-failure.diff | 13 |
2 files changed, 23 insertions, 4 deletions
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index be213374b..4afe87d68 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 104154 2014-01-16 11:39:31Z spupykin $ +# $Id: PKGBUILD 110641 2014-05-04 13:55:20Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> 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 @@ makedepends=('fpc' 'cmake' '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 } diff --git a/community/hedgewars/fix-ghc-7.8-build-failure.diff b/community/hedgewars/fix-ghc-7.8-build-failure.diff new file mode 100644 index 000000000..0381ceb44 --- /dev/null +++ b/community/hedgewars/fix-ghc-7.8-build-failure.diff @@ -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)) + |