commit: a798a5e410773d25c68c7359843e9c2435a36f8f Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Wed Oct 29 17:43:02 2025 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Tue Nov 11 19:24:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a798a5e4
x11-wm/windowmaker: update live * Next branch has been stale for over two years meanwhile master has been active 11 months ago. Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44437 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> x11-wm/windowmaker/windowmaker-0.96.0-r1.ebuild | 34 +++++++--- x11-wm/windowmaker/windowmaker-9999.ebuild | 90 ++++++++++++++++++------- 2 files changed, 91 insertions(+), 33 deletions(-) diff --git a/x11-wm/windowmaker/windowmaker-0.96.0-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.96.0-r1.ebuild index 7f3c12aaa29a..f278c9822716 100644 --- a/x11-wm/windowmaker/windowmaker-0.96.0-r1.ebuild +++ b/x11-wm/windowmaker/windowmaker-0.96.0-r1.ebuild @@ -5,20 +5,25 @@ EAPI=8 inherit autotools desktop -MY_P="WindowMaker-${PV}" - DESCRIPTION="The fast and light GNUstep window manager" HOMEPAGE="https://www.windowmaker.org/"; -SRC_URI=" - https://github.com/window-maker/wmaker/releases/download/wmaker-${PV}/${MY_P}.tar.gz - https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz -" -S="${WORKDIR}/${MY_P}" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://repo.or.cz/wmaker-crm.git"; + SRC_URI="https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"; +else + MY_P="WindowMaker-${PV}" + SRC_URI=" + https://github.com/window-maker/wmaker/releases/download/wmaker-${PV}/${MY_P}.tar.gz + https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz + " + S="${WORKDIR}/${MY_P}" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +fi # WRASTER_CURRENT-WRASTER_AGE.WINGS_CURRENT-WINGS_AGE.WUTIL_CURRENT-WUTIL_AGE from configure.ac LICENSE="GPL-2" SLOT="0/6.3.5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr" @@ -50,6 +55,13 @@ BDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )" DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL-WMAKER FAQ NEWS README README.definable-cursor README.i18n TODO ) +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + fi + default +} + src_prepare() { # Fix some paths for file in WindowMaker/*menu* util/wmgenmenu.c; do @@ -80,7 +92,11 @@ src_configure() { done detected_abi="${detected_abi%.}" if [[ "${SLOT}" != "0/${detected_abi}" ]]; then - die "SLOT ${SLOT} doesn't match upstream specified ABI ${detected_abi}." + if [[ ${PV} == 9999 ]]; then + eerror "SLOT ${SLOT} doesn't match upstream specified ABI ${detected_abi}." + else + die "SLOT ${SLOT} doesn't match upstream specified ABI ${detected_abi}." + fi fi local -a myeconfargs=( diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild index 3dd602d649cc..f278c9822716 100644 --- a/x11-wm/windowmaker/windowmaker-9999.ebuild +++ b/x11-wm/windowmaker/windowmaker-9999.ebuild @@ -1,27 +1,45 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools desktop git-r3 + +inherit autotools desktop DESCRIPTION="The fast and light GNUstep window manager" HOMEPAGE="https://www.windowmaker.org/"; -SRC_URI="https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"; -EGIT_REPO_URI="https://repo.or.cz/wmaker-crm.git"; -EGIT_BRANCH="next" - -SLOT="0" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://repo.or.cz/wmaker-crm.git"; + SRC_URI="https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"; +else + MY_P="WindowMaker-${PV}" + SRC_URI=" + https://github.com/window-maker/wmaker/releases/download/wmaker-${PV}/${MY_P}.tar.gz + https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz + " + S="${WORKDIR}/${MY_P}" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +fi + +# WRASTER_CURRENT-WRASTER_AGE.WINGS_CURRENT-WINGS_AGE.WUTIL_CURRENT-WUTIL_AGE from configure.ac LICENSE="GPL-2" +SLOT="0/6.3.5" + IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr" -KEYWORDS="" -DEPEND="media-libs/fontconfig +DEPEND=" + media-libs/fontconfig + media-libs/libexif + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXres >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-libs/libXv - gif? ( >=media-libs/giflib-4.1.0-r3 ) + x11-libs/pango + gif? ( >=media-libs/giflib-4.1.0-r3:= ) imagemagick? ( >=media-gfx/imagemagick-7:0= ) jpeg? ( media-libs/libjpeg-turbo:= ) nls? ( virtual/libintl ) @@ -29,7 +47,8 @@ DEPEND="media-libs/fontconfig tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:= ) xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" + xrandr? ( x11-libs/libXrandr ) +" RDEPEND="${DEPEND}" BDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )" @@ -37,10 +56,10 @@ DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL-WMAKER FAQ NEWS README README.definable-cursor README.i18n TODO ) src_unpack() { - # wm-extras - unpack ${A} - - git-r3_src_unpack + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + fi + default } src_prepare() { @@ -53,12 +72,43 @@ src_prepare() { fi done + # Not relevant downstram + sed -e '/check-local/d' -i Makefile.am || die + default + + # Fix issues with ignored cflags and mystery linkage to glib, freetype and harfbuzz eautoreconf } src_configure() { + # sanity check subslot to kick would be drive by bumpers + local detected_abi + for lib in WRASTER WINGS WUTIL; do + # On Linux libtool will decide soname as CURRENT-AGE rather than just CURRENT + local current="$(sed -n -e "s/${lib}_CURRENT=\([0-9]*\)/\1/p" configure.ac)" + local age="$(sed -n -e "s/${lib}_AGE=\([0-9]*\)/\1/p" configure.ac)" + detected_abi+="$((current-age))." + done + detected_abi="${detected_abi%.}" + if [[ "${SLOT}" != "0/${detected_abi}" ]]; then + if [[ ${PV} == 9999 ]]; then + eerror "SLOT ${SLOT} doesn't match upstream specified ABI ${detected_abi}." + else + die "SLOT ${SLOT} doesn't match upstream specified ABI ${detected_abi}." + fi + fi + local -a myeconfargs=( + --localedir="${EPREFIX}"/usr/share/locale + --sysconfdir="${EPREFIX}"/etc/X11 + --disable-static + --enable-usermenu + --with-incs-from= + --with-libs-from= + --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps + --with-x + # image format types $(use_enable gif) $(use_enable imagemagick magick) @@ -81,15 +131,7 @@ src_configure() { myeconfargs+=( LINGUAS= ) fi - econf \ - --localedir="${EPREFIX}"/usr/share/locale \ - --sysconfdir="${EPREFIX}"/etc/X11 \ - --disable-static \ - --enable-usermenu \ - --with-{incs,libs}-from= \ - --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ - --with-x \ - "${myeconfargs[@]}" + econf "${myeconfargs[@]}" pushd ../WindowMaker-extra-0.1 &>/dev/null || die econf
