* [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/, x11-wm/awesome/files/
@ 2019-07-11 20:57 Robin H. Johnson
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson @ 2019-07-11 20:57 UTC (permalink / raw
To: gentoo-commits
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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/, x11-wm/awesome/files/
@ 2021-01-20 10:13 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2021-01-20 10:13 UTC (permalink / raw
To: gentoo-commits
commit: 71f9ebdc417560bcb3322f029ef3fff48389eadb
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Jan 20 10:12:47 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 10:12:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71f9ebdc
x11-wm/awesome: Remove old
Bug: https://bugs.gentoo.org/763861
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
x11-wm/awesome/awesome-4.3-r2.ebuild | 139 ---------------------
.../files/awesome-3.5.5-cflag-cleanup.patch | 12 --
.../awesome-3.5.5-util.lua-xdg-icons-fix.patch | 46 -------
.../awesome/files/awesome-3.5.9-slotted-lua.patch | 51 --------
.../files/awesome-3.5_rc1-convert-path.patch | 12 --
5 files changed, 260 deletions(-)
diff --git a/x11-wm/awesome/awesome-4.3-r2.ebuild b/x11-wm/awesome/awesome-4.3-r2.ebuild
deleted file mode 100644
index c402663215f..00000000000
--- a/x11-wm/awesome/awesome-4.3-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop pax-utils
-
-if [[ ${PV} == *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git"
-else
- SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
- KEYWORDS="amd64 arm ppc ppc64 x86"
-fi
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="https://awesomewm.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dbus doc gnome luajit test"
-RESTRICT="test" # https://bugs.gentoo.org/654084
-
-RDEPEND="
- dev-lang/lua:0
- dev-libs/glib:2
- dev-libs/libxdg-basedir
- dev-lua/lgi
- x11-libs/cairo[X,xcb(+)]
- x11-libs/gdk-pixbuf:2
- x11-libs/libxcb[xkb]
- x11-libs/pango[introspection]
- x11-libs/startup-notification
- x11-libs/xcb-util
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-wm
- x11-libs/xcb-util-xrm
- x11-libs/libXcursor
- x11-libs/libxkbcommon[X]
- x11-libs/libX11
- dbus? ( sys-apps/dbus )
- luajit? ( dev-lang/luajit:2 )
-"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${RDEPEND}
- x11-base/xcb-proto
- x11-base/xorg-proto
- test? (
- x11-base/xorg-server[xvfb]
- dev-lua/busted
- dev-lua/luacheck
- )
-"
-BDEPEND="
- app-text/asciidoc
- media-gfx/imagemagick[png]
- virtual/pkgconfig
- doc? ( dev-lua/ldoc )
- test? ( app-shells/zsh )"
-
-# Skip installation of README.md by einstalldocs, which leads to broken symlink
-DOCS=()
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0-convert-path.patch # bug #408025
- "${FILESDIR}"/${PN}-xsession.patch # bug #408025
- "${FILESDIR}"/${PN}-4.0-cflag-cleanup.patch # bug #509658
- "${FILESDIR}"/${P}-fno-common.patch # bug #707262
-)
-
-src_configure() {
- # Compression of manpages is handled by portage
- local mycmakeargs=(
- -DSYSCONFDIR="${EPREFIX}"/etc
- -DCOMPRESS_MANPAGES=OFF
- -DWITH_DBUS=$(usex dbus)
- -DGENERATE_DOC=$(usex doc)
- -DAWESOME_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
- )
- if use luajit; then
- mycmakeargs+=("-DLUA_INCLUDE_DIR=${EPREFIX}/usr/include/luajit-2.0")
- mycmakeargs+=("-DLUA_LIBRARY=${EPREFIX}/usr/$(get_libdir)/libluajit-5.1.so")
- fi
- cmake_src_configure
-}
-
-src_test() {
- # awesome's test suite starts Xvfb by itself, no need for virtualx eclass
- HEADLESS=1 cmake_build check -j1
-}
-
-src_install() {
- cmake_src_install
- rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
-
- pax-mark m "${ED}"/usr/bin/awesome
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN}
-
- # GNOME-based awesome
- if use gnome; then
- # GNOME session
- insinto /usr/share/gnome-session/sessions
- newins "${FILESDIR}"/${PN}-gnome-3.session ${PN}-gnome.session
-
- # Application launcher
- domenu "${FILESDIR}"/${PN}-gnome.desktop
-
- # X Session
- insinto /usr/share/xsessions
- doins "${FILESDIR}"/${PN}-gnome-xsession.desktop
- fi
-
- # This directory contains SVG images which we don't want to compress
- use doc && docompress -x /usr/share/doc/${PF}/doc
-}
-
-pkg_postinst() {
- # bug #447308
- if use gnome; then
- elog "You have enabled the gnome USE flag."
- elog "Please note that quitting awesome won't kill your gnome session."
- elog "To really quit the session, you should bind your quit key"
- elog "to the following command:"
- elog " gnome-session-quit --logout"
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=447308"
- fi
-
- # bug #440724
- elog "If you are having issues with Java application windows being"
- elog "completely blank, try installing"
- elog " x11-misc/wmname"
- elog "and setting the WM name to LG3D."
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=440724"
-}
diff --git a/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch b/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch
deleted file mode 100644
index 3cfeaba2df3..00000000000
--- a/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u awesome-3.5.5/awesomeConfig.cmake awesome-3.5.5.new/awesomeConfig.cmake
---- awesome-3.5.5/awesomeConfig.cmake 2014-08-24 23:28:04.178646000 -0400
-+++ awesome-3.5.5.new/awesomeConfig.cmake 2014-08-24 23:28:44.204646000 -0400
-@@ -16,7 +16,7 @@
- option(GENERATE_DOC "generate API documentation" ON)
-
- # {{{ CFLAGS
--add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra
-+add_definitions(-std=gnu99 -fno-strict-aliasing -Wall -Wextra
- -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings
- -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self
- -Wpointer-arith -Wformat-nonliteral
diff --git a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch b/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch
deleted file mode 100644
index 588f9ab9ec5..00000000000
--- a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Uli Schlachter <psychon@znc.in>
-Date: Sat, 12 Apr 2014 14:15:11 +0000 (+0200)
-Subject: Merge git://github.com/Teknocrat/awesome
-X-Git-Url: http://git.naquadah.org/?p=awesome.git;a=commitdiff_plain;h=d76d3e0b6a00b8b289b3801ba197e0dae732a92d;hp=1090719d677c86e90a1394a34f0effb418728493
-
-Merge git://github.com/Teknocrat/awesome
----
-
-diff --git a/lib/awful/util.lua.in b/lib/awful/util.lua.in
-index 1d35f2f..123c4a6 100644
---- a/lib/awful/util.lua.in
-+++ b/lib/awful/util.lua.in
-@@ -185,21 +185,24 @@ end
- -- of the dirs are searched first
- function util.geticonpath(iconname, exts, dirs, size)
- exts = exts or { 'png', 'gif' }
-- dirs = dirs or { '/usr/share/pixmaps/' }
-+ dirs = dirs or { '/usr/share/pixmaps/', '/usr/share/icons/hicolor/' }
-+ icontypes = { 'apps', 'actions', 'categories', 'emblems',
-+ 'mimetypes', 'status', 'devices', 'extras', 'places', 'stock' }
- for _, d in pairs(dirs) do
-+ local icon
- for _, e in pairs(exts) do
-- local icon
-- if size then
-- icon = string.format("%s%ux%u/%s.%s",
-- d, size, size, iconname, e)
-- if util.file_readable(icon) then
-- return icon
-- end
-- end
- icon = d .. iconname .. '.' .. e
- if util.file_readable(icon) then
- return icon
- end
-+ if size then
-+ for _, t in pairs(icontypes) do
-+ icon = string.format("%s%ux%u/%s/%s.%s", d, size, size, t, iconname, e)
-+ if util.file_readable(icon) then
-+ return icon
-+ end
-+ end
-+ end
- end
- end
- end
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
deleted file mode 100644
index 67f0d9810f4..00000000000
--- a/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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)
diff --git a/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch b/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch
deleted file mode 100644
index e6c37b0f9c7..00000000000
--- a/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar --exclude '*.orig' awesome-3.5-rc1.orig/awesomeConfig.cmake awesome-3.5-rc1/awesomeConfig.cmake
---- awesome-3.5-rc1.orig/awesomeConfig.cmake 2012-11-24 13:51:33.000000000 +0000
-+++ awesome-3.5-rc1/awesomeConfig.cmake 2012-11-24 20:42:23.743412441 +0000
-@@ -56,7 +56,7 @@
- a_find_program(LUA_EXECUTABLE lua FALSE)
- a_find_program(LDOC_EXECUTABLE ldoc.lua FALSE)
- # theme graphics
--a_find_program(CONVERT_EXECUTABLE convert TRUE)
-+a_find_program(CONVERT_EXECUTABLE bin/convert TRUE)
- # doxygen
- include(FindDoxygen)
- # pkg-config
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/, x11-wm/awesome/files/
@ 2021-01-21 21:17 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-01-21 21:17 UTC (permalink / raw
To: gentoo-commits
commit: 1ac9115775ee4b38dc209ca67ea08bc2f6b19c6e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 21:14:41 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 21:17:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ac91157
x11-wm/awesome: cleanup old
Thanks-to: kurly
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/awesome/Manifest | 1 -
x11-wm/awesome/awesome-4.2-r3.ebuild | 141 ---------------------
.../files/awesome-3.5.5-cflag-cleanup.patch | 12 --
.../awesome-3.5.5-util.lua-xdg-icons-fix.patch | 46 -------
.../awesome/files/awesome-3.5.9-slotted-lua.patch | 51 --------
.../files/awesome-3.5_rc1-convert-path.patch | 12 --
6 files changed, 263 deletions(-)
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 26f45d52c32..d617392d176 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,2 +1 @@
-DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09
DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
diff --git a/x11-wm/awesome/awesome-4.2-r3.ebuild b/x11-wm/awesome/awesome-4.2-r3.ebuild
deleted file mode 100644
index df7e39ca9ef..00000000000
--- a/x11-wm/awesome/awesome-4.2-r3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop pax-utils versionator
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="https://awesomewm.org/"
-SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="dbus doc gnome luajit test"
-RESTRICT="test"
-
-RDEPEND="
- >=dev-lang/lua-5.1:0
- luajit? ( dev-lang/luajit:2 )
- dev-libs/glib:2
- >=dev-libs/libxdg-basedir-1
- >=dev-lua/lgi-0.8
- x11-libs/cairo[X,xcb(+)]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libxcb-1.6[xkb]
- >=x11-libs/pango-1.19.3[introspection]
- >=x11-libs/startup-notification-0.10_p20110426
- >=x11-libs/xcb-util-0.3.8
- x11-libs/xcb-util-cursor
- >=x11-libs/xcb-util-keysyms-0.3.4
- >=x11-libs/xcb-util-wm-0.3.8
- >=x11-libs/xcb-util-xrm-1.0
- x11-libs/libXcursor
- x11-libs/libxkbcommon[X]
- >=x11-libs/libX11-1.3.99.901
- dbus? ( >=sys-apps/dbus-1 )
-"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${RDEPEND}
- >=app-text/asciidoc-8.4.5
- app-text/xmlto
- dev-util/gperf
- virtual/pkgconfig
- media-gfx/imagemagick[png]
- >=x11-base/xcb-proto-1.5
- x11-base/xorg-proto
- doc? ( dev-lua/ldoc )
- test? (
- app-shells/zsh
- x11-base/xorg-server[xvfb]
- dev-lua/busted
- dev-lua/luacheck
- )
-"
-
-# Skip installation of README.md by einstalldocs, which leads to broken symlink
-DOCS=()
-PATCHES=(
- "${FILESDIR}/${PN}-4.0-convert-path.patch" # bug #408025
- "${FILESDIR}/${PN}-xsession.patch" # bug #408025
- "${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658
-)
-
-src_configure() {
- # Compression of manpages is handled by portage
- local mycmakeargs=(
- -DSYSCONFDIR="${EPREFIX}"/etc
- -DCOMPRESS_MANPAGES=OFF
- -DWITH_DBUS=$(usex dbus)
- -DGENERATE_DOC=$(usex doc)
- -DAWESOME_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
- )
- if use luajit; then
- mycmakeargs+=("-DLUA_INCLUDE_DIR=${EPREFIX}/usr/include/luajit-2.0")
- mycmakeargs+=("-DLUA_LIBRARY=${EPREFIX}/usr/$(get_libdir)/libluajit-5.1.so")
- fi
- cmake-utils_src_configure
-}
-
-src_test() {
- # awesome's test suite starts Xvfb by itself, no need for virtualx eclass
- HEADLESS=1 cmake-utils_src_make check -j1
-}
-
-src_install() {
- cmake-utils_src_install
- rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
-
- pax-mark m "${ED%/}"/usr/bin/awesome
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN}
-
- # GNOME-based awesome
- if use gnome; then
- # GNOME session
- insinto /usr/share/gnome-session/sessions
- newins "${FILESDIR}"/${PN}-gnome-3.session ${PN}-gnome.session
-
- # Application launcher
- domenu "${FILESDIR}"/${PN}-gnome.desktop
-
- # X Session
- insinto /usr/share/xsessions
- doins "${FILESDIR}"/${PN}-gnome-xsession.desktop
- fi
-
- # This directory contains SVG images which we don't want to compress
- use doc && docompress -x /usr/share/doc/${PF}/doc
-}
-
-pkg_postinst() {
- # bug #447308
- if use gnome; then
- elog "You have enabled the gnome USE flag."
- elog "Please note that quitting awesome won't kill your gnome session."
- elog "To really quit the session, you should bind your quit key"
- elog "to the following command:"
- elog " gnome-session-quit --logout"
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=447308"
- fi
-
- # bug #440724
- elog "If you are having issues with Java application windows being"
- elog "completely blank, try installing"
- elog " x11-misc/wmname"
- elog "and setting the WM name to LG3D."
- elog "For more info visit"
- elog " https://bugs.gentoo.org/show_bug.cgi?id=440724"
-
- for v in ${REPLACING_VERSIONS}; do
- if [ "$(get_major_version ${v})" = "3" ]; then
- elog "Awesome-4 introduced breaking changes. For release notes and porting guide see"
- elog "https://awesomewm.org/apidoc/documentation/89-NEWS.md.html#v4 and"
- elog "https://awesomewm.org/apidoc/documentation/17-porting-tips.md.html#v4"
- fi
- done
-}
diff --git a/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch b/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch
deleted file mode 100644
index 3cfeaba2df3..00000000000
--- a/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u awesome-3.5.5/awesomeConfig.cmake awesome-3.5.5.new/awesomeConfig.cmake
---- awesome-3.5.5/awesomeConfig.cmake 2014-08-24 23:28:04.178646000 -0400
-+++ awesome-3.5.5.new/awesomeConfig.cmake 2014-08-24 23:28:44.204646000 -0400
-@@ -16,7 +16,7 @@
- option(GENERATE_DOC "generate API documentation" ON)
-
- # {{{ CFLAGS
--add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra
-+add_definitions(-std=gnu99 -fno-strict-aliasing -Wall -Wextra
- -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings
- -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self
- -Wpointer-arith -Wformat-nonliteral
diff --git a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch b/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch
deleted file mode 100644
index 588f9ab9ec5..00000000000
--- a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Uli Schlachter <psychon@znc.in>
-Date: Sat, 12 Apr 2014 14:15:11 +0000 (+0200)
-Subject: Merge git://github.com/Teknocrat/awesome
-X-Git-Url: http://git.naquadah.org/?p=awesome.git;a=commitdiff_plain;h=d76d3e0b6a00b8b289b3801ba197e0dae732a92d;hp=1090719d677c86e90a1394a34f0effb418728493
-
-Merge git://github.com/Teknocrat/awesome
----
-
-diff --git a/lib/awful/util.lua.in b/lib/awful/util.lua.in
-index 1d35f2f..123c4a6 100644
---- a/lib/awful/util.lua.in
-+++ b/lib/awful/util.lua.in
-@@ -185,21 +185,24 @@ end
- -- of the dirs are searched first
- function util.geticonpath(iconname, exts, dirs, size)
- exts = exts or { 'png', 'gif' }
-- dirs = dirs or { '/usr/share/pixmaps/' }
-+ dirs = dirs or { '/usr/share/pixmaps/', '/usr/share/icons/hicolor/' }
-+ icontypes = { 'apps', 'actions', 'categories', 'emblems',
-+ 'mimetypes', 'status', 'devices', 'extras', 'places', 'stock' }
- for _, d in pairs(dirs) do
-+ local icon
- for _, e in pairs(exts) do
-- local icon
-- if size then
-- icon = string.format("%s%ux%u/%s.%s",
-- d, size, size, iconname, e)
-- if util.file_readable(icon) then
-- return icon
-- end
-- end
- icon = d .. iconname .. '.' .. e
- if util.file_readable(icon) then
- return icon
- end
-+ if size then
-+ for _, t in pairs(icontypes) do
-+ icon = string.format("%s%ux%u/%s/%s.%s", d, size, size, t, iconname, e)
-+ if util.file_readable(icon) then
-+ return icon
-+ end
-+ end
-+ end
- end
- end
- end
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
deleted file mode 100644
index 67f0d9810f4..00000000000
--- a/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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)
diff --git a/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch b/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch
deleted file mode 100644
index e6c37b0f9c7..00000000000
--- a/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar --exclude '*.orig' awesome-3.5-rc1.orig/awesomeConfig.cmake awesome-3.5-rc1/awesomeConfig.cmake
---- awesome-3.5-rc1.orig/awesomeConfig.cmake 2012-11-24 13:51:33.000000000 +0000
-+++ awesome-3.5-rc1/awesomeConfig.cmake 2012-11-24 20:42:23.743412441 +0000
-@@ -56,7 +56,7 @@
- a_find_program(LUA_EXECUTABLE lua FALSE)
- a_find_program(LDOC_EXECUTABLE ldoc.lua FALSE)
- # theme graphics
--a_find_program(CONVERT_EXECUTABLE convert TRUE)
-+a_find_program(CONVERT_EXECUTABLE bin/convert TRUE)
- # doxygen
- include(FindDoxygen)
- # pkg-config
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-21 21:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-20 10:13 [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/, x11-wm/awesome/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-01-21 21:17 Sam James
2019-07-11 20:57 Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox