[arch-commits] Commit in freeciv/trunk (PKGBUILD lua52_compat.patch)

[Antonio Rojas]

    Date: Monday, July 23, 2018 @ 21:33:17
  Author: arojas
Revision: 363216

Update to 2.6.0

Modified:
  freeciv/trunk/PKGBUILD
Deleted:
  freeciv/trunk/lua52_compat.patch

--------------------+
 PKGBUILD           |   16 ++++------------
 lua52_compat.patch |   13 -------------
 2 files changed, 4 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-23 21:28:17 UTC (rev 363215)
+++ PKGBUILD	2018-07-23 21:33:17 UTC (rev 363216)
@@ -2,26 +2,18 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=freeciv
-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/"
 license=('GPL')
-depends=('gtk3' 'sdl_mixer' 'lua52' 'sqlite' 'curl' 'libtool')
+depends=('gtk3' 'lua' 'sqlite' 'curl')
 makedepends=('python')
 backup=('etc/freeciv/database.lua')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        lua52_compat.patch)
-sha1sums=('de95ab1132d022f3cf47a033447a0d745c4c249d'
-          '248f4c8b62557677bf27a0d06feb15148d811ce7')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('19b5181e3e9e40b31332c79a2226fbcc3706a9c2')
 
-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 \

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