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

[Anatol Pomozov]

    Date: Saturday, May 9, 2015 @ 06:45:40
  Author: anatolik
Revision: 238743

Lua 5.3 rebuild

Current version is incompatible with lua5.3 thus depend/rebuild against lua5.2

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-09 04:22:10 UTC (rev 238742)
+++ PKGBUILD	2015-05-09 04:45:40 UTC (rev 238743)
@@ -3,17 +3,25 @@
 
 pkgname=freeciv
 pkgver=2.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
 arch=('i686' 'x86_64')
 url="http://www.freeciv.org/"
 license=('GPL')
-depends=('gtk2' 'sdl_mixer' 'lua' 'sqlite' 'curl' 'libltdl')
+depends=('gtk2' 'sdl_mixer' 'lua52' 'sqlite' 'curl' 'libltdl')
 backup=('etc/freeciv/database.lua')
 install=freeciv.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('477b60e02606e47b31a019b065353c1a6da6c305')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        lua52_compat.patch)
+sha1sums=('477b60e02606e47b31a019b065353c1a6da6c305'
+          '248f4c8b62557677bf27a0d06feb15148d811ce7')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 < "$srcdir"/lua52_compat.patch
+  ./autogen.sh
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --enable-shared --enable-sys-lua \

Added: lua52_compat.patch
===================================================================
--- lua52_compat.patch	                        (rev 0)
+++ lua52_compat.patch	2015-05-09 04:45:40 UTC (rev 238743)
@@ -0,0 +1,13 @@
+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