commit: d1decf48afc91a3df1bba1d0029b23c9f97afeac Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Mon Jan 5 09:07:52 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 5 23:31:18 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1decf48
x11-wm/awesome: update live use precompiled manpages if doc is disabled because anyway these files are not updated by upstream since 6 years. set min_ver for glib:2 Closes: https://bugs.gentoo.org/968303 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/45263 Signed-off-by: Sam James <sam <AT> gentoo.org> x11-wm/awesome/awesome-9999.ebuild | 35 ++++++++++++++++------ .../awesome-4.3_p20260105-bump_cmake_min.patch | 21 +++++++++++++ 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild index c3083f6ec6d3..5b746efb3e87 100644 --- a/x11-wm/awesome/awesome-9999.ebuild +++ b/x11-wm/awesome/awesome-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,8 +10,14 @@ 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 ~riscv ~x86" + if [[ ${PV} == *_p* ]] ; then + HASH_COMMIT= + SRC_URI="https://github.com/awesomeWM/awesome/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${HASH_COMMIT}" + else + SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"; + fi fi DESCRIPTION="Dynamic floating and tiling window manager" @@ -28,7 +34,7 @@ RESTRICT="test" RDEPEND=" ${LUA_DEPS} - dev-libs/glib:2 + >=dev-libs/glib-2.79.2:2 dev-libs/libxdg-basedir $(lua_gen_cond_dep 'dev-lua/lgi[${LUA_USEDEP}]') gnome-base/librsvg[introspection] @@ -60,10 +66,12 @@ DEPEND=" " # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 BDEPEND=" - dev-ruby/asciidoctor media-gfx/imagemagick[png] virtual/pkgconfig - doc? ( dev-lua/ldoc ) + doc? ( + dev-lua/ldoc + dev-ruby/asciidoctor + ) test? ( app-shells/zsh x11-apps/xeyes @@ -79,16 +87,22 @@ PATCHES=( "${FILESDIR}"/${PN}-4.3-cflag-cleanup.patch # bug #509658 ) +src_prepare() { + cmake_src_prepare + if ! use doc; then + cp "${FILESDIR}"/awesome{.1,-client.1,rc.5} "${S}"/manpages/ || die + fi +} + src_configure() { # Compression of manpages is handled by portage. - # WITH_DBUS uses AutoOption.cmake which currently does not - # understand yes/no (or indeed any values other than ON, OFF - # or AUTO). + # AutoOption.cmake requires ON, OFF or AUTO local mycmakeargs=( -DSYSCONFDIR="${EPREFIX}"/etc -DCOMPRESS_MANPAGES=OFF -DWITH_DBUS=$(usex dbus ON OFF) -DGENERATE_DOC=$(usex doc) + -DGENERATE_MANPAGES=$(usex doc ON OFF) -DAWESOME_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF} -DLUA_INCLUDE_DIR="$(lua_get_include_dir)" -DLUA_LIBRARY="$(lua_get_shared_lib)" @@ -127,9 +141,12 @@ src_install() { doins "${FILESDIR}"/${PN}-gnome-xsession.desktop fi - # use html subdir + # use html subdir and precompiled manpages w/o doc enabled if use doc; then mv "${ED}"/usr/share/doc/${PF}/{doc,html} || die + else + doman "${S}"/manpages/awesome{.1,rc.5} + use dbus && doman "${S}"/manpages/awesome-client.1 fi } diff --git a/x11-wm/awesome/files/awesome-4.3_p20260105-bump_cmake_min.patch b/x11-wm/awesome/files/awesome-4.3_p20260105-bump_cmake_min.patch new file mode 100644 index 000000000000..e0d9cd82f7b8 --- /dev/null +++ b/x11-wm/awesome/files/awesome-4.3_p20260105-bump_cmake_min.patch @@ -0,0 +1,21 @@ +upstream is only 3.5 w/ https://github.com/awesomeWM/awesome/pull/4012.patch +update to 3.10 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5) ++cmake_minimum_required(VERSION 3.10) + project(awesome C) + + # Require an out-of-source build. We generate an awesomerc.lua in the build dir +--- a/tests/examples/CMakeLists.txt ++++ b/tests/examples/CMakeLists.txt +@@ -14,7 +14,7 @@ if(NOT DEFINED PROJECT_NAME) + project(awesome-tests-examples NONE) + endif() + +-cmake_minimum_required(VERSION 3.5) ++cmake_minimum_required(VERSION 3.10) + + # Get and update the LUA_PATH so the scripts can be executed without awesome. + execute_process(COMMAND ${LUA_EXECUTABLE} -e "p = package.path:gsub(';', '\\\\;'); io.stdout:write(p)"
