commit: 5921cc1ac6c89d26920457b057bdb9570ea4673f Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com> AuthorDate: Tue May 16 11:24:58 2023 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Thu Jun 8 16:27:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5921cc1a
x11-wm/fluxbox: Fix ISO C++17 does not allow register storage class specifier Closes: https://bugs.gentoo.org/898884 Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31057 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> ....3.7-fbsetroot-Don-t-use-register-keyword.patch | 25 +++++ x11-wm/fluxbox/fluxbox-1.3.7-r5.ebuild | 118 +++++++++++++++++++++ 2 files changed, 143 insertions(+) diff --git a/x11-wm/fluxbox/files/fluxbox-1.3.7-fbsetroot-Don-t-use-register-keyword.patch b/x11-wm/fluxbox/files/fluxbox-1.3.7-fbsetroot-Don-t-use-register-keyword.patch new file mode 100644 index 000000000000..4906dfaa022d --- /dev/null +++ b/x11-wm/fluxbox/files/fluxbox-1.3.7-fbsetroot-Don-t-use-register-keyword.patch @@ -0,0 +1,25 @@ +https://github.com/fluxbox/fluxbox/pull/78 +From: Brahmajit Das <[email protected]> +Date: Tue, 16 May 2023 16:46:09 +0530 +Subject: [PATCH] util/fbsetroot: Don't use register keyword + +Register keyword has been deprecated since c++14 and completely removed +since c++17. + +Encountered while building fluxbox with clang-16. + +Signed-off-by: Brahmajit Das <[email protected]> +--- a/util/fbsetroot.cc ++++ b/util/fbsetroot.cc +@@ -224,7 +224,7 @@ void fbsetroot::modula(int x, int y) { + char data[32]; + long pattern = 0; + +- register int i; ++ int i; + + FbRootWindow root(screen); + +-- +2.40.1 + diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r5.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r5.ebuild new file mode 100644 index 000000000000..9f0445070bb7 --- /dev/null +++ b/x11-wm/fluxbox/fluxbox-1.3.7-r5.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs prefix xdg + +DESCRIPTION="X11 window manager featuring tabs and an iconbar" +HOMEPAGE="http://www.fluxbox.org"; +SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="nls xinerama bidi +truetype +imlib +slit +systray test +toolbar vim-syntax" +REQUIRED_USE="systray? ( toolbar )" +# Tests are all manual and throw an exception on launch. +RESTRICT="!test? ( test ) test" + +RDEPEND="bidi? ( >=dev-libs/fribidi-0.19.2 ) + imlib? ( >=media-libs/imlib2-1.2.0[X] ) + truetype? ( media-libs/freetype ) + vim-syntax? ( app-vim/fluxbox-syntax ) + x11-libs/libXext + x11-libs/libXft + x11-libs/libXpm + x11-libs/libXrandr + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + || ( x11-misc/gxmessage x11-apps/xmessage )" + +BDEPEND="bidi? ( virtual/pkgconfig ) + nls? ( sys-devel/gettext )" + +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${P}-c++17.patch + "${FILESDIR}"/${PN}-1.3.7-fbsetroot-Don-t-use-register-keyword.patch +) + +src_prepare() { + default + # We need to be able to include directories rather than just plain + # files in menu [include] items. This patch will allow us to do clever + # things with style ebuilds. + eapply "${FILESDIR}"/gentoo_style_location-1.1.x.patch + + eprefixify util/fluxbox-generate_menu.in + + eapply "${FILESDIR}"/osx-has-otool.patch + + # Fix bug #551522; 1.3.8 will render this obsolete + eapply "${FILESDIR}"/fix-hidden-toolbar.patch + + # Add in the Gentoo -r number to fluxbox -version output. + if [[ "${PR}" == "r0" ]] ; then + suffix="gentoo" + else + suffix="gentoo-${PR}" + fi + sed -i \ + -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \ + version.h.in || die "version sed failed" +} + +src_configure() { + xdg_environment_reset + + use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" + + econf \ + $(use_enable bidi fribidi ) \ + $(use_enable imlib imlib2) \ + $(use_enable nls) \ + $(use_enable slit) \ + $(use_enable systray) \ + $(use_enable test) \ + $(use_enable toolbar) \ + $(use_enable truetype xft) \ + $(use_enable xinerama) \ + --sysconfdir="${EPREFIX}"/etc/X11/${PN} \ + --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge +} + +src_compile() { + emake AR="$(tc-getAR)" + + mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed" + # Call fluxbox-generate_menu through bash since it lacks +x + # chmod 744 may be an equal fix + MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \ + CHECKINIT="no. go away." HOME="${T}/home" \ + bash "${S}/util/fluxbox-generate_menu" -is -ds \ + || die "menu generation failed" +} + +src_install() { + emake DESTDIR="${D}" STRIP="" install + dodoc README* AUTHORS TODO* ChangeLog NEWS + + # Install the generated menu + insinto /usr/share/fluxbox + doins data/menu + + insinto /usr/share/xsessions + doins "${FILESDIR}"/${PN}.desktop + + exeinto /etc/X11/Sessions + newexe "${FILESDIR}"/${PN}.xsession fluxbox + + # Styles menu framework + insinto /usr/share/fluxbox/menu.d/styles + doins "${FILESDIR}"/styles-menu-fluxbox + doins "${FILESDIR}"/styles-menu-commonbox + doins "${FILESDIR}"/styles-menu-user +}
