diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2018-07-23 21:49:37 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2018-07-23 21:49:37 -0700 |
| commit | c1ab3823f392938387f1bdc266308d8af862d341 (patch) | |
| tree | d33340854c64f243cd0eaae7e341634e7577e561 | |
| parent | Initial commit (diff) | |
| download | freeciv-qt-c1ab3823f392938387f1bdc266308d8af862d341.tar.xz | |
Updated to 2.6.0
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | lua52_compat.patch | 13 |
2 files changed, 5 insertions, 27 deletions
@@ -1,28 +1,19 @@ -# $Id$ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=freeciv-qt -pkgver=2.5.11 +pkgver=2.6.0 pkgrel=1 pkgdesc="A multiuser clone of the famous Microprose game of Civilization" arch=('x86_64') -url="http://www.freeciv.org/" +url="https://www.freeciv.org/" license=('GPL') -depends=('qt5-base' 'sdl_mixer' 'lua52' 'sqlite' 'curl' 'libtool') +depends=('qt5-base' 'lua' 'sqlite' 'curl') makedepends=('python') conflicts=('freeciv') provides=('freeciv') backup=('etc/freeciv/database.lua') -source=(https://downloads.sourceforge.net/sourceforge/freeciv/freeciv-${pkgver}.tar.bz2 - lua52_compat.patch) -sha256sums=('4c9c526952fe977cb4b302b8ccf75798fd066c6dde670f72f677fe4964259aad' - '85aff8a154b44c3c337c549c3ab9204429eaa627835b18b74146e801dd99a71e') - -prepare() { - cd freeciv-${pkgver} - patch -p1 -i "$srcdir"/lua52_compat.patch - autoreconf -vi -} +source=(https://downloads.sourceforge.net/sourceforge/freeciv/freeciv-${pkgver}.tar.bz2) +sha1sums=('19b5181e3e9e40b31332c79a2226fbcc3706a9c2') build() { cd freeciv-${pkgver} diff --git a/lua52_compat.patch b/lua52_compat.patch deleted file mode 100644 index 759578f..0000000 --- a/lua52_compat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5cfc1d1..1c66051 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1263,7 +1263,7 @@ esac], [sys_lua=false]) - dnl There's wide divergence on what the pkg-config file for Lua is called - dnl See http://lua-users.org/lists/lua-l/2008-09/msg00184.html - if test "x$sys_lua" = "xtrue" || test "x$sys_lua" = "xtest" ; then -- PKG_CHECK_MODULES([LUA], [lua5.2], [sys_lua=true], -+ PKG_CHECK_MODULES([LUA], [lua52], [sys_lua=true], - [PKG_CHECK_MODULES([LUA], [lua-5.2], [sys_lua=true], - [PKG_CHECK_MODULES([LUA], [lua >= 5.2 lua < 5.3], [sys_lua=true], - [if test "x$sys_lua" = "xtrue" ; then |