summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD16
2 files changed, 13 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dff1d2b64f9c..e0c6c66e8730 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Mon Dec 10 23:36:35 UTC 2018
pkgbase = hedgewars-hg
pkgdesc = Free Worms-like turn based strategy game (development version - mercurial)
- pkgver = r14415+.06672690d71b+
+ pkgver = r15738+.027a56b3895e+
pkgrel = 1
url = http://hedgewars.org
arch = i686
@@ -13,12 +11,12 @@ pkgbase = hedgewars-hg
makedepends = cmake
makedepends = qt5-tools
makedepends = ghc
- makedepends = haskell-network
makedepends = haskell-bytestring-show
makedepends = haskell-zlib
makedepends = haskell-base-prelude
makedepends = imagemagick
makedepends = mesa
+ makedepends = mercurial
depends = qt5-base
depends = sdl2
depends = sdl2_mixer
@@ -36,6 +34,7 @@ pkgbase = hedgewars-hg
depends = haskell-regex-tdfa
depends = haskell-sandi
depends = haskell-hslogger
+ depends = haskell-network2.8
depends = haskell-utf8-string
depends = haskell-vector
conflicts = hedgewars
diff --git a/PKGBUILD b/PKGBUILD
index c32c3cab60a9..88329a26caf8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jozef Riha <jose1711 at gmail dot com>
pkgname=hedgewars-hg
-pkgver=r14415+.06672690d71b+
+pkgver=r15738+.027a56b3895e+
pkgrel=1
pkgdesc="Free Worms-like turn based strategy game (development version - mercurial)"
arch=('i686' 'x86_64')
@@ -9,9 +9,9 @@ url="http://hedgewars.org"
license=('GPL' 'custom')
depends=('qt5-base' 'sdl2' 'sdl2_mixer' 'sdl2_image' 'sdl2_net' 'sdl2_ttf' 'lua51' 'ffmpeg' 'glut'
'physfs' 'ghc-libs' 'haskell-entropy' 'haskell-sha' 'haskell-random' 'haskell-regex-tdfa'
- 'haskell-sandi' 'haskell-hslogger' 'haskell-utf8-string' 'haskell-vector')
-makedepends=('fpc' 'cmake' 'qt5-tools' 'ghc' 'haskell-network' 'haskell-bytestring-show'
- 'haskell-zlib' 'haskell-base-prelude' 'imagemagick' 'mesa')
+ 'haskell-sandi' 'haskell-hslogger' 'haskell-network2.8' 'haskell-utf8-string' 'haskell-vector')
+makedepends=('fpc' 'cmake' 'qt5-tools' 'ghc' 'haskell-bytestring-show'
+ 'haskell-zlib' 'haskell-base-prelude' 'imagemagick' 'mesa' 'mercurial')
source=("${pkgname}"::'hg+https://hg.hedgewars.org/hedgewars' \
hedgewars.desktop \
hedgewars.png)
@@ -21,13 +21,17 @@ md5sums=('SKIP'
conflicts=('hedgewars')
pkgver() {
- cd "$pkgname"
+ cd "${pkgname}"
printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
}
prepare() {
cd ${srcdir}/${pkgname}
- sed -i 's|set(ghc_flags|set(ghc_flags -dynamic|' gameServer/CMakeLists.txt
+ sed -i 's|set(ghc_flags|set(ghc_flags -dynamic -package network-2.8.0.1 -hide-package network-bsd|' gameServer/CMakeLists.txt
+ sed -i '/#include <QSizePolicy>/a #include <QPainterPath>' QTfrontend/ui/page/pagegamestats.cpp
+
+ # https://bugs.freepascal.org/view.php?id=37286
+ sed -i 's/procedure ShiftWorld(Dir: LongInt); inline;/procedure ShiftWorld(Dir: LongInt);/' hedgewars/uWorld.pas
}
build() {