[arch-commits] Commit in awesome/trunk (PKGBUILD)

[Felix Yan]

    Date: Friday, July 31, 2020 @ 14:34:51
  Author: felixonmars
Revision: 666195

upgpkg: awesome 4.3-2: rebuild for lua 5.4

Modified:
  awesome/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-31 14:32:46 UTC (rev 666194)
+++ PKGBUILD	2020-07-31 14:34:51 UTC (rev 666195)
@@ -8,15 +8,15 @@
 
 pkgname=awesome
 pkgver=4.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Highly configurable framework window manager'
 url='https://awesomewm.org/'
 arch=('x86_64')
 license=('GPL2')
-depends=('cairo' 'dbus' 'gdk-pixbuf2' 'imlib2' 'libxdg-basedir' 'lua' 'lua-lgi' 'pango'
+depends=('cairo' 'dbus' 'gdk-pixbuf2' 'imlib2' 'libxdg-basedir' 'lua53' 'lua53-lgi' 'pango'
          'startup-notification' 'xcb-util-cursor' 'xcb-util-keysyms' 'xcb-util-wm'
          'xorg-xmessage' 'libxkbcommon-x11' 'libxkbcommon' 'xcb-util-xrm')
-makedepends=('asciidoc' 'cmake' 'docbook-xsl' 'doxygen' 'imagemagick' 'ldoc' 'xmlto')
+makedepends=('asciidoc' 'cmake' 'docbook-xsl' 'doxygen' 'imagemagick' 'ldoc' 'xmlto' 'ttf-font')
 optdepends=('rlwrap: readline support for awesome-client'
             'dex: autostart your desktop files'
             'vicious: widgets for the Awesome window manager')
@@ -29,16 +29,22 @@
 
 prepare() {
   cd ${pkgname}-${pkgver}
+  sed -i 's/COMMAND lua /COMMAND lua5.3 /' awesomeConfig.cmake
+  sed -i 's| lua | lua5.3 |;s/lua)/lua5.3)/' tests/examples/CMakeLists.txt
+  sed -i '1s|/usr/bin/env lua$|/usr/bin/env lua5.3|' build-utils/check_for_invalid_requires.lua
+  sed -i 's/"lua"/"lua5.3"/' tests/test-spawn.lua
   mkdir -p build
 }
 
 build() {
   cd ${pkgname}-${pkgver}/build
+  CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
   cmake .. \
     -DCMAKE_BUILD_TYPE=RELEASE \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONFDIR=/etc \
-    -DLUA_LIBRARY=/usr/lib/liblua.so
+    -DLUA_LIBRARY=/usr/lib/liblua5.3.so \
+    -DLUA_INCLUDE_DIR=/usr/include/lua5.3
   make
 }