summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Bezerra2023-04-06 11:54:47 -0300
committerRodrigo Bezerra2023-04-06 11:54:47 -0300
commitd721132eff2dfced193d556949d6cc0e126974ce (patch)
tree53d676250b3c263ad15a8e60cc8bc6d63dc929d9
parent0fc5e116cb4841107db4175b5d0332eb3a983067 (diff)
downloadaur-freeciv-git.tar.gz
Build with meson
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD32
2 files changed, 20 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 59a4d5b4a51d..b9d54d1101d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,27 @@
pkgbase = freeciv-git
pkgdesc = A multiuser clone of the famous Microprose game of Civilization
- pkgver = r25158.2054ee3a2c
+ pkgver = r29394.68681a4231
pkgrel = 1
url = http://www.freeciv.org/
arch = x86_64
license = GPL2
- makedepends = python
+ makedepends = git
+ makedepends = meson
+ makedepends = intltool
depends = curl
depends = gtk3
+ depends = gtk4
depends = lua
- depends = qt5-base
+ depends = qt6-base
depends = sdl2_gfx
depends = sdl2_image
depends = sdl2_mixer
depends = sdl2_ttf
+ depends = sqlite
provides = freeciv
conflicts = freeciv
+ conflicts = freeciv-sdl2
source = git+https://github.com/freeciv/freeciv.git
sha256sums = SKIP
pkgname = freeciv-git
-
diff --git a/PKGBUILD b/PKGBUILD
index aa29725af8f7..7876c91837cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,15 @@
_basename=freeciv
pkgname=freeciv-git
-pkgver=r25158.2054ee3a2c
+pkgver=r29394.68681a4231
pkgrel=1
pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
arch=('x86_64')
url="http://www.freeciv.org/"
license=('GPL2')
-depends=('curl' 'gtk3' 'lua' 'qt5-base' 'sdl2_gfx' 'sdl2_image' 'sdl2_mixer' 'sdl2_ttf')
-makedepends=('python')
-conflicts=('freeciv')
+depends=('curl' 'gtk3' 'gtk4' 'lua' 'qt6-base' 'sdl2_gfx' 'sdl2_image' 'sdl2_mixer' 'sdl2_ttf' 'sqlite')
+makedepends=('git' 'meson' 'intltool')
+conflicts=('freeciv' 'freeciv-sdl2')
provides=('freeciv')
source=("git+https://github.com/freeciv/freeciv.git")
sha256sums=('SKIP')
@@ -22,25 +22,17 @@ pkgver() {
}
build() {
- cd ${_basename}
+ export CFLAGS=${CFLAGS/FORTIFY_SOURCE=2/FORTIFY_SOURCE=0}
- ./autogen.sh \
- --prefix=/usr \
- --sysconfdir=/etc \
- --enable-fcdb=sqlite3 \
- --enable-client=all \
- --enable-gitrev \
- --enable-aimodules=yes \
- --enable-shared \
- --enable-sdl-mixer \
- --enable-fcmp=all \
- --enable-sys-lua
+ arch-meson ${_basename} build \
+ -Dclients=gtk3.22,sdl2,qt,gtk4,stub \
+ -Dfcmp=gtk3,qt,cli,gtk4 \
+ -Dsyslua=true \
+ -Dgitrev=true
- make
+ meson compile -C build
}
package() {
- cd ${_basename}
-
- make DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" meson install -C build
}