[arch-commits] Commit in hedgewars/repos (8 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Mon Sep 15 19:09:28 UTC 2014
Date: Monday, September 15, 2014 @ 21:09:27
Author: bpiotrowski
Revision: 119035
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
hedgewars/repos/community-staging-i686/
hedgewars/repos/community-staging-i686/PKGBUILD
(from rev 119034, hedgewars/trunk/PKGBUILD)
hedgewars/repos/community-staging-i686/fix-ghc-7.8-build-failure.diff
(from rev 119034, hedgewars/trunk/fix-ghc-7.8-build-failure.diff)
hedgewars/repos/community-staging-i686/hedgewars.png
(from rev 119034, hedgewars/trunk/hedgewars.png)
hedgewars/repos/community-staging-x86_64/
hedgewars/repos/community-staging-x86_64/PKGBUILD
(from rev 119034, hedgewars/trunk/PKGBUILD)
hedgewars/repos/community-staging-x86_64/fix-ghc-7.8-build-failure.diff
(from rev 119034, hedgewars/trunk/fix-ghc-7.8-build-failure.diff)
hedgewars/repos/community-staging-x86_64/hedgewars.png
(from rev 119034, hedgewars/trunk/hedgewars.png)
---------------------------------------------------------+
community-staging-i686/PKGBUILD | 54 ++++++++++++++
community-staging-i686/fix-ghc-7.8-build-failure.diff | 13 +++
community-staging-x86_64/PKGBUILD | 54 ++++++++++++++
community-staging-x86_64/fix-ghc-7.8-build-failure.diff | 13 +++
4 files changed, 134 insertions(+)
Copied: hedgewars/repos/community-staging-i686/PKGBUILD (from rev 119034, hedgewars/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2014-09-15 19:09:27 UTC (rev 119035)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=hedgewars
+pkgver=0.9.20.5
+pkgrel=4
+pkgdesc="Turn-based strategy artillery game similiar to Worms"
+arch=('i686' 'x86_64')
+url="http://hedgewars.org"
+license=('GPL' 'custom')
+depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51' 'ffmpeg' 'glut')
+makedepends=('fpc' 'cmake'
+ # haskell specific
+ 'ghc'
+ 'haskell-network'
+ 'haskell-bytestring-show'
+ 'haskell-utf8-string'
+ 'haskell-dataenc'
+ 'haskell-hslogger'
+ 'haskell-vector'
+ 'haskell-random')
+source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
+ hedgewars.png
+ 'fix-ghc-7.8-build-failure.diff')
+md5sums=('c61eb01466e86da656e1e74ad70a3217'
+ 'eeb14d50df39063549ac5eca9dbc65d1'
+ '84a85365cbbf7a1aabe4d0f37bd5f03f')
+
+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
+}
+
+build() {
+ cd $pkgname-src-*
+ mkdir -p $srcdir/bin
+ ln -sf /usr/bin/lrelease-qt4 $srcdir/bin/Qt4::lrelease
+ export PATH=$srcdir/bin:$PATH
+ cmake \
+ -DCMAKE_BUILD_TYPE="Release" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DDATA_INSTALL_DIR=/usr/share/hedgewars \
+ -DNOSERVER=0 .
+ make
+}
+
+package() {
+ cd $pkgname-src-*
+ make DESTDIR=$pkgdir install
+ install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt
+ install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png
+ install -D -m644 share/hedgewars/Data/misc/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
+}
Copied: hedgewars/repos/community-staging-i686/fix-ghc-7.8-build-failure.diff (from rev 119034, hedgewars/trunk/fix-ghc-7.8-build-failure.diff)
===================================================================
--- community-staging-i686/fix-ghc-7.8-build-failure.diff (rev 0)
+++ community-staging-i686/fix-ghc-7.8-build-failure.diff 2014-09-15 19:09:27 UTC (rev 119035)
@@ -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))
+
Copied: hedgewars/repos/community-staging-i686/hedgewars.png (from rev 119034, hedgewars/trunk/hedgewars.png)
===================================================================
(Binary files differ)
Copied: hedgewars/repos/community-staging-x86_64/PKGBUILD (from rev 119034, hedgewars/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2014-09-15 19:09:27 UTC (rev 119035)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=hedgewars
+pkgver=0.9.20.5
+pkgrel=4
+pkgdesc="Turn-based strategy artillery game similiar to Worms"
+arch=('i686' 'x86_64')
+url="http://hedgewars.org"
+license=('GPL' 'custom')
+depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51' 'ffmpeg' 'glut')
+makedepends=('fpc' 'cmake'
+ # haskell specific
+ 'ghc'
+ 'haskell-network'
+ 'haskell-bytestring-show'
+ 'haskell-utf8-string'
+ 'haskell-dataenc'
+ 'haskell-hslogger'
+ 'haskell-vector'
+ 'haskell-random')
+source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
+ hedgewars.png
+ 'fix-ghc-7.8-build-failure.diff')
+md5sums=('c61eb01466e86da656e1e74ad70a3217'
+ 'eeb14d50df39063549ac5eca9dbc65d1'
+ '84a85365cbbf7a1aabe4d0f37bd5f03f')
+
+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
+}
+
+build() {
+ cd $pkgname-src-*
+ mkdir -p $srcdir/bin
+ ln -sf /usr/bin/lrelease-qt4 $srcdir/bin/Qt4::lrelease
+ export PATH=$srcdir/bin:$PATH
+ cmake \
+ -DCMAKE_BUILD_TYPE="Release" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DDATA_INSTALL_DIR=/usr/share/hedgewars \
+ -DNOSERVER=0 .
+ make
+}
+
+package() {
+ cd $pkgname-src-*
+ make DESTDIR=$pkgdir install
+ install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt
+ install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png
+ install -D -m644 share/hedgewars/Data/misc/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
+}
Copied: hedgewars/repos/community-staging-x86_64/fix-ghc-7.8-build-failure.diff (from rev 119034, hedgewars/trunk/fix-ghc-7.8-build-failure.diff)
===================================================================
--- community-staging-x86_64/fix-ghc-7.8-build-failure.diff (rev 0)
+++ community-staging-x86_64/fix-ghc-7.8-build-failure.diff 2014-09-15 19:09:27 UTC (rev 119035)
@@ -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))
+
Copied: hedgewars/repos/community-staging-x86_64/hedgewars.png (from rev 119034, hedgewars/trunk/hedgewars.png)
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list