[arch-commits] Commit in hedgewars/repos (14 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Mon Jun 3 16:15:33 UTC 2013
Date: Monday, June 3, 2013 @ 18:15:33
Author: spupykin
Revision: 92299
archrelease: copy trunk to community-i686, community-x86_64
Added:
hedgewars/repos/community-i686/PKGBUILD
(from rev 92298, hedgewars/trunk/PKGBUILD)
hedgewars/repos/community-i686/build-fix.patch
(from rev 92298, hedgewars/trunk/build-fix.patch)
hedgewars/repos/community-i686/hedgewars.desktop
(from rev 92298, hedgewars/trunk/hedgewars.desktop)
hedgewars/repos/community-i686/hedgewars.png
(from rev 92298, hedgewars/trunk/hedgewars.png)
hedgewars/repos/community-x86_64/PKGBUILD
(from rev 92298, hedgewars/trunk/PKGBUILD)
hedgewars/repos/community-x86_64/build-fix.patch
(from rev 92298, hedgewars/trunk/build-fix.patch)
hedgewars/repos/community-x86_64/hedgewars.desktop
(from rev 92298, hedgewars/trunk/hedgewars.desktop)
hedgewars/repos/community-x86_64/hedgewars.png
(from rev 92298, hedgewars/trunk/hedgewars.png)
Deleted:
hedgewars/repos/community-i686/PKGBUILD
hedgewars/repos/community-i686/hedgewars.desktop
hedgewars/repos/community-i686/hedgewars.png
hedgewars/repos/community-x86_64/PKGBUILD
hedgewars/repos/community-x86_64/hedgewars.desktop
hedgewars/repos/community-x86_64/hedgewars.png
------------------------------------+
/PKGBUILD | 110 +++++++++++++++++++++++++++++++++++
/hedgewars.desktop | 16 +++++
community-i686/PKGBUILD | 49 ---------------
community-i686/build-fix.patch | 11 +++
community-i686/hedgewars.desktop | 8 --
community-x86_64/PKGBUILD | 48 ---------------
community-x86_64/build-fix.patch | 11 +++
community-x86_64/hedgewars.desktop | 8 --
8 files changed, 148 insertions(+), 113 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-06-03 16:14:48 UTC (rev 92298)
+++ community-i686/PKGBUILD 2013-06-03 16:15:33 UTC (rev 92299)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=hedgewars
-pkgver=0.9.18
-pkgrel=8
-pkgdesc="Free Worms-like turn based strategy game"
-arch=('i686' 'x86_64')
-url="http://hedgewars.org"
-license=('GPL' 'custom')
-depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51')
-makedepends=('fpc' 'cmake'
- # haskell specific
- 'ghc=7.6.3-1'
- 'haskell-network=2.4.1.2-1'
- 'haskell-bytestring-show=0.3.5.4-4'
- 'haskell-utf8-string=0.3.7-5'
- 'haskell-dataenc=0.14.0.5-2'
- 'haskell-hslogger=1.2.1-4'
- 'haskell-vector=0.10.0.1-4')
-source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver-3.tar.bz2
- hedgewars.desktop
- hedgewars.png)
-md5sums=('02465736fdcf48feea1cacaa0aa5960e'
- '48c66a3204d4fa0a69e9aa46f7c31e0c'
- 'eeb14d50df39063549ac5eca9dbc65d1')
-
-build() {
- cd $pkgname-src-$pkgver
- sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs
-# sed -i 's|lua51 lua5.1 lua-5.1|lua lua51 lua5.1 lua-5.1|g' cmake_modules/FindLua.cmake
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DDATA_INSTALL_DIR=/usr/share \
- -DQT_QMAKE_EXECUTABLE=/usr/lib/qt4/bin/qmake \
- -DQT_MOC_EXECUTABLE=/usr/lib/qt4/bin/moc \
- -DWITH_SERVER=1 .
- make
-}
-
-package() {
- cd $pkgname-src-$pkgver
-
- 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 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
-}
Copied: hedgewars/repos/community-i686/PKGBUILD (from rev 92298, hedgewars/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-06-03 16:15:33 UTC (rev 92299)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=hedgewars
+pkgver=0.9.19
+pkgrel=1
+pkgdesc="Free Worms-like turn based strategy game"
+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.desktop
+ hedgewars.png
+ build-fix.patch)
+md5sums=('51d84ad6ea00e9894e6119b118b4a523'
+ '48c66a3204d4fa0a69e9aa46f7c31e0c'
+ 'eeb14d50df39063549ac5eca9dbc65d1'
+ 'a9d7b0ba72cbeb7fc74fce459db9dd90')
+
+prepare() {
+ cd $pkgname-src-$pkgver
+ patch -Rp1 <$srcdir/build-fix.patch
+}
+
+build() {
+ cd $pkgname-src-$pkgver
+ cmake \
+ -DCMAKE_BUILD_TYPE="Release" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DDATA_INSTALL_DIR=/usr/share/hedgewars \
+ -DWITH_SERVER=1 \
+ -DSYSTEM_PHYSFS=OFF .
+ make
+}
+
+package() {
+ cd $pkgname-src-$pkgver
+
+ 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 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
+}
Copied: hedgewars/repos/community-i686/build-fix.patch (from rev 92298, hedgewars/trunk/build-fix.patch)
===================================================================
--- community-i686/build-fix.patch (rev 0)
+++ community-i686/build-fix.patch 2013-06-03 16:15:33 UTC (rev 92299)
@@ -0,0 +1,11 @@
+diff -wbBur /home/sergej/tmp/BUILD/extra-i686/sergej/build/hedgewars/src/hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas
+--- /home/sergej/tmp/BUILD/extra-i686/sergej/build/hedgewars/src/hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas 2013-06-03 20:01:14.212121255 +0400
++++ hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas 2013-05-31 00:07:33.000000000 +0400
+@@ -9,7 +9,6 @@
+ {$IFNDEF WIN32}
+ {$linklib physfs}
+ {$linklib physlayer}
+- {$linklib gcc_s}
+
+ {statically linking physfs brings IOKit dependency on OSX}
+ {divdi3 is found in stdc++ on linux x86 and in gcc_s.1 on osx ppc32}
Deleted: community-i686/hedgewars.desktop
===================================================================
--- community-i686/hedgewars.desktop 2013-06-03 16:14:48 UTC (rev 92298)
+++ community-i686/hedgewars.desktop 2013-06-03 16:15:33 UTC (rev 92299)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Hedgewars
-GenericName=Platform Game
-Comment=Worms style game
-Exec=hedgewars
-Icon=hedgewars
-Categories=Game;ArcadeGame;
\ No newline at end of file
Copied: hedgewars/repos/community-i686/hedgewars.desktop (from rev 92298, hedgewars/trunk/hedgewars.desktop)
===================================================================
--- community-i686/hedgewars.desktop (rev 0)
+++ community-i686/hedgewars.desktop 2013-06-03 16:15:33 UTC (rev 92299)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Hedgewars
+GenericName=Platform Game
+Comment=Worms style game
+Exec=hedgewars
+Icon=hedgewars
+Categories=Game;ArcadeGame;
\ No newline at end of file
Deleted: community-i686/hedgewars.png
===================================================================
(Binary files differ)
Copied: hedgewars/repos/community-i686/hedgewars.png (from rev 92298, hedgewars/trunk/hedgewars.png)
===================================================================
(Binary files differ)
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-06-03 16:14:48 UTC (rev 92298)
+++ community-x86_64/PKGBUILD 2013-06-03 16:15:33 UTC (rev 92299)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=hedgewars
-pkgver=0.9.19
-pkgrel=1
-pkgdesc="Free Worms-like turn based strategy game"
-arch=('i686' 'x86_64')
-url="http://hedgewars.org"
-license=('GPL' 'custom')
-depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51' 'physfs' '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.desktop
- hedgewars.png)
-md5sums=('51d84ad6ea00e9894e6119b118b4a523'
- '48c66a3204d4fa0a69e9aa46f7c31e0c'
- 'eeb14d50df39063549ac5eca9dbc65d1')
-
-build() {
- cd $pkgname-src-$pkgver
- sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs
- cmake \
- -DCMAKE_BUILD_TYPE="Release" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DDATA_INSTALL_DIR=/usr/share \
- -DWITH_SERVER=1 .
- make
-}
-
-package() {
- cd $pkgname-src-$pkgver
-
- 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 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
-}
Copied: hedgewars/repos/community-x86_64/PKGBUILD (from rev 92298, hedgewars/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-06-03 16:15:33 UTC (rev 92299)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=hedgewars
+pkgver=0.9.19
+pkgrel=1
+pkgdesc="Free Worms-like turn based strategy game"
+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.desktop
+ hedgewars.png
+ build-fix.patch)
+md5sums=('51d84ad6ea00e9894e6119b118b4a523'
+ '48c66a3204d4fa0a69e9aa46f7c31e0c'
+ 'eeb14d50df39063549ac5eca9dbc65d1'
+ 'a9d7b0ba72cbeb7fc74fce459db9dd90')
+
+prepare() {
+ cd $pkgname-src-$pkgver
+ patch -Rp1 <$srcdir/build-fix.patch
+}
+
+build() {
+ cd $pkgname-src-$pkgver
+ cmake \
+ -DCMAKE_BUILD_TYPE="Release" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DDATA_INSTALL_DIR=/usr/share/hedgewars \
+ -DWITH_SERVER=1 \
+ -DSYSTEM_PHYSFS=OFF .
+ make
+}
+
+package() {
+ cd $pkgname-src-$pkgver
+
+ 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 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
+}
Copied: hedgewars/repos/community-x86_64/build-fix.patch (from rev 92298, hedgewars/trunk/build-fix.patch)
===================================================================
--- community-x86_64/build-fix.patch (rev 0)
+++ community-x86_64/build-fix.patch 2013-06-03 16:15:33 UTC (rev 92299)
@@ -0,0 +1,11 @@
+diff -wbBur /home/sergej/tmp/BUILD/extra-i686/sergej/build/hedgewars/src/hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas
+--- /home/sergej/tmp/BUILD/extra-i686/sergej/build/hedgewars/src/hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas 2013-06-03 20:01:14.212121255 +0400
++++ hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas 2013-05-31 00:07:33.000000000 +0400
+@@ -9,7 +9,6 @@
+ {$IFNDEF WIN32}
+ {$linklib physfs}
+ {$linklib physlayer}
+- {$linklib gcc_s}
+
+ {statically linking physfs brings IOKit dependency on OSX}
+ {divdi3 is found in stdc++ on linux x86 and in gcc_s.1 on osx ppc32}
Deleted: community-x86_64/hedgewars.desktop
===================================================================
--- community-x86_64/hedgewars.desktop 2013-06-03 16:14:48 UTC (rev 92298)
+++ community-x86_64/hedgewars.desktop 2013-06-03 16:15:33 UTC (rev 92299)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Hedgewars
-GenericName=Platform Game
-Comment=Worms style game
-Exec=hedgewars
-Icon=hedgewars
-Categories=Game;ArcadeGame;
\ No newline at end of file
Copied: hedgewars/repos/community-x86_64/hedgewars.desktop (from rev 92298, hedgewars/trunk/hedgewars.desktop)
===================================================================
--- community-x86_64/hedgewars.desktop (rev 0)
+++ community-x86_64/hedgewars.desktop 2013-06-03 16:15:33 UTC (rev 92299)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Hedgewars
+GenericName=Platform Game
+Comment=Worms style game
+Exec=hedgewars
+Icon=hedgewars
+Categories=Game;ArcadeGame;
\ No newline at end of file
Deleted: community-x86_64/hedgewars.png
===================================================================
(Binary files differ)
Copied: hedgewars/repos/community-x86_64/hedgewars.png (from rev 92298, hedgewars/trunk/hedgewars.png)
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list