Date: Sunday, August 20, 2017 @ 18:53:31 Author: arojas Revision: 302938
archrelease: copy trunk to extra-i686, extra-x86_64 Added: freeciv/repos/extra-i686/PKGBUILD (from rev 302937, freeciv/trunk/PKGBUILD) freeciv/repos/extra-i686/lua52_compat.patch (from rev 302937, freeciv/trunk/lua52_compat.patch) freeciv/repos/extra-x86_64/PKGBUILD (from rev 302937, freeciv/trunk/PKGBUILD) freeciv/repos/extra-x86_64/lua52_compat.patch (from rev 302937, freeciv/trunk/lua52_compat.patch) Deleted: freeciv/repos/extra-i686/PKGBUILD freeciv/repos/extra-i686/lua52_compat.patch freeciv/repos/extra-x86_64/PKGBUILD freeciv/repos/extra-x86_64/lua52_compat.patch ---------------------------------+ /PKGBUILD | 70 ++++++++++++++++++++++++++++++++++++++ /lua52_compat.patch | 26 ++++++++++++++ extra-i686/PKGBUILD | 35 ------------------- extra-i686/lua52_compat.patch | 13 ------- extra-x86_64/PKGBUILD | 35 ------------------- extra-x86_64/lua52_compat.patch | 13 ------- 6 files changed, 96 insertions(+), 96 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-08-20 18:52:50 UTC (rev 302937) +++ extra-i686/PKGBUILD 2017-08-20 18:53:31 UTC (rev 302938) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=freeciv -pkgver=2.5.8 -pkgrel=1 -pkgdesc="A multiuser clone of the famous Microprose game of Civilization" -arch=('i686' '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=('713b8409877d95677ce3fb72899137803a43af31' - '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/extra-i686/PKGBUILD (from rev 302937, freeciv/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-08-20 18:53:31 UTC (rev 302938) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=freeciv +pkgver=2.5.9 +pkgrel=1 +pkgdesc="A multiuser clone of the famous Microprose game of Civilization" +arch=('i686' '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=('4fe9d83fcfdbd5afbf17816974aa0395c729fc96' + '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 +} Deleted: extra-i686/lua52_compat.patch =================================================================== --- extra-i686/lua52_compat.patch 2017-08-20 18:52:50 UTC (rev 302937) +++ extra-i686/lua52_compat.patch 2017-08-20 18:53:31 UTC (rev 302938) @@ -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 Copied: freeciv/repos/extra-i686/lua52_compat.patch (from rev 302937, freeciv/trunk/lua52_compat.patch) =================================================================== --- extra-i686/lua52_compat.patch (rev 0) +++ extra-i686/lua52_compat.patch 2017-08-20 18:53:31 UTC (rev 302938) @@ -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 Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2017-08-20 18:52:50 UTC (rev 302937) +++ extra-x86_64/PKGBUILD 2017-08-20 18:53:31 UTC (rev 302938) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=freeciv -pkgver=2.5.8 -pkgrel=1 -pkgdesc="A multiuser clone of the famous Microprose game of Civilization" -arch=('i686' '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=('713b8409877d95677ce3fb72899137803a43af31' - '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/extra-x86_64/PKGBUILD (from rev 302937, freeciv/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-08-20 18:53:31 UTC (rev 302938) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=freeciv +pkgver=2.5.9 +pkgrel=1 +pkgdesc="A multiuser clone of the famous Microprose game of Civilization" +arch=('i686' '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=('4fe9d83fcfdbd5afbf17816974aa0395c729fc96' + '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 +} Deleted: extra-x86_64/lua52_compat.patch =================================================================== --- extra-x86_64/lua52_compat.patch 2017-08-20 18:52:50 UTC (rev 302937) +++ extra-x86_64/lua52_compat.patch 2017-08-20 18:53:31 UTC (rev 302938) @@ -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 Copied: freeciv/repos/extra-x86_64/lua52_compat.patch (from rev 302937, freeciv/trunk/lua52_compat.patch) =================================================================== --- extra-x86_64/lua52_compat.patch (rev 0) +++ extra-x86_64/lua52_compat.patch 2017-08-20 18:53:31 UTC (rev 302938) @@ -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