* [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/files/, x11-wm/awesome/
@ 2016-01-14 11:46 Ian Delaney
0 siblings, 0 replies; 6+ messages in thread
From: Ian Delaney @ 2016-01-14 11:46 UTC (permalink / raw
To: gentoo-commits
commit: b20d603e09c271470a4066f84456a71f2d10d7a0
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Thu Jan 14 11:35:53 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 11:46:41 2016 +0000
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 0000000..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 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-3.5.6-fix-multi-instances-focus.patch b/x11-wm/awesome/files/awesome-3.5.6-fix-multi-instances-focus.patch
new file mode 100644
index 0000000..da306d1
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5.6-fix-multi-instances-focus.patch
@@ -0,0 +1,29 @@
+commit 1c27a69131428e9e733374c2a3676ca4ecee45d2
+Author: Kimball Thurston <kdt3rd@gmail.com>
+Date: Tue Dec 22 21:46:17 2015 -0800
+
+ Fix focus handling with multiple awesome instances
+
+ When there are multiple X11 screens (i.e. :0.0 and :0.1) for zaphod mode
+ style X setups, this triggers a refresh of focus when the instance
+ running on a particular root receives the mouse
+
+ Fixes https://github.com/awesomeWM/awesome/issues/599.
+
+diff --git a/event.c b/event.c
+index db70e2c..80d6bd6 100644
+--- a/event.c
++++ b/event.c
+@@ -554,6 +554,12 @@ event_handle_enternotify(xcb_enter_notify_event_t *ev)
+ }
+ lua_pop(globalconf.L, 1);
+ }
++ else if (ev->event == globalconf.screen->root) {
++ /* When there are multiple X screens with awesome running separate
++ * instances, reset focus.
++ */
++ globalconf.focus.need_update = true;
++ }
+ }
+
+ /** The focus in event handler.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/files/, x11-wm/awesome/
@ 2017-01-28 19:12 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2017-01-28 19:12 UTC (permalink / raw
To: gentoo-commits
commit: 1d1284ddbd82a18cbc35a405bc35646209ead4a4
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 19:07:05 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 19:12:01 2017 +0000
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 2abe85d034c40dddc2189e8eac6e80c59ad1b92bebb0e1c08f67e8a07a3b8eb420ad352c2f4bf500f15ff8aaaa54a0c6dfc67aef5c5516a2aada267388d2ac4f
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..00000000
--- 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[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"
-
- #bug #465288
- sed -e '/NoDisplay/d' -i awesome.desktop || die
-}
-
-src_configure() {
- mycmakeargs=(
- -DPREFIX="${EPREFIX}"/usr
- -DSYSCONFDIR="${EPREFIX}"/etc
- $(cmake-utils_use_with dbus DBUS)
- $(cmake-utils_use doc GENERATE_LUADOC)
- )
-
- 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
- )
- mv "${ED}"/usr/share/doc/${PN}/luadoc "${ED}"/usr/share/doc/${PF}/html/luadoc || die
- fi
- rm -rf "${ED}"/usr/share/doc/${PN} || die
-
- 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
- doins "${FILESDIR}/${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
-}
diff --git a/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch b/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch
deleted file mode 100644
index f06739c..00000000
--- a/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Mar 13 12:55:00 UTC 2012
-Subject: build system
-
-https://bugs.gentoo.org/show_bug.cgi?id=408025
-fix compilation when dev-libs/libee is installed
-
---- awesomeConfig.cmake
-+++ awesomeConfig.cmake
-@@ -57,7 +57,7 @@
- a_find_program(LUA_EXECUTABLE lua FALSE)
- a_find_program(LUADOC_EXECUTABLE luadoc FALSE)
- # theme graphics
--a_find_program(CONVERT_EXECUTABLE convert TRUE)
-+a_find_program(CONVERT_EXECUTABLE bin/convert TRUE)
- # doxygen
- include(FindDoxygen)
- # pkg-config
diff --git a/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch b/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch
deleted file mode 100644
index 4d481ea..00000000
--- a/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur awesome-3.4.2.orig/awesomeConfig.cmake awesome-3.4.2/awesomeConfig.cmake
---- awesome-3.4.2.orig/awesomeConfig.cmake 2009-11-27 04:03:25.000000000 +0900
-+++ awesome-3.4.2/awesomeConfig.cmake 2009-11-28 01:17:01.639797168 +0900
-@@ -167,6 +167,14 @@
- # Check for libev
- a_find_library(LIB_EV ev)
-
-+# Check for backtrace
-+include(CheckFunctionExists)
-+CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE)
-+if(NOT HAVE_BACKTRACE)
-+ a_find_library(LIB_EXECINFO execinfo)
-+ set(AWESOME_REQUIRED_LIBRARIES ${AWESOME_REQUIRED_LIBRARIES} ${LIB_EXECINFO})
-+endif()
-+
- # Error check
- if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
- message(FATAL_ERROR "lua library not found")
diff --git a/x11-wm/awesome/files/awesome-3.5.4-imagebox.patch b/x11-wm/awesome/files/awesome-3.5.4-imagebox.patch
deleted file mode 100644
index 7d224f2..00000000
--- a/x11-wm/awesome/files/awesome-3.5.4-imagebox.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Uli Schlachter <psychon@znc.in>
-Date: Wed, 2 Apr 2014 20:48:06 +0000 (+0200)
-Subject: imagebox: Don't try to scale by infinite (FS#1248)
-X-Git-Url: http://git.naquadah.org/?p=awesome.git;a=commitdiff_plain;h=7967d05915c95c8eba7709a46093cc1b6de55572;hp=afa50904fb1c79a24ddda8fb242afe2dcc1de841
-
-imagebox: Don't try to scale by infinite (FS#1248)
-
-When an imagebox was drawn with width or height zero, it tried to calculate the
-needed scale factor for making the image fit. Sadly, this would be a division by
-zero aka infinite in this case.
-
-Fix this by just not drawing anything if there is no space available.
-
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
-
-diff --git a/lib/wibox/widget/imagebox.lua.in b/lib/wibox/widget/imagebox.lua.in
-index da51634..5963d0e 100644
---- a/lib/wibox/widget/imagebox.lua.in
-+++ b/lib/wibox/widget/imagebox.lua.in
-@@ -18,6 +18,7 @@ local imagebox = { mt = {} }
- --- Draw an imagebox with the given cairo context in the given geometry.
- function imagebox:draw(wibox, cr, width, height)
- if not self._image then return end
-+ if width == 0 or height == 0 then return end
-
- cr:save()
-
diff --git a/x11-wm/awesome/files/awesome-3.5_rc1-luadoc-fix-patch b/x11-wm/awesome/files/awesome-3.5_rc1-luadoc-fix-patch
deleted file mode 100644
index e67eeb0..00000000
--- a/x11-wm/awesome/files/awesome-3.5_rc1-luadoc-fix-patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../awesome-3.5-rc1/lib/naughty.lua.in.orig 2012-11-24 05:51:33.000000000 -0800
-+++ ../awesome-3.5_rc1/lib/naughty.lua.in 2012-11-24 13:17:14.025201211 -0800
-@@ -55,7 +55,6 @@
- -- @field low The preset for notifications with low urgency level
- -- @field normal The default preset for every notification without a preset that will also be used for normal urgency level
- -- @field critical The preset for notifications with a critical urgency level
---- @class table
- naughty.config.presets = {
- normal = {},
- low = {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/files/, x11-wm/awesome/
@ 2017-01-28 19:12 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2017-01-28 19:12 UTC (permalink / raw
To: gentoo-commits
commit: bf28b83fe393662d5322f0e8f07ee9bd82457e9b
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 19:10:24 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 19:12:01 2017 +0000
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..00000000
--- 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 e3e6fcf..00000000
--- a/x11-wm/awesome/files/awesome-glib-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
->=glib-2.31 build fix
-
---- a/spawn.c
-+++ b/spawn.c
-@@ -24,7 +24,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
-
--#include <glib/gspawn.h>
-+#include <glib.h>
-
- #include "spawn.h"
- #include "screen.h"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/files/, x11-wm/awesome/
@ 2020-12-26 21:32 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2020-12-26 21:32 UTC (permalink / raw
To: gentoo-commits
commit: 9ff59e69344b86713527434dab3c6c570c5e1470
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 21:32:48 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 21:32:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff59e69
x11-wm/awesome: add -fno-common (gcc 10) patch
Thanks-to: Eddie Chapman <maracay <AT> ehuk.net>
Closes: https://bugs.gentoo.org/707262
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> 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 00000000000..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 <maracay@ehuk.net>
+----
+From d256d9055095f27a33696e0aeda4ee20ed4fb1a0 Mon Sep 17 00:00:00 2001
+From: Reiner Herrmann <reiner@reiner-h.de>
+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_class_t button_class;
++
+ /** Button object.
+ *
+ * @tfield int button The mouse button number, or 0 for any button.
+diff --git a/objects/button.h b/objects/button.h
+index fb8bb8da28..8f0b894305 100644
+--- a/objects/button.h
++++ b/objects/button.h
+@@ -39,7 +39,7 @@ typedef struct button_t
+ xcb_button_t button;
+ } button_t;
+
+-lua_class_t button_class;
++extern lua_class_t button_class;
+ LUA_OBJECT_FUNCS(button_class, button_t, button)
+ ARRAY_FUNCS(button_t *, button, DO_NOTHING)
+
+diff --git a/objects/client.c b/objects/client.c
+index 7b2d3a2022..b617a9e7a9 100644
+--- a/objects/client.c
++++ b/objects/client.c
+@@ -108,6 +108,8 @@
+ #include <xcb/shape.h>
+ #include <cairo-xcb.h>
+
++lua_class_t client_class;
++
+ /** Client class.
+ *
+ * This table allow to add more dynamic properties to the clients. For example,
+diff --git a/objects/client.h b/objects/client.h
+index 74a23131c5..387e7c2aea 100644
+--- a/objects/client.h
++++ b/objects/client.h
+@@ -200,7 +200,7 @@ struct client_t
+ ARRAY_FUNCS(client_t *, client, DO_NOTHING)
+
+ /** Client class */
+-lua_class_t client_class;
++extern lua_class_t client_class;
+
+ LUA_OBJECT_FUNCS(client_class, client_t, client)
+
+diff --git a/objects/drawin.c b/objects/drawin.c
+index 3fd1cc4350..3bbd93179c 100644
+--- a/objects/drawin.c
++++ b/objects/drawin.c
+@@ -46,6 +46,8 @@
+ #include <cairo-xcb.h>
+ #include <xcb/shape.h>
+
++lua_class_t drawin_class;
++
+ /** Drawin object.
+ *
+ * @field border_width Border width.
+diff --git a/objects/drawin.h b/objects/drawin.h
+index 31f315aac5..2f8887d944 100644
+--- a/objects/drawin.h
++++ b/objects/drawin.h
+@@ -52,7 +52,7 @@ void luaA_drawin_systray_kickout(lua_State *);
+
+ void drawin_class_setup(lua_State *);
+
+-lua_class_t drawin_class;
++extern lua_class_t drawin_class;
+
+ #endif
+ // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
+diff --git a/objects/key.c b/objects/key.c
+index c42f7446d8..365ba998cc 100644
+--- a/objects/key.c
++++ b/objects/key.c
+@@ -43,6 +43,8 @@
+ #include <xkbcommon/xkbcommon.h>
+ #include <glib.h>
+
++lua_class_t key_class;
++
+ /** Key object.
+ *
+ * @tfield string key The key to trigger an event.
+diff --git a/objects/key.h b/objects/key.h
+index 8aa07ffe3d..45f23cac79 100644
+--- a/objects/key.h
++++ b/objects/key.h
+@@ -36,7 +36,7 @@ typedef struct keyb_t
+ xcb_keycode_t keycode;
+ } keyb_t;
+
+-lua_class_t key_class;
++extern lua_class_t key_class;
+ LUA_OBJECT_FUNCS(key_class, keyb_t, key)
+ DO_ARRAY(keyb_t *, key, DO_NOTHING)
+
+diff --git a/objects/tag.c b/objects/tag.c
+index a0050cc2a9..1b1a135762 100644
+--- a/objects/tag.c
++++ b/objects/tag.c
+@@ -190,6 +190,8 @@
+ #include "ewmh.h"
+ #include "luaa.h"
+
++lua_class_t tag_class;
++
+ /**
+ * @signal request::select
+ */
+diff --git a/objects/tag.h b/objects/tag.h
+index d6bb40e0d8..f830b1e2c5 100644
+--- a/objects/tag.h
++++ b/objects/tag.h
+@@ -46,7 +46,7 @@ struct tag
+ client_array_t clients;
+ };
+
+-lua_class_t tag_class;
++extern lua_class_t tag_class;
+ LUA_OBJECT_FUNCS(tag_class, tag_t, tag)
+
+ void tag_class_setup(lua_State *);
+diff --git a/objects/window.c b/objects/window.c
+index 440970f3d0..371d06bcd3 100644
+--- a/objects/window.c
++++ b/objects/window.c
+@@ -59,6 +59,7 @@
+ #include "property.h"
+ #include "xwindow.h"
+
++lua_class_t window_class;
+ LUA_CLASS_FUNCS(window, window_class)
+
+ static xcb_window_t
+diff --git a/objects/window.h b/objects/window.h
+index 5386fafead..fbc5296cf5 100644
+--- a/objects/window.h
++++ b/objects/window.h
+@@ -80,7 +80,7 @@ typedef struct
+ WINDOW_OBJECT_HEADER
+ } window_t;
+
+-lua_class_t window_class;
++extern lua_class_t window_class;
+
+ void window_class_setup(lua_State *);
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/files/, x11-wm/awesome/
@ 2020-12-28 11:50 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2020-12-28 11:50 UTC (permalink / raw
To: gentoo-commits
commit: ca44b49126e8b55af71ad6326d34830154c97c90
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 11:50:18 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 11:50:18 2020 +0000
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 <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> 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} == *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/"
-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 || die
pax-mark m "${ED}"/usr/bin/awesome
diff --git a/x11-wm/awesome/files/awesome-4.3-fno-common.patch b/x11-wm/awesome/files/awesome-4.3-fno-common.patch
index 9a77bf42a39..c75a8afd5e6 100644
--- a/x11-wm/awesome/files/awesome-4.3-fno-common.patch
+++ b/x11-wm/awesome/files/awesome-4.3-fno-common.patch
@@ -1,38 +1,7 @@
-https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0.patch
-https://bugs.gentoo.org/707262
+Taken from: https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+Author: Reiner Herrmann <reiner@reiner-h.de>
Rebased by Eddie Chapman <maracay@ehuk.net>
-----
-From d256d9055095f27a33696e0aeda4ee20ed4fb1a0 Mon Sep 17 00:00:00 2001
-From: Reiner Herrmann <reiner@reiner-h.de>
-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 @@
@@ -44,8 +13,6 @@ index 312fb2d594..bb110ac716 100644
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 @@
@@ -57,8 +24,6 @@ index 8a3ef089d7..a91261843c 100644
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[];
@@ -70,8 +35,6 @@ index 419a8c2eb2..aeaba9cd1f 100644
/** 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 *);
@@ -83,8 +46,6 @@ index e159258348..d26c437691 100644
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 @@
@@ -96,8 +57,6 @@ index 892347a928..5ffdcd4432 100644
/** Button object.
*
* @tfield int button The mouse button number, or 0 for any button.
-diff --git a/objects/button.h b/objects/button.h
-index fb8bb8da28..8f0b894305 100644
--- a/objects/button.h
+++ b/objects/button.h
@@ -39,7 +39,7 @@ typedef struct button_t
@@ -109,8 +68,6 @@ index fb8bb8da28..8f0b894305 100644
LUA_OBJECT_FUNCS(button_class, button_t, button)
ARRAY_FUNCS(button_t *, button, DO_NOTHING)
-diff --git a/objects/client.c b/objects/client.c
-index 7b2d3a2022..b617a9e7a9 100644
--- a/objects/client.c
+++ b/objects/client.c
@@ -108,6 +108,8 @@
@@ -122,8 +79,6 @@ index 7b2d3a2022..b617a9e7a9 100644
/** Client class.
*
* This table allow to add more dynamic properties to the clients. For example,
-diff --git a/objects/client.h b/objects/client.h
-index 74a23131c5..387e7c2aea 100644
--- a/objects/client.h
+++ b/objects/client.h
@@ -200,7 +200,7 @@ struct client_t
@@ -135,8 +90,6 @@ index 74a23131c5..387e7c2aea 100644
LUA_OBJECT_FUNCS(client_class, client_t, client)
-diff --git a/objects/drawin.c b/objects/drawin.c
-index 3fd1cc4350..3bbd93179c 100644
--- a/objects/drawin.c
+++ b/objects/drawin.c
@@ -46,6 +46,8 @@
@@ -148,8 +101,6 @@ index 3fd1cc4350..3bbd93179c 100644
/** Drawin object.
*
* @field border_width Border width.
-diff --git a/objects/drawin.h b/objects/drawin.h
-index 31f315aac5..2f8887d944 100644
--- a/objects/drawin.h
+++ b/objects/drawin.h
@@ -52,7 +52,7 @@ void luaA_drawin_systray_kickout(lua_State *);
@@ -161,8 +112,6 @@ index 31f315aac5..2f8887d944 100644
#endif
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
-diff --git a/objects/key.c b/objects/key.c
-index c42f7446d8..365ba998cc 100644
--- a/objects/key.c
+++ b/objects/key.c
@@ -43,6 +43,8 @@
@@ -174,8 +123,6 @@ index c42f7446d8..365ba998cc 100644
/** Key object.
*
* @tfield string key The key to trigger an event.
-diff --git a/objects/key.h b/objects/key.h
-index 8aa07ffe3d..45f23cac79 100644
--- a/objects/key.h
+++ b/objects/key.h
@@ -36,7 +36,7 @@ typedef struct keyb_t
@@ -187,21 +134,17 @@ index 8aa07ffe3d..45f23cac79 100644
LUA_OBJECT_FUNCS(key_class, keyb_t, key)
DO_ARRAY(keyb_t *, key, DO_NOTHING)
-diff --git a/objects/tag.c b/objects/tag.c
-index a0050cc2a9..1b1a135762 100644
--- a/objects/tag.c
+++ b/objects/tag.c
@@ -190,6 +190,8 @@
#include "ewmh.h"
#include "luaa.h"
-
+
+lua_class_t tag_class;
+
/**
* @signal request::select
*/
-diff --git a/objects/tag.h b/objects/tag.h
-index d6bb40e0d8..f830b1e2c5 100644
--- a/objects/tag.h
+++ b/objects/tag.h
@@ -46,7 +46,7 @@ struct tag
@@ -213,8 +156,6 @@ index d6bb40e0d8..f830b1e2c5 100644
LUA_OBJECT_FUNCS(tag_class, tag_t, tag)
void tag_class_setup(lua_State *);
-diff --git a/objects/window.c b/objects/window.c
-index 440970f3d0..371d06bcd3 100644
--- a/objects/window.c
+++ b/objects/window.c
@@ -59,6 +59,7 @@
@@ -225,8 +166,6 @@ index 440970f3d0..371d06bcd3 100644
LUA_CLASS_FUNCS(window, window_class)
static xcb_window_t
-diff --git a/objects/window.h b/objects/window.h
-index 5386fafead..fbc5296cf5 100644
--- a/objects/window.h
+++ b/objects/window.h
@@ -80,7 +80,7 @@ typedef struct
@@ -237,4 +176,4 @@ index 5386fafead..fbc5296cf5 100644
+extern lua_class_t window_class;
void window_class_setup(lua_State *);
-
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/files/, x11-wm/awesome/
@ 2021-01-21 21:17 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-01-21 21:17 UTC (permalink / raw
To: gentoo-commits
commit: 7ffeb29f4b379820371400733aba4005cfb91846
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 21:13:41 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 21:13:41 2021 +0000
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 <sam <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 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 00000000000..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} == *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
new file mode 100644
index 00000000000..3cfeaba2df3
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 00000000000..588f9ab9ec5
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch
@@ -0,0 +1,46 @@
+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
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)
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
new file mode 100644
index 00000000000..e6c37b0f9c7
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch
@@ -0,0 +1,12 @@
+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] 6+ messages in thread
end of thread, other threads:[~2021-01-21 21:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-28 11:50 [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/files/, x11-wm/awesome/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-01-21 21:17 Sam James
2020-12-26 21:32 Sam James
2017-01-28 19:12 Johannes Huber
2017-01-28 19:12 Johannes Huber
2016-01-14 11:46 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox