commit: 547333a7a2f66bf8142f54762334989746269f04 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Tue Nov 4 21:46:04 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Nov 5 17:06:25 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=547333a7
x11-wm/awesome: update live libXcursor is replaced by xcb_cursor manpages are generated by asciidoctor, not asciidoc add librsvg for svg rendering update the patch for cflags : remove -std=gnu99 and -Wno-strict-aliasing install html files in the right path remove seemingly outdated comments for : * ldoc, the old ebuild w/o lua.eclass is removed * issues w/ java has been fixed in 4.0, see issue 248 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/44490 Signed-off-by: Sam James <sam <AT> gentoo.org> x11-wm/awesome/awesome-9999.ebuild | 50 +++++++++++----------- .../awesome/files/awesome-4.3-cflag-cleanup.patch | 11 +++++ 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild index 083278c15231..c3083f6ec6d3 100644 --- a/x11-wm/awesome/awesome-9999.ebuild +++ b/x11-wm/awesome/awesome-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,13 +26,15 @@ REQUIRED_USE="${LUA_REQUIRED_USE}" # Doesn't play nicely with the sandbox + requires an active D-BUS session RESTRICT="test" -RDEPEND="${LUA_DEPS} +RDEPEND=" + ${LUA_DEPS} dev-libs/glib:2 dev-libs/libxdg-basedir $(lua_gen_cond_dep 'dev-lua/lgi[${LUA_USEDEP}]') + gnome-base/librsvg[introspection] x11-libs/cairo[X,xcb(+)] x11-libs/gdk-pixbuf:2[introspection] - x11-libs/libxcb + x11-libs/libxcb:= x11-libs/pango[introspection] x11-libs/startup-notification x11-libs/xcb-util @@ -40,11 +42,12 @@ RDEPEND="${LUA_DEPS} 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 )" -DEPEND="${RDEPEND} + dbus? ( sys-apps/dbus ) +" +DEPEND=" + ${RDEPEND} x11-base/xcb-proto x11-base/xorg-proto test? ( @@ -53,21 +56,19 @@ DEPEND="${RDEPEND} dev-lua/busted[${LUA_USEDEP}] dev-lua/luacheck[${LUA_USEDEP}] ') - )" + ) +" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 -# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP. -# On the other hand, it means that we should explicitly depend on a version -# migrated to Lua eclasses so that during the upgrade from unslotted -# to slotted dev-lang/lua, the package manager knows to emerge migrated -# ldoc before migrated awesome. -BDEPEND="app-text/asciidoc +BDEPEND=" + dev-ruby/asciidoctor media-gfx/imagemagick[png] virtual/pkgconfig - doc? ( >=dev-lua/ldoc-1.4.6-r100 ) + doc? ( dev-lua/ldoc ) test? ( app-shells/zsh x11-apps/xeyes - )" + ) +" # Skip installation of README.md by einstalldocs, which leads to broken symlink DOCS=() @@ -75,7 +76,7 @@ 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-cflag-cleanup.patch # bug #509658 ) src_configure() { @@ -92,6 +93,9 @@ src_configure() { -DLUA_INCLUDE_DIR="$(lua_get_include_dir)" -DLUA_LIBRARY="$(lua_get_shared_lib)" ) + + [[ ${PV} != *9999* ]] && mycmakeargs+=( -DOVERRIDE_VERSION="v${PV}" ) + cmake_src_configure } @@ -123,8 +127,10 @@ src_install() { 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 + # use html subdir + if use doc; then + mv "${ED}"/usr/share/doc/${PF}/{doc,html} || die + fi } pkg_postinst() { @@ -138,12 +144,4 @@ pkg_postinst() { 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.3-cflag-cleanup.patch b/x11-wm/awesome/files/awesome-4.3-cflag-cleanup.patch new file mode 100644 index 000000000000..7106fbf4adbd --- /dev/null +++ b/x11-wm/awesome/files/awesome-4.3-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 ++ -Wall -Wextra + -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings + -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self + -Wpointer-arith -Wformat-nonliteral
