gentoo auto-resync : 08:06:2023 - 21:46:30

3 files changed, 145 insertions, 0 deletions

diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index bf57197a3fb5..c619c14bf2d6 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,5 +1,6 @@
 AUX fix-hidden-toolbar.patch 5403 BLAKE2B af751babd70eae79729b942c7bb0e49e95c0b9cd74e8dba2890bd20d91714c03834286a8f6fe962e793ba5815a7ef1215c09c276cc6eb219851655f19f8402a5 SHA512 69705c1c24bb7696c59a82dc20ef5319562cfd67b4e9b6903cd5de02744c48bfce132949ed7eae4879bf89a08bebeb592d35d0ce77b24c17ad172740a15215b1
 AUX fluxbox-1.3.7-c++17.patch 899 BLAKE2B a1821355da598474bc7745dc4d96811c77580f35b95debcf37a07a4c1622e86b3bfc7105e7e50dfe22c26f6c5873531f6de2cc04f6c94f87cbf4a08da14b4e85 SHA512 6944ccd734de426c90f4374f8bb5ce64b0c8fe46076577cee80195949f364e3f59a3c72bcb4844f8766794e42c47345587da06cda68deb4e22a8715efa2364af
+AUX fluxbox-1.3.7-fbsetroot-Don-t-use-register-keyword.patch 613 BLAKE2B eae6f2676b14b80935e879e272b3a952c758f545a48c523ec41ae427b7c786b1443473f02dbb910df299742a3b4539794300d89dc580fc9e721b5068e4059948 SHA512 425038359d5e148705e6085449d674c6962c4109718c9a3332a7a709cec5f8012cc985b4bd26ea117dbce2816a5dcea149538b0491d5012fbaf1688019b6abba
 AUX fluxbox.desktop 187 BLAKE2B 3486c46b9c1c2bb1526818a991202eb327b31b2ca71690d639c78d57494715d1b66a60d8903c3ecafcf84b3c1fdf44396aee5d1d534a60bf99a31e2a6f14f0e8 SHA512 217baf54698bb553dabfdc5565827eb10e897728a2ff2595f0eb03aaf049784a094c48b7e698b34ce374dd9f81036bebc77cf7136ec7aa9651eeaf8a0b751dd0
 AUX fluxbox.xsession 2004 BLAKE2B 3c242e42ff2c0a633e061def8cd339a1cc980aee20e92ea3aa2d5298bffe3b76c02987b02bf20b5faa9604841fc2b8d947c3dd7123ac5a3793c7d85a51b5cc2c SHA512 ec50e1472af22fc34d2bd7124a63246b3b3c84fd1d6b334888165c7a3e91581065603d63f5742ea555822bf16505117b4d6b5de3c583c85a9cb37befde341f72
 AUX gentoo_style_location-1.1.x.patch 735 BLAKE2B bd441ccd5c2819770543effd6fcbc1b33adf52352cfd0a4802140b32083302e665cfa9fed9c1417698f706fa36d8ae0d9b7e2fa19a983aa8f61292dbca27b9d0 SHA512 0ee58758e7a9c76b0bba1cf252250406ab3fe3a9d50a84d3a485b9fe8e86c88b52b3cc2ae3cca730644af0ff818305e5f5beddd9003abb5fcd74d6914168e220
@@ -9,4 +10,5 @@ AUX styles-menu-fluxbox 117 BLAKE2B 8a72f7739a3fc80f6c5dc31204df4d930111f5279bd6
 AUX styles-menu-user 93 BLAKE2B a2161d88f4fe85f3b95374186dbdc4c5eed480f631a3b8902545bd7cddcf9c9df74befd58747da7e9382742f7c8c5710be1aff411a83f982ee0d668fbe88a75b SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094
 DIST fluxbox-1.3.7.tar.xz 786492 BLAKE2B ecf50e2eb19949b4a301366eaffc1d5199c17b116b7d19a31392eea632e6320210e1dff24b1794d3427c14206e31d9722d3c21ce24b584c61288233feb564925 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01
 EBUILD fluxbox-1.3.7-r4.ebuild 3192 BLAKE2B 83834d7446f593244ceeb8b5d17cf5c2d63b0aa6feb6d8b142da5872cce3165d7dae3027387300bb690d1116cf7932bb9dc3b6643bc7210c91885fad50b286a3 SHA512 4493393cbac0ba7aa0e67b4fa04d4d03a0d36fdc0900c5fea850a21ffc2b6fadb0b7ff8fe9795089a28221657e636ce9fc9c32d0c1ae8d59509cb60e1c773cd4
+EBUILD fluxbox-1.3.7-r5.ebuild 3265 BLAKE2B bd68c14e9908844220a8db1ab6324ab9373fd68ff13bb06d6ea6b136546d186e30adc73eeefe94543c6b0b5da64ad3fefbec9e78e7b5c05275ddf0a37e14da7b SHA512 d28826545e1a94d952472a81e91e772c586d5a902a2fe3c840861e504c0357903e382c9b9af6b9ee2adfce01026719707cabd905fb6ae16ba9690213dd98ccde
 MISC metadata.xml 812 BLAKE2B 789750598a53d46a63c50238107634a0f4fa4512b20084ee47800d162c8c40eb727f22a85d5145857fa4a8df5ff6bc36d17b1d8990ca45c7839aa34a1f6845c6 SHA512 7b045f41556db0f63199aacd5ab171c904009aa8d0271b1a84a144d204ba71ba5d1ca4d76db7b03d18ec6d708b01be83a7f1eb3e5d430c3ab1656c74f862556c
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 <brahmajit.xyz@gmail.com>
+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 <brahmajit.xyz@gmail.com>
+--- 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
+}