From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/, x11-wm/awesome/files/
Date: Thu, 11 Jul 2019 20:57:37 +0000 (UTC) [thread overview]
Message-ID: <1562878580.ede3b5b2ac4e45b09943fec7c9c741e719af3988.robbat2@gentoo> (raw)
commit: ede3b5b2ac4e45b09943fec7c9c741e719af3988
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 8 21:21:43 2019 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 20:56:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ede3b5b2
x11-wm/awesome: slotted lua5.1 for awesome-3.5
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
x11-wm/awesome/awesome-3.5.9-r2.ebuild | 9 +++-
.../awesome/files/awesome-3.5.9-slotted-lua.patch | 51 ++++++++++++++++++++++
2 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/x11-wm/awesome/awesome-3.5.9-r2.ebuild b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
index 0a13897d09e..31b4a95fd88 100644
--- a/x11-wm/awesome/awesome-3.5.9-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -14,7 +14,7 @@ KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
IUSE="dbus doc elibc_FreeBSD gnome"
COMMON_DEPEND="
- >=dev-lang/lua-5.1:0
+ || ( >=dev-lang/lua-5.1:0 dev-lang/lua:5.1 )
dev-libs/glib:2
>=dev-libs/libxdg-basedir-1
>=dev-lua/lgi-0.7
@@ -53,13 +53,18 @@ PATCHES=(
"${FILESDIR}/${PN}-xsession.patch"
"${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
"${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
+ "${FILESDIR}/${PN}-3.5.9-slotted-lua.patch"
)
src_configure() {
+ has_version 'dev-lang/lua:5.1' \
+ && LUA=lua5.1 \
+ || LUA=lua
mycmakeargs=(
-DSYSCONFDIR="${EPREFIX}"/etc
$(cmake-utils_use_with dbus DBUS)
$(cmake-utils_use doc GENERATE_DOC)
+ -DLUA_EXECUTABLE="${EPREFIX}"/usr/bin/${LUA}
)
cmake-utils_src_configure
diff --git a/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch b/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch
new file mode 100644
index 00000000000..67f0d9810f4
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch
@@ -0,0 +1,51 @@
+diff -Nuar awesome-3.5.9.orig/build-utils/lgi-check.sh awesome-3.5.9/build-utils/lgi-check.sh
+--- awesome-3.5.9.orig/build-utils/lgi-check.sh 2016-03-06 14:05:54.000000000 +0000
++++ awesome-3.5.9/build-utils/lgi-check.sh 2019-01-23 21:36:35.973967623 +0000
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+
++LUA=${LUA:=lua}
++
+ die()
+ {
+ exec >&2
+@@ -22,11 +24,11 @@
+ }
+
+ # Check if we have lgi
+-lua -e 'require("lgi")' || die
++$LUA -e 'require("lgi")' || die
+
+ # Check the version number
+ # Keep this in sync with lib/gears/surface.lua.in!
+-lua -e 'if tonumber(string.match(require("lgi.version"), "(%d%.%d)")) < 0.7 then error("lgi too old, need at least version 0.7.0") end' || die
++$LUA -e 'if tonumber(string.match(require("lgi.version"), "(%d%.%d)")) < 0.7 then error("lgi too old, need at least version 0.7.0") end' || die
+
+ # Check for the needed gi files
+-lua -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo)' || die
++$LUA -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo)' || die
+diff -Nuar awesome-3.5.9.orig/awesomeConfig.cmake awesome-3.5.9/awesomeConfig.cmake
+--- awesome-3.5.9.orig/awesomeConfig.cmake 2019-01-23 22:01:17.364046606 +0000
++++ awesome-3.5.9/awesomeConfig.cmake 2019-01-23 21:50:30.152919084 +0000
+@@ -66,6 +66,7 @@
+ include(FindPkgConfig)
+ # lua 5.1
+ include(FindLua51)
++set(ENV{LUA} "${LUA_EXECUTABLE}")
+ # }}}
+
+ # {{{ Check if documentation can be build
+diff -Nuar awesome-3.5.9.orig/CMakeLists.txt awesome-3.5.9/CMakeLists.txt
+--- awesome-3.5.9.orig/CMakeLists.txt 2016-03-06 14:05:54.000000000 +0000
++++ awesome-3.5.9/CMakeLists.txt 2019-01-23 22:00:08.715111414 +0000
+@@ -105,7 +105,9 @@
+
+ # check for lgi and the needed gobject introspection files
+ add_custom_target(lgi-check ALL
+- COMMAND ${SOURCE_DIR}/build-utils/lgi-check.sh)
++ COMMAND ${CMAKE_COMMAND} -E env LUA=${LUA_EXECUTABLE} ${SOURCE_DIR}/build-utils/lgi-check.sh
++ COMMENT "Verifying LGI module")
++# VERBATIM)
+
+ # atoms
+ file(MAKE_DIRECTORY ${BUILD_DIR}/common)
next reply other threads:[~2019-07-11 20:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-11 20:57 Robin H. Johnson [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-20 10:13 [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/, x11-wm/awesome/files/ David Seifert
2021-01-21 21:17 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1562878580.ede3b5b2ac4e45b09943fec7c9c741e719af3988.robbat2@gentoo \
--to=robbat2@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox