summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoractionless2020-08-09 11:56:28 +0200
committeractionless2020-08-09 11:56:28 +0200
commitfe84ddff151bbf8d6149c5b99c756e4375a8f9d1 (patch)
treef83e9514375236305ae217098522f1d361c47faa
parenta4cf25704576f769ea5fef3b42c37cf5d917bd9a (diff)
downloadaur-fe84ddff151bbf8d6149c5b99c756e4375a8f9d1.tar.gz
force to use lua5.3 (5.4 seems broken)
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
2 files changed, 11 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8475a1ceeb5b..b38ad9f9cb11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = awesome-git
pkgdesc = Highly configurable framework window manager
- pkgver = 4.3.318.g6101ef51
+ pkgver = 4.3.862.g7a759432d
pkgrel = 1
url = http://awesome.naquadah.org/
arch = i686
@@ -18,8 +18,8 @@ pkgbase = awesome-git
depends = gdk-pixbuf2
depends = libxdg-basedir
depends = libxkbcommon-x11
- depends = lua
- depends = lua-lgi
+ depends = lua53
+ depends = lua53-lgi
depends = pango
depends = startup-notification
depends = xcb-util-cursor
diff --git a/PKGBUILD b/PKGBUILD
index 55c88779907f..c63b69b09b6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,14 +10,14 @@
_pkgname=awesome
pkgname=${_pkgname}-git
-pkgver=4.3.318.g6101ef51
+pkgver=4.3.862.g7a759432d
pkgrel=1
pkgdesc='Highly configurable framework window manager'
arch=('i686' 'x86_64')
url='http://awesome.naquadah.org/'
license=('GPL2')
depends=('cairo' 'dbus' 'gdk-pixbuf2' 'libxdg-basedir' 'libxkbcommon-x11'
- 'lua' 'lua-lgi' 'pango' 'startup-notification' 'xcb-util-cursor'
+ 'lua53' 'lua53-lgi' 'pango' 'startup-notification' 'xcb-util-cursor'
'xcb-util-keysyms' 'xcb-util-wm' 'xcb-util-xrm' 'libxfixes')
makedepends=('asciidoc' 'cmake' 'docbook-xsl' 'git' 'imagemagick' 'ldoc'
'xmlto')
@@ -31,6 +31,7 @@ conflicts=('awesome')
backup=('etc/xdg/awesome/rc.lua')
source=("$pkgname::git+https://github.com/awesomeWM/awesome.git")
md5sums=('SKIP')
+_LUA=5.3
pkgver() {
cd $pkgname
@@ -39,6 +40,9 @@ pkgver() {
prepare() {
mkdir -p build
+ cd $pkgname
+ sed -i "s/COMMAND lua\b/COMMAND lua${_LUA}/" awesomeConfig.cmake tests/examples/CMakeLists.txt
+ sed -i "s/LUA_COV_RUNNER lua\b/LUA_COV_RUNNER lua${_LUA}/" tests/examples/CMakeLists.txt
}
build() {
@@ -47,7 +51,8 @@ build() {
-DCMAKE_BUILD_TYPE=RELEASE \
-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONFDIR=/etc \
- -DLUA_LIBRARY=/usr/lib/liblua.so.5.3
+ -DLUA_INCLUDE_DIR=/usr/include/lua${_LUA} \
+ -DLUA_LIBRARY=/usr/lib/liblua.so."$_LUA"
make
}