commit: b1d934d81970d864a5a2844616e24ebca8a535a9 Author: Tomoya Tabuchi <t <AT> tomoyat1 <DOT> com> AuthorDate: Fri Jan 20 07:27:46 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Feb 10 21:21:09 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d934d8
x11-wm/awesome: Version bump to 4.0 Package-Manager: portage-2.3.0 Closes: https://github.com/gentoo/gentoo/pull/3559 profiles/arch/x86/package.use.mask | 5 + x11-wm/awesome/Manifest | 1 + x11-wm/awesome/awesome-4.0.ebuild | 110 +++++++++++++++++++++ .../awesome/files/awesome-4.0-cflag-cleanup.patch | 11 +++ .../awesome/files/awesome-4.0-convert-path.patch | 11 +++ 5 files changed, 138 insertions(+) diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask index cf82a47f90..2b94219b49 100644 --- a/profiles/arch/x86/package.use.mask +++ b/profiles/arch/x86/package.use.mask @@ -4,6 +4,11 @@ # This file requires >=portage-2.1.1 +# David Seifert <[email protected]> (10 Feb 2017) +# Requires dev-lua/ldoc for building documentation, +# which is only keyworded for amd64 +x11-wm/awesome doc + # Alexis Ballier <[email protected]> (31 Jan 2017) # nvidia drivers are unmasked here media-video/ffmpeg -nvenc diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest index 82db9ed42e..caa81c864e 100644 --- a/x11-wm/awesome/Manifest +++ b/x11-wm/awesome/Manifest @@ -2,3 +2,4 @@ DIST awesome-3.5.6.tar.xz 720112 SHA256 37f49de187825425cb3096fc870959d5fec9302b 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 DIST awesome-3.5.9.tar.xz 723084 SHA256 c7f8b5e4578751688d70ec8c410c55316e22bca8ec1195c622274f1f7254d64f SHA512 6a4c679b293e8cd85d1f7e13f6dea704cbb267e42b9260496a54b657a66d6148aae51521d802d61baaeb23df0d4a8ad0b28d9dc922ea5da2a347b4251cce5e25 WHIRLPOOL 0d2a0b2ad08b07ec8de0150e5e9b8382732b04df3c535d5351ab46d2d7722bc85143d1b00bf47578f7d61d1bc3c3afba5d3e0e6c5ed5ee74f9ad77ea98e3a723 +DIST awesome-4.0.tar.xz 930664 SHA256 5c009730126fcef6bdcb6939084c9736fa02debbe28a5adc1b66297dcc67f333 SHA512 80bdfe5f9166f5e9b0266cd630b48607d17605330d0f172666dbfa3f239ef04aeafafebe8949c3bf1c31a7bd372b60252d56c815048a24e015858585c3d0432b WHIRLPOOL 4a93070fddb7223da14936e77e5e367a426d53e2dd42a56a2fe1eef84883bff43bf8bbf8bd8e3e3d74b267980ef02df0fc20df70f92623502794d92fe3c3e86e diff --git a/x11-wm/awesome/awesome-4.0.ebuild b/x11-wm/awesome/awesome-4.0.ebuild new file mode 100644 index 0000000000..adf44d3afc --- /dev/null +++ b/x11-wm/awesome/awesome-4.0.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit cmake-utils eutils pax-utils + +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 ~x86" +IUSE="dbus doc elibc_FreeBSD gnome" + +RDEPEND=" + >=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/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 ) + elibc_FreeBSD? ( dev-libs/libexecinfo )" + +# 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-proto/xcb-proto-1.5 + >=x11-proto/xproto-7.0.15 + doc? ( dev-lua/ldoc )" + +DOCS=( docs/{00-authors,01-readme,02-contributing}.md ) +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() { + local mycmakeargs=( + -DPREFIX="${EPREFIX}"/usr + -DSYSCONFDIR="${EPREFIX}"/etc + -DWITH_DBUS=$(usex dbus) + -DWITH_GENERATE_DOC=$(usex doc $(usex doc) n) + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + docompress -x /usr/share/doc/awesome/doc + + pax-mark m "${ED%/}"/usr/bin/awesome || die + + 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 +} + +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-4.0-cflag-cleanup.patch b/x11-wm/awesome/files/awesome-4.0-cflag-cleanup.patch new file mode 100644 index 0000000000..4b8379437c --- /dev/null +++ b/x11-wm/awesome/files/awesome-4.0-cflag-cleanup.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -98,7 +98,7 @@ + + # CFLAGS + set(AWESOME_C_FLAGS +- -O1 -std=gnu99 -ggdb3 -fno-strict-aliasing -Wall -Wextra ++ -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-4.0-convert-path.patch b/x11-wm/awesome/files/awesome-4.0-convert-path.patch new file mode 100644 index 0000000000..1eabf0923a --- /dev/null +++ b/x11-wm/awesome/files/awesome-4.0-convert-path.patch @@ -0,0 +1,11 @@ +--- a/awesomeConfig.cmake ++++ b/awesomeConfig.cmake +@@ -51,7 +51,7 @@ + endif() + endif() + # theme graphics +-a_find_program(CONVERT_EXECUTABLE convert TRUE) ++a_find_program(CONVERT_EXECUTABLE bin/convert TRUE) + # pkg-config + include(FindPkgConfig) + # lua
