[arch-commits] Commit in hedgewars/trunk (PKGBUILD build-fix.patch)

[Sergej Pupykin]

    Date: Monday, June 3, 2013 @ 18:14:48
  Author: spupykin
Revision: 92298

upgpkg: hedgewars 0.9.19-1

upd

Added:
  hedgewars/trunk/build-fix.patch
Modified:
  hedgewars/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   19 +++++++++++++------
 build-fix.patch |   11 +++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-03 14:58:14 UTC (rev 92297)
+++ PKGBUILD	2013-06-03 16:14:48 UTC (rev 92298)
@@ -8,7 +8,7 @@
 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')
+depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51' 'ffmpeg' 'glut')
 makedepends=('fpc' 'cmake'
 	     # haskell specific
 	     'ghc'
@@ -21,19 +21,26 @@
 	     'haskell-random')
 source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
 	hedgewars.desktop
-	hedgewars.png)
+	hedgewars.png
+	build-fix.patch)
 md5sums=('51d84ad6ea00e9894e6119b118b4a523'
          '48c66a3204d4fa0a69e9aa46f7c31e0c'
-         'eeb14d50df39063549ac5eca9dbc65d1')
+         'eeb14d50df39063549ac5eca9dbc65d1'
+         'a9d7b0ba72cbeb7fc74fce459db9dd90')
 
+prepare() {
+  cd $pkgname-src-$pkgver
+  patch -Rp1 <$srcdir/build-fix.patch
+}
+
 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 .
+	-DDATA_INSTALL_DIR=/usr/share/hedgewars \
+	-DWITH_SERVER=1 \
+	-DSYSTEM_PHYSFS=OFF .
   make
 }
 

Added: build-fix.patch
===================================================================
--- build-fix.patch	                        (rev 0)
+++ build-fix.patch	2013-06-03 16:14:48 UTC (rev 92298)
@@ -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}