[gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/files/, x11-wm/awesome/
commit: 7ffeb29f4b379820371400733aba4005cfb91846
Author: Sam James gentoo org>
AuthorDate: Thu Jan 21 21:13:41 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 21 21:13:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ffeb29f
x11-wm/awesome: Revert "Remove old"
This reverts commit 71f9ebdc417560bcb3322f029ef3fff48389eadb.
This was meant to drop 4.2.x.
Signed-off-by: Sam James 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 insertions(+)
diff --git a/x11-wm/awesome/awesome-4.3-r2.ebuild
b/x11-wm/awesome/awesome-4.3-r2.ebuild
new file mode 100644
index 000..c402663215f
--- /dev/null
+++ b/x11-wm/awesome/awesome-4.3-r2.ebuild
@@ -0,0 +1,139 @@
+# 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} == * ]] ; 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
[gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/files/, x11-wm/awesome/
commit: ca44b49126e8b55af71ad6326d34830154c97c90
Author: Jakov Smolic sartura hr>
AuthorDate: Mon Dec 28 11:50:18 2020 +
Commit: David Seifert gentoo org>
CommitDate: Mon Dec 28 11:50:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca44b491
x11-wm/awesome: fix build with gcc-10
* Port to cmake eclass
* Minor additional cleanup
* Thanks to Jeroen Roovers for submitting the patch link and to Eddie
Chapman for providing the patch fix
Closes: https://bugs.gentoo.org/707262
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
...awesome-4.3-r1.ebuild => awesome-4.3-r2.ebuild} | 71 --
x11-wm/awesome/files/awesome-4.3-fno-common.patch | 69 ++---
2 files changed, 42 insertions(+), 98 deletions(-)
diff --git a/x11-wm/awesome/awesome-4.3-r1.ebuild
b/x11-wm/awesome/awesome-4.3-r2.ebuild
similarity index 72%
rename from x11-wm/awesome/awesome-4.3-r1.ebuild
rename to x11-wm/awesome/awesome-4.3-r2.ebuild
index c01581082c1..206d64b0eb2 100644
--- a/x11-wm/awesome/awesome-4.3-r1.ebuild
+++ b/x11-wm/awesome/awesome-4.3-r2.ebuild
@@ -3,65 +3,70 @@
EAPI=7
-inherit cmake-utils desktop pax-utils
+inherit cmake desktop pax-utils
+
+if [[ ${PV} == * ]] ; 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/";
-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"
+RESTRICT="test" # https://bugs.gentoo.org/654084
RDEPEND="
- >=dev-lang/lua-5.1:0
- luajit? ( dev-lang/luajit:2 )
+ dev-lang/lua:0
dev-libs/glib:2
- >=dev-libs/libxdg-basedir-1
- >=dev-lua/lgi-0.8
+ dev-libs/libxdg-basedir
+ dev-lua/lgi
x11-libs/cairo[X,xcb(+)]
- x11-libs/gdk-pixbuf:2[introspection]
- >=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/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-0.3.4
- >=x11-libs/xcb-util-wm-0.3.8
- >=x11-libs/xcb-util-xrm-1.0
+ 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-1.3.99.901
- dbus? ( >=sys-apps/dbus-1 )
+ x11-libs/libX11
+ dbus? ( sys-apps/dbus )
+ luajit? ( dev-lang/luajit:2 )
"
# 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/xcb-proto
x11-base/xorg-proto
- doc? ( dev-lua/ldoc )
test? (
- app-shells/zsh
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}/${PN}-4.3-fno-common.patch"# bug #707262
+ "${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() {
@@ -77,16 +82,16 @@ src_configure() {
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
+ cmake_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
+ HEADLESS=1 cmake_build check -j1
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
rm "${ED}"/usr/share/doc/${PF}/LICENSE ||
[gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/files/, x11-wm/awesome/
commit: 9ff59e69344b86713527434dab3c6c570c5e1470
Author: Sam James gentoo org>
AuthorDate: Sat Dec 26 21:32:48 2020 +
Commit: Sam James gentoo org>
CommitDate: Sat Dec 26 21:32:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff59e69
x11-wm/awesome: add -fno-common (gcc 10) patch
Thanks-to: Eddie Chapman ehuk.net>
Closes: https://bugs.gentoo.org/707262
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
x11-wm/awesome/awesome-4.3-r1.ebuild | 1 +
x11-wm/awesome/awesome-4.3-r100.ebuild| 1 +
x11-wm/awesome/files/awesome-4.3-fno-common.patch | 240 ++
3 files changed, 242 insertions(+)
diff --git a/x11-wm/awesome/awesome-4.3-r1.ebuild
b/x11-wm/awesome/awesome-4.3-r1.ebuild
index 64d00a31b10..5c0d71205ae 100644
--- a/x11-wm/awesome/awesome-4.3-r1.ebuild
+++ b/x11-wm/awesome/awesome-4.3-r1.ebuild
@@ -61,6 +61,7 @@ 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}/${PN}-4.3-fno-common.patch"# bug #707262
)
src_configure() {
diff --git a/x11-wm/awesome/awesome-4.3-r100.ebuild
b/x11-wm/awesome/awesome-4.3-r100.ebuild
index 56bd122ae47..0ce35e845bd 100644
--- a/x11-wm/awesome/awesome-4.3-r100.ebuild
+++ b/x11-wm/awesome/awesome-4.3-r100.ebuild
@@ -67,6 +67,7 @@ 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}/${PN}-4.3-fno-common.patch"# bug #707262
)
src_configure() {
diff --git a/x11-wm/awesome/files/awesome-4.3-fno-common.patch
b/x11-wm/awesome/files/awesome-4.3-fno-common.patch
new file mode 100644
index 000..9a77bf42a39
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-4.3-fno-common.patch
@@ -0,0 +1,240 @@
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0.patch
+https://bugs.gentoo.org/707262
+Rebased by Eddie Chapman
+
+From d256d9055095f27a33696e0aeda4ee20ed4fb1a0 Mon Sep 17 00:00:00 2001
+From: Reiner Herrmann
+Date: Fri, 17 Apr 2020 19:25:40 +0200
+Subject: [PATCH] Move variable declarations from header to C file to fix build
+ with GCC 10
+
+GCC 10 builds with -fno-common by default, which causes linker errors when
+variables are declared in header files and included in multiple places.
+
+See also: https://gcc.gnu.org/gcc-10/porting_to.html
+---
+ common/lualib.c | 2 ++
+ common/lualib.h | 2 +-
+ luaa.c | 2 ++
+ luaa.h | 2 +-
+ objects/button.c | 2 ++
+ objects/button.h | 2 +-
+ objects/client.c | 2 ++
+ objects/client.h | 2 +-
+ objects/drawin.c | 2 ++
+ objects/drawin.h | 2 +-
+ objects/key.c| 2 ++
+ objects/key.h| 2 +-
+ objects/tag.c| 2 ++
+ objects/tag.h| 2 +-
+ objects/window.c | 1 +
+ objects/window.h | 2 +-
+ 16 files changed, 23 insertions(+), 8 deletions(-)
+
+diff --git a/common/lualib.c b/common/lualib.c
+index 312fb2d594..bb110ac716 100644
+--- a/common/lualib.c
b/common/lualib.c
+@@ -20,6 +20,8 @@
+ #include "common/lualib.h"
+ #include "luaa.h"
+
++lua_CFunction lualib_dofunction_on_error;
++
+ void luaA_checkfunction(lua_State *L, int idx)
+ {
+ if(!lua_isfunction(L, idx))
+diff --git a/common/lualib.h b/common/lualib.h
+index 8a3ef089d7..a91261843c 100644
+--- a/common/lualib.h
b/common/lualib.h
+@@ -28,7 +28,7 @@
+ #include "common/util.h"
+
+ /** Lua function to call on dofunction() error */
+-lua_CFunction lualib_dofunction_on_error;
++extern lua_CFunction lualib_dofunction_on_error;
+
+ void luaA_checkfunction(lua_State *, int);
+ void luaA_checktable(lua_State *, int);
+diff --git a/luaa.c b/luaa.c
+index 419a8c2eb2..aeaba9cd1f 100644
+--- a/luaa.c
b/luaa.c
+@@ -91,6 +91,8 @@ extern const struct luaL_Reg awesome_mouse_meta[];
+ extern const struct luaL_Reg awesome_root_methods[];
+ extern const struct luaL_Reg awesome_root_meta[];
+
++signal_array_t global_signals;
++
+ /** A call into the Lua code aborted with an error.
+ *
+ * This signal is used in the example configuration, @{05-awesomerc.md},
+diff --git a/luaa.h b/luaa.h
+index e159258348..d26c437691 100644
+--- a/luaa.h
b/luaa.h
+@@ -317,7 +317,7 @@ const char *luaA_find_config(xdgHandle *, const char *,
luaA_config_callback *);
+ bool luaA_parserc(xdgHandle *, const char *);
+
+ /** Global signals */
+-signal_array_t global_signals;
++extern signal_array_t global_signals;
+
+ int luaA_class_index_miss_property(lua_State *, lua_object_t *);
+ int luaA_class_newindex_miss_property(lua_State *, lua_object_t *);
+diff --git a/objects/button.c b/objects/button.c
+index 892347a928..5ffdcd4432 100644
+--- a/objects/button.c
b/objects/button.c
+@@ -35,6 +35,8 @@
+
+ #include "button.h"
+
++lua_clas
[gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/files/, x11-wm/awesome/
commit: bf28b83fe393662d5322f0e8f07ee9bd82457e9b
Author: Johannes Huber gentoo org>
AuthorDate: Sat Jan 28 19:10:24 2017 +
Commit: Johannes Huber gentoo org>
CommitDate: Sat Jan 28 19:12:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf28b83f
x11-wm/awesome: Remove 3.5.6 (r1)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-wm/awesome/awesome-3.5.6-r1.ebuild | 133
x11-wm/awesome/files/awesome-glib-fix.patch | 13 ---
2 files changed, 146 deletions(-)
diff --git a/x11-wm/awesome/awesome-3.5.6-r1.ebuild
b/x11-wm/awesome/awesome-3.5.6-r1.ebuild
deleted file mode 100644
index 93ceb6d..
--- a/x11-wm/awesome/awesome-3.5.6-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/";
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD gnome"
-
-COMMON_DEPEND="
- >=dev-lang/lua-5.1:0
- dev-libs/glib:2
- >=dev-libs/libxdg-basedir-1
- >=dev-lua/lgi-0.7
- x11-libs/cairo[xcb]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libxcb-1.6
- >=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/libXcursor
- >=x11-libs/libX11-1.3.99.901
- dbus? ( >=sys-apps/dbus-1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${COMMON_DEPEND}
- >=app-text/asciidoc-8.4.5
- app-text/xmlto
- dev-util/gperf
- virtual/pkgconfig
- media-gfx/imagemagick[png]
- >=x11-proto/xcb-proto-1.5
- >=x11-proto/xproto-7.0.15
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
- # bug #408025
- epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
- epatch "${FILESDIR}/${PN}-xsession.patch"
-
- # bug #507604
- epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
- # bug #509658
- epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
-}
-
-src_configure() {
- mycmakeargs=(
- -DPREFIX="${EPREFIX}"/usr
- -DSYSCONFDIR="${EPREFIX}"/etc
- $(cmake-utils_use_with dbus DBUS)
- $(cmake-utils_use doc GENERATE_DOC)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- local myargs="all"
-
- if use doc ; then
- myargs="${myargs} doc"
- fi
- cmake-utils_src_make ${myargs}
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use doc ; then
- (
- cd "${CMAKE_BUILD_DIR}"/doc
- mv html doxygen
- dohtml -r doxygen || die
- )
- fi
- rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN} || die
-
- # GNOME-based awesome
- if use gnome ; then
- # GNOME session
- insinto /usr/share/gnome-session/sessions
- newins "${FILESDIR}/${PN}-gnome-3.session"
"${PN}-gnome.session" || die
- # Application launcher
- domenu "${FILESDIR}/${PN}-gnome.desktop" || die
- # X Session
- insinto /usr/share/xsessions/
- doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
- fi
-}
-
-pkg_postinst() {
- # bug #447308
- if use gnome; then
- elog
- 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
- 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";
- elog
-}
diff --git a/x11-wm/awesome/files/awesome-glib-fix.patch
b/x11-wm/awesome/files/awesome-glib-fix.patch
deleted file mode 100644
index
[gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/files/, x11-wm/awesome/
commit: 1d1284ddbd82a18cbc35a405bc35646209ead4a4
Author: Johannes Huber gentoo org>
AuthorDate: Sat Jan 28 19:07:05 2017 +
Commit: Johannes Huber gentoo org>
CommitDate: Sat Jan 28 19:12:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d1284dd
x11-wm/awesome: Remove 3.4.15
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-wm/awesome/Manifest| 1 -
x11-wm/awesome/awesome-3.4.15.ebuild | 131 -
.../files/awesome-3.4.11-convert-path.patch| 18 ---
x11-wm/awesome/files/awesome-3.4.2-backtrace.patch | 18 ---
x11-wm/awesome/files/awesome-3.5.4-imagebox.patch | 28 -
.../awesome/files/awesome-3.5_rc1-luadoc-fix-patch | 10 --
6 files changed, 206 deletions(-)
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 12518ef..82db9ed 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,4 +1,3 @@
-DIST awesome-3.4.15.tar.bz2 762323 SHA256
4207f5cbed25d0e7ab35157165d923c2ccf04fded5b3d5fc130134ce9ed5ddfd SHA512
18bb2659e1e7c18a8917f606d635e968daa31a5be4c6d93a109603aace9b5d8b5fd0b8ac1d13ba3d6f2c5c42661204ce80c5ea322088cd358ec5e164b760c339
WHIRLPOOL
74da6197f2e4e5f3d99a11e99c26563f6a145181bab5c017b7ee330041864527551a230ce6dc6109bb5510621fe874921c7caa72c095fa2be6fbdb69e02da1dd
DIST awesome-3.5.6.tar.xz 720112 SHA256
37f49de187825425cb3096fc870959d5fec9302b22ffd0f2874d8a18e85046d7 SHA512
8d89bf46956276a8bcf106bb255c051e8382b08617e17691134a8f3e5db3ec9f7773581c02ce62d23e72499f7b1e60fe4322c211e41219b5bffd1897a96f6cf6
WHIRLPOOL
8ec944f1113f7b7b7c6857c02a6c657aec05ddf23674c75a7cf571d4a65720ed4f5f1d28b0fdac032c12ea5e9a54f655d080c6af4e1d314b8c00bf2b9e806d01
DIST awesome-3.5.7.tar.xz 722864 SHA256
ba7f92b0ab8b729c569b19b098b0a08339d8654e3c040d07ad02cf99641ceecf SHA512
0b57efa6ba55e28fee56bec96dbf3c47249b2d70b21e1a7760d4367a0ba42d9936c1c6b78afa4aa3050a60cf34189551ea53b208ec8ec9f6563a905463550515
WHIRLPOOL
ea368fa058aa1c6a143e6f24231adeb47c5e0d26c462b076d8930a49f72c94097555a542405360c107a9e724f4fcc0993a0ff8b53102dfb072db2a9b04f52d9a
DIST awesome-3.5.8.tar.xz 723000 SHA256
7c30c96c57bd72cfed630bbccc344054fe44b37c0a79bdd98075c507af672ec6 SHA512
be5604821e256e36067750c341ca6f8669e159527b93654c8fc41bcd161da6d87fa0e3c5fccc51821586d163535ac78363d12d99ed81b6fb14e26da59136d5ef
WHIRLPOOL
2abe85d034c40dddc2189e8eac6e80c59ad1b92bebb0e1c08f67e8a07a3b8eb420ad352c2f4bf500f15ff854a0c6dfc67aef5c5516a2aada267388d2ac4f
diff --git a/x11-wm/awesome/awesome-3.4.15.ebuild
b/x11-wm/awesome/awesome-3.4.15.ebuild
deleted file mode 100644
index a060269..
--- a/x11-wm/awesome/awesome-3.4.15.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/";
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD gnome"
-
-COMMON_DEPEND=">=dev-lang/lua-5.1
- dev-libs/libev
- >=dev-libs/libxdg-basedir-1
- media-libs/imlib2[png]
- x11-libs/cairo[xcb]
- || ( =x11-libs/libX11-1.3.99.901 )
- >=x11-libs/libxcb-1.6
- x11-libs/libXcursor
- >=x11-libs/pango-1.19.3
- >=x11-libs/startup-notification-0.10_p20110426
- >=x11-libs/xcb-util-0.3.8
- dbus? ( >=sys-apps/dbus-1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${COMMON_DEPEND}
- >=app-text/asciidoc-8.4.5
- app-text/xmlto
- dev-util/gperf
- virtual/pkgconfig
- media-gfx/imagemagick[png]
- >=x11-proto/xcb-proto-1.5
- >=x11-proto/xproto-7.0.15
- doc? (
- app-doc/doxygen
- dev-lua/luadoc
- media-gfx/graphviz
- )"
-
-RDEPEND="${COMMON_DEPEND}
- || (
- x11-misc/gxmessage
- x11-apps/xmessage
- )"
-
-# bug #321433: Need one of these to for awsetbg.
-# imagemagick provides 'display' and is further down the default list, but
-# listed here for completeness. 'display' however is only usable with
-# x11-apps/xwininfo also present.
-RDEPEND="${RDEPEND}
- || (
- ( x11-apps/xwininfo
- || ( media-gfx/imagemagick[X] media-gfx/graphicsmagick[imagemagick,X]
)
- )
- x11-misc/habak
- media-gfx/feh
- x11-misc/hsetroot
- media-gfx/qiv
- media-gfx/xv
- x11-misc/xsri
- media-gfx/xli
- x11-apps/xsetroot
- )"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${PN}-3.4.2-backtrace.patch"
-
- # bug #408025
- epatch "${FILESDIR}/${PN}-3.4.11-convert-path.patch"
-
- #b
[gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/files/, x11-wm/awesome/
commit: b20d603e09c271470a4066f84456a71f2d10d7a0
Author: Ilya Tumaykin gmail com>
AuthorDate: Thu Jan 14 11:35:53 2016 +
Commit: Ian Delaney gentoo org>
CommitDate: Thu Jan 14 11:46:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b20d603e
x11-wm/awesome: revbump to 3.5.6-r2 wrt bug 571544
Backport upstream fix for focus problems with multiple
running awesome instances. Add epatch_user support.
Gentoo-Bug: 571544
Package-Manager: portage-2.2.26
x11-wm/awesome/awesome-3.5.6-r2.ebuild | 139 +
.../awesome-3.5.6-fix-multi-instances-focus.patch | 29 +
2 files changed, 168 insertions(+)
diff --git a/x11-wm/awesome/awesome-3.5.6-r2.ebuild
b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
new file mode 100644
index 000..4b09e3c
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+CMAKE_MIN_VERSION="2.8"
+inherit cmake-utils eutils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="http://awesome.naquadah.org/";
+SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus doc elibc_FreeBSD gnome"
+
+COMMON_DEPEND="
+ >=dev-lang/lua-5.1:0
+ dev-libs/glib:2
+ >=dev-libs/libxdg-basedir-1
+ >=dev-lua/lgi-0.7
+ x11-libs/cairo[xcb]
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/libxcb-1.6
+ >=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/libXcursor
+ >=x11-libs/libX11-1.3.99.901
+ dbus? ( >=sys-apps/dbus-1 )
+ elibc_FreeBSD? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${COMMON_DEPEND}
+ >=app-text/asciidoc-8.4.5
+ app-text/xmlto
+ dev-util/gperf
+ virtual/pkgconfig
+ media-gfx/imagemagick[png]
+ >=x11-proto/xcb-proto-1.5
+ >=x11-proto/xproto-7.0.15
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS="AUTHORS BUGS PATCHES README STYLE"
+
+src_prepare() {
+ # bug #408025
+ epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
+ epatch "${FILESDIR}/${PN}-xsession.patch"
+
+ # bug #507604
+ epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
+ # bug #509658
+ epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
+
+ # bug #571544
+ epatch "${FILESDIR}/${P}-fix-multi-instances-focus.patch"
+
+ epatch_user
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DPREFIX="${EPREFIX}"/usr
+ -DSYSCONFDIR="${EPREFIX}"/etc
+ $(cmake-utils_use_with dbus DBUS)
+ $(cmake-utils_use doc GENERATE_DOC)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ local myargs="all"
+
+ if use doc ; then
+ myargs="${myargs} doc"
+ fi
+ cmake-utils_src_make ${myargs}
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use doc ; then
+ (
+ cd "${CMAKE_BUILD_DIR}"/doc
+ mv html doxygen
+ dohtml -r doxygen || die
+ )
+ fi
+ rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
+
+ exeinto /etc/X11/Sessions
+ newexe "${FILESDIR}"/${PN}-session ${PN} || die
+
+ # GNOME-based awesome
+ if use gnome ; then
+ # GNOME session
+ insinto /usr/share/gnome-session/sessions
+ newins "${FILESDIR}/${PN}-gnome-3.session"
"${PN}-gnome.session" || die
+ # Application launcher
+ domenu "${FILESDIR}/${PN}-gnome.desktop" || die
+ # X Session
+ insinto /usr/share/xsessions/
+ doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
+ fi
+}
+
+pkg_postinst() {
+ # bug #447308
+ if use gnome; then
+ elog
+ 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
+ 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
