[arch-commits] Commit in freeciv/repos/community-x86_64 (3 files)

[Antonio Rojas]

    Date: Monday, July 23, 2018 @ 21:33:42
  Author: arojas
Revision: 363217

archrelease: copy trunk to community-x86_64

Added:
  freeciv/repos/community-x86_64/PKGBUILD
    (from rev 363216, freeciv/trunk/PKGBUILD)
Deleted:
  freeciv/repos/community-x86_64/PKGBUILD
  freeciv/repos/community-x86_64/lua52_compat.patch

--------------------+
 PKGBUILD           |   62 ++++++++++++++++++++++-----------------------------
 lua52_compat.patch |   13 ----------
 2 files changed, 27 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-23 21:33:17 UTC (rev 363216)
+++ PKGBUILD	2018-07-23 21:33:42 UTC (rev 363217)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=freeciv
-pkgver=2.5.11
-pkgrel=1
-pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
-arch=('x86_64')
-url="http://www.freeciv.org/"
-license=('GPL')
-depends=('gtk3' 'sdl_mixer' 'lua52' 'sqlite' 'curl' 'libtool')
-makedepends=('python')
-backup=('etc/freeciv/database.lua')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        lua52_compat.patch)
-sha1sums=('de95ab1132d022f3cf47a033447a0d745c4c249d'
-          '248f4c8b62557677bf27a0d06feb15148d811ce7')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "$srcdir"/lua52_compat.patch
-  autoreconf -vi
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-shared --enable-sys-lua \
-    --enable-client=gtk3 --enable-fcmp=gtk3 --enable-fcdb=sqlite3 --enable-aimodules
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}

Copied: freeciv/repos/community-x86_64/PKGBUILD (from rev 363216, freeciv/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-07-23 21:33:42 UTC (rev 363217)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=freeciv
+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/"
+license=('GPL')
+depends=('gtk3' 'lua' 'sqlite' 'curl')
+makedepends=('python')
+backup=('etc/freeciv/database.lua')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('19b5181e3e9e40b31332c79a2226fbcc3706a9c2')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-shared --enable-sys-lua \
+    --enable-client=gtk3 --enable-fcmp=gtk3 --enable-fcdb=sqlite3 --enable-aimodules
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}

Deleted: lua52_compat.patch
===================================================================
--- lua52_compat.patch	2018-07-23 21:33:17 UTC (rev 363216)
+++ lua52_compat.patch	2018-07-23 21:33:42 UTC (rev 363217)
@@ -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