summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2016-06-17 21:36:34 +0200
committerNicolas Iooss2016-06-17 21:36:34 +0200
commit253d319b723a50394284b0aaae8dad279f10fb16 (patch)
tree5788a3093b3d72d363c3898228625a517439ae05
parent4f1ba6bbd688961f6890d4ad48cf48adafaf3911 (diff)
downloadaur-253d319b723a50394284b0aaae8dad279f10fb16.tar.gz
funguloids 1.06.4-8 update: fix lua51 dependency
Since commit https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/lua51&id=d46f4b70dab932996805f93dd386417b86021eb2 lua51 installed its pkg-config file as "lua51.pc" instead of "lua5.1.pc". Update the Lua detection logic.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--funguloids-lua.patch7
3 files changed, 9 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f14dc3feb039..4ada8c3475c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = funguloids
pkgdesc = 3D game about collecting mushrooms in outerspace
pkgver = 1.06.4
- pkgrel = 7
+ pkgrel = 8
url = http://funguloids.sourceforge.net/
arch = i686
arch = x86_64
@@ -36,7 +36,7 @@ pkgbase = funguloids
sha256sums = 107a0eec5efb2eea99c86d7dad91e28a20ca1f35d4f5eda067ae64c88c9d0304
sha256sums = eb5c821adbc9e6d93f6a78cb40a661e97ffa67eb6ab346913318cbcf3bc66083
sha256sums = 12a8cd48b299d9a7de74a9bdae429a4a2489ee8357e9af935e89bf5f417ff157
- sha256sums = 2f184587b549315b5a76c77253366d6b4154bf25b8804056ec67736531d813a3
+ sha256sums = 59de5a0e12cb6575facd0d13d6b28b2d2a1bbfdcdf32dadf0c962c276e961c01
sha256sums = a70e2a40b19f3e0e3c44aa8fa41d866854ce21d111decce1d43f8fba04f7a16c
sha256sums = 334831c41160457a4b0162bab349ba77570bbcc0b8e8c63a8e01e8a50c40bd48
sha256sums = 4ed88c6502601d684fd7e85dbe33684e36669bdf65583f782b24ddd596dcaf3c
diff --git a/PKGBUILD b/PKGBUILD
index ed65ea080704..2796db19b13e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
-# Maintainer: Nicolas Iooss <nicolas.iooss_aur at m4x.org
+# Maintainer: Nicolas Iooss <nicolas.iooss_aur at m4x.org>
# Contributor: Dany Martineau <dany.luc.martineau at gmail.com>
pkgname=funguloids
pkgver=1.06.4
_realver=1.06-4
-pkgrel=7
+pkgrel=8
pkgdesc="3D game about collecting mushrooms in outerspace"
arch=('i686' 'x86_64')
url="http://funguloids.sourceforge.net/"
@@ -31,7 +31,7 @@ sha256sums=('e9c9074a5d2de11690484a7e8eef7de9dd7d360ea72185ea35c54976646ef5cf'
'107a0eec5efb2eea99c86d7dad91e28a20ca1f35d4f5eda067ae64c88c9d0304'
'eb5c821adbc9e6d93f6a78cb40a661e97ffa67eb6ab346913318cbcf3bc66083'
'12a8cd48b299d9a7de74a9bdae429a4a2489ee8357e9af935e89bf5f417ff157'
- '2f184587b549315b5a76c77253366d6b4154bf25b8804056ec67736531d813a3'
+ '59de5a0e12cb6575facd0d13d6b28b2d2a1bbfdcdf32dadf0c962c276e961c01'
'a70e2a40b19f3e0e3c44aa8fa41d866854ce21d111decce1d43f8fba04f7a16c'
'334831c41160457a4b0162bab349ba77570bbcc0b8e8c63a8e01e8a50c40bd48'
'4ed88c6502601d684fd7e85dbe33684e36669bdf65583f782b24ddd596dcaf3c'
diff --git a/funguloids-lua.patch b/funguloids-lua.patch
index 7762533e6eab..e7651c081d0b 100644
--- a/funguloids-lua.patch
+++ b/funguloids-lua.patch
@@ -1,6 +1,6 @@
--- configure.ac
+++ configure.ac
-@@ -47,30 +47,11 @@
+@@ -47,30 +47,13 @@
# LUA ----------------------------------------------------
@@ -20,10 +20,11 @@
- PKG_CHECK_MODULES(LUA, [lua >= 5.1],[],[
- PKG_CHECK_MODULES(LUA, [lua5.1 >= 5.1],[],[
- AC_MSG_ERROR(Lua 5.1 not found. You can specify its location with [[--with-lua=/path/to/include/lua51]])
-- ])
+PKG_CHECK_MODULES(LUA, [lua >= 5.1, lua < 5.2],[],[
+ PKG_CHECK_MODULES(LUA, [lua5.1 >= 5.1],[],[
-+ AC_MSG_ERROR(Lua 5.1 not found)
++ PKG_CHECK_MODULES(LUA, [lua51 >= 5.1, lua51 < 5.2],[],[
++ AC_MSG_ERROR(Lua 5.1 not found)
+ ])
])
-else
- CFLAGS="$CFLAGS $FUNGU_FOUND_HEADER"