Date: Thursday, April 2, 2015 @ 13:22:07 Author: spupykin Revision: 130524
archrelease: copy trunk to community-i686, community-x86_64 Added: hedgewars/repos/community-i686/PKGBUILD (from rev 130523, hedgewars/trunk/PKGBUILD) hedgewars/repos/community-i686/fix-ghc-7.8-build-failure.diff (from rev 130523, hedgewars/trunk/fix-ghc-7.8-build-failure.diff) hedgewars/repos/community-i686/hedgewars.png (from rev 130523, hedgewars/trunk/hedgewars.png) hedgewars/repos/community-x86_64/PKGBUILD (from rev 130523, hedgewars/trunk/PKGBUILD) hedgewars/repos/community-x86_64/fix-ghc-7.8-build-failure.diff (from rev 130523, hedgewars/trunk/fix-ghc-7.8-build-failure.diff) hedgewars/repos/community-x86_64/hedgewars.png (from rev 130523, hedgewars/trunk/hedgewars.png) Deleted: hedgewars/repos/community-i686/PKGBUILD hedgewars/repos/community-i686/fix-ghc-7.8-build-failure.diff hedgewars/repos/community-i686/hedgewars.png hedgewars/repos/community-x86_64/PKGBUILD hedgewars/repos/community-x86_64/fix-ghc-7.8-build-failure.diff hedgewars/repos/community-x86_64/hedgewars.png -------------------------------------------------+ /PKGBUILD | 114 ++++++++++++++++++++++ /fix-ghc-7.8-build-failure.diff | 26 +++++ community-i686/PKGBUILD | 57 ----------- community-i686/fix-ghc-7.8-build-failure.diff | 13 -- community-x86_64/PKGBUILD | 57 ----------- community-x86_64/fix-ghc-7.8-build-failure.diff | 13 -- 6 files changed, 140 insertions(+), 140 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2015-04-02 11:21:45 UTC (rev 130523) +++ community-i686/PKGBUILD 2015-04-02 11:22:07 UTC (rev 130524) @@ -1,57 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> - -pkgname=hedgewars -pkgver=0.9.21 -pkgrel=1 -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' 'physfs') -makedepends=('fpc' 'cmake' - # haskell specific - 'ghc' - 'haskell-network' - 'haskell-bytestring-show' - 'haskell-utf8-string' - 'haskell-dataenc' - 'haskell-hslogger' - 'haskell-vector' - 'haskell-entropy' - 'haskell-sha' - 'haskell-zlib' - 'haskell-random') -source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 - hedgewars.png - 'fix-ghc-7.8-build-failure.diff') -md5sums=('67b57d00b91d3c1212dcb5d56ac6f2df' - '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-i686/PKGBUILD (from rev 130523, hedgewars/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2015-04-02 11:22:07 UTC (rev 130524) @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> + +pkgname=hedgewars +pkgver=0.9.21.1 +pkgrel=1 +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' 'physfs') +makedepends=('fpc' 'cmake' + # haskell specific + 'ghc' + 'haskell-network' + 'haskell-bytestring-show' + 'haskell-utf8-string' + 'haskell-dataenc' + 'haskell-hslogger' + 'haskell-vector' + 'haskell-entropy' + 'haskell-sha' + 'haskell-zlib' + 'haskell-random') +source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 + hedgewars.png + 'fix-ghc-7.8-build-failure.diff') +md5sums=('5c87b1ff54c861ae0cae6a9c1198f957' + '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 +} Deleted: community-i686/fix-ghc-7.8-build-failure.diff =================================================================== --- community-i686/fix-ghc-7.8-build-failure.diff 2015-04-02 11:21:45 UTC (rev 130523) +++ community-i686/fix-ghc-7.8-build-failure.diff 2015-04-02 11:22:07 UTC (rev 130524) @@ -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)) - Copied: hedgewars/repos/community-i686/fix-ghc-7.8-build-failure.diff (from rev 130523, hedgewars/trunk/fix-ghc-7.8-build-failure.diff) =================================================================== --- community-i686/fix-ghc-7.8-build-failure.diff (rev 0) +++ community-i686/fix-ghc-7.8-build-failure.diff 2015-04-02 11:22:07 UTC (rev 130524) @@ -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)) + Deleted: community-i686/hedgewars.png =================================================================== (Binary files differ) Copied: hedgewars/repos/community-i686/hedgewars.png (from rev 130523, hedgewars/trunk/hedgewars.png) =================================================================== (Binary files differ) Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2015-04-02 11:21:45 UTC (rev 130523) +++ community-x86_64/PKGBUILD 2015-04-02 11:22:07 UTC (rev 130524) @@ -1,57 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> - -pkgname=hedgewars -pkgver=0.9.21 -pkgrel=1 -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' 'physfs') -makedepends=('fpc' 'cmake' - # haskell specific - 'ghc' - 'haskell-network' - 'haskell-bytestring-show' - 'haskell-utf8-string' - 'haskell-dataenc' - 'haskell-hslogger' - 'haskell-vector' - 'haskell-entropy' - 'haskell-sha' - 'haskell-zlib' - 'haskell-random') -source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 - hedgewars.png - 'fix-ghc-7.8-build-failure.diff') -md5sums=('67b57d00b91d3c1212dcb5d56ac6f2df' - '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-x86_64/PKGBUILD (from rev 130523, hedgewars/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2015-04-02 11:22:07 UTC (rev 130524) @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> + +pkgname=hedgewars +pkgver=0.9.21.1 +pkgrel=1 +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' 'physfs') +makedepends=('fpc' 'cmake' + # haskell specific + 'ghc' + 'haskell-network' + 'haskell-bytestring-show' + 'haskell-utf8-string' + 'haskell-dataenc' + 'haskell-hslogger' + 'haskell-vector' + 'haskell-entropy' + 'haskell-sha' + 'haskell-zlib' + 'haskell-random') +source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 + hedgewars.png + 'fix-ghc-7.8-build-failure.diff') +md5sums=('5c87b1ff54c861ae0cae6a9c1198f957' + '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 +} Deleted: community-x86_64/fix-ghc-7.8-build-failure.diff =================================================================== --- community-x86_64/fix-ghc-7.8-build-failure.diff 2015-04-02 11:21:45 UTC (rev 130523) +++ community-x86_64/fix-ghc-7.8-build-failure.diff 2015-04-02 11:22:07 UTC (rev 130524) @@ -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)) - Copied: hedgewars/repos/community-x86_64/fix-ghc-7.8-build-failure.diff (from rev 130523, hedgewars/trunk/fix-ghc-7.8-build-failure.diff) =================================================================== --- community-x86_64/fix-ghc-7.8-build-failure.diff (rev 0) +++ community-x86_64/fix-ghc-7.8-build-failure.diff 2015-04-02 11:22:07 UTC (rev 130524) @@ -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)) + Deleted: community-x86_64/hedgewars.png =================================================================== (Binary files differ) Copied: hedgewars/repos/community-x86_64/hedgewars.png (from rev 130523, hedgewars/trunk/hedgewars.png) =================================================================== (Binary files differ)