summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStelios Tsampas2020-08-07 14:12:34 +0300
committerStelios Tsampas2020-08-07 14:12:34 +0300
commitc30f198e62a8b921a93cf938e1321ae2a384ccd2 (patch)
treea28f8d9eb01d1c6813b8e1bae62ccb27ee73a192
parentb429b6384b5023be08ad287d2af6280f401e3ce0 (diff)
downloadaur-c30f198e62a8b921a93cf938e1321ae2a384ccd2.tar.gz
Fix build on GCC 10
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD11
2 files changed, 9 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6b87368fd8b2..f0ab74e845a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = awesome-luajit
pkgdesc = Highly configurable framework window manager
pkgver = 4.3
- pkgrel = 1
+ pkgrel = 2
url = https://awesomewm.org/
arch = x86_64
license = GPL2
@@ -12,6 +12,7 @@ pkgbase = awesome-luajit
makedepends = imagemagick
makedepends = ldoc
makedepends = xmlto
+ makedepends = ttf-font
depends = cairo
depends = dbus
depends = gdk-pixbuf2
diff --git a/PKGBUILD b/PKGBUILD
index b1b207624688..68d9711ac8bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
pkgname=awesome-luajit
pkgver=4.3
-pkgrel=1
+pkgrel=2
pkgdesc='Highly configurable framework window manager'
url='https://awesomewm.org/'
arch=('x86_64')
@@ -17,7 +17,7 @@ license=('GPL2')
depends=('cairo' 'dbus' 'gdk-pixbuf2' 'imlib2' 'libxdg-basedir' 'luajit' 'luajit-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')
@@ -31,13 +31,16 @@ validpgpkeys=('2BB32F88FF3D1E76E682303F22E428EBCB8FCB06') # Uli Schlachter <psyc
prepare() {
cd awesome-${pkgver}
- sed -i 's/COMMAND lua\b/COMMAND luajit/' awesomeConfig.cmake tests/examples/CMakeLists.txt
- sed -i 's/LUA_COV_RUNNER lua\b/LUA_COV_RUNNER luajit/' tests/examples/CMakeLists.txt
+ sed -i 's/COMMAND lua /COMMAND luajit /' awesomeConfig.cmake
+ sed -i 's| lua | luajit |;s/lua)/luajit)/' tests/examples/CMakeLists.txt
+ sed -i '1s|/usr/bin/env lua$|/usr/bin/env luajit|' build-utils/check_for_invalid_requires.lua
+ sed -i 's/"lua"/"luajit"/' tests/test-spawn.lua
mkdir -p build
}
build() {
cd awesome-${pkgver}/build
+ CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
cmake .. \
-DCMAKE_BUILD_TYPE=RELEASE \
-DCMAKE_INSTALL_PREFIX=/usr \