4 files changed, 272 insertions, 0 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index b9a1a3a1c86f..381317939e6c 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 622af9138316..31c6284f3621 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -3,10 +3,12 @@ AUX fvwm-2.5.27-translucent-menus.diff 15765 BLAKE2B 85623d5d671d97842ffe819ddfa
 AUX fvwm-2.6.5-ar.patch 1077 BLAKE2B ebd3226a706087c7e7f7935a9862c59e628551e19be66d110441075839484b6bb26667104090258267b3e484c6fc0b0650349488902d216f3cf841c23e45b59e SHA512 fc66ee5c79b96860705d72b18aab3f8c8f8ad84fead47c4f8f944474a6bfbe0569ee08aa51e8a4d7982541eecd5c302499f99ebf8568f4b4fb1c9e2369233e45
 AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017fc213da59156040136ff447b208b45691fca00b5d16cdaf57ab8411e2834d759b3bb7e53550b13ec72de4b7f70486abb SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196
 AUX fvwm-2.6.8-perl528.patch 515 BLAKE2B 44df7b8aef71d85c3aefefb40ab45b9e6227ef6a13aaab60cec8956db669013b4ee4dc869216972e1a443d1f69e6550e7f80dc81cdf8b7642d6c49ae46793b2a SHA512 ab35b8aef3c6d8a07f1e03290c209736ee892729d98fece3d0134fd9994f8c57bdd5703492b405a6eb52cfcd67cd9cd72c16bc25a729a46560eb6e21f2d7918f
+AUX fvwm-2.7.0-c99.patch 3294 BLAKE2B 930615bfde3168ca47c865badab133de33ad127c648f1a29424076b61e194a6dcf2b411e5198185acc057d49fc7fd4539397270f6610a7d80abb929dd50547cc SHA512 affc46823a1e2756b72819a08976496319a10fa43eb1089f57ac0630d3d919ba9f3a8c86c62a932be989b4f7b17dbbb3712da55d188af806396c2c18175b8cdb
 AUX fvwm-2.7.0-clang16.patch 1821 BLAKE2B b8acc1740eb820128625a1aab94c00faf9ba22a911e1a570b61cfe5d59e63479a5555ae22c16c2f2ec0189b8c8f195f36447fec12fc64f73fbc7c4efa0d62410 SHA512 dfe16531733986b42600b682d9e7ea17db5e546f196476d0fdf97cbfb05733c9c37d36f51a0a77d0754c0b55374be15b8dd39966bf1e454bb338245c63235a5f
 DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
 DIST fvwm-2.7.0.tar.gz 3933529 BLAKE2B b4be7083c2946cb2a0c48673271d490a49aba5aec8407169bedc5a35f55fe8cd2724a9f6570c5e7ea110652c04956570c874256f96fa5d920a2a1ede152c0c25 SHA512 fc9076c3f07f36b0b2c7c4d2bdf7bb1a711000e39316e327173548bc99dc2b8a29b591e3644e1492f87603b576cd4a3f58ecbdd84a4384d294417b3c56c81808
 EBUILD fvwm-2.6.9.ebuild 4034 BLAKE2B 603b739468c0c94f41348b62014245fd465da01622079f0bbaa68f4f3c736bce79b716ad8a3d7d6787bcbf3245340827e6308f7a5e0948afaffc0c2566676a5b SHA512 2e30f69354c6070e8b47992435a8368bc636d50498cb90f4413328703b79c9f69d5e633df9c6056c2ef7e019db1d9e020e14bf0d2e6f254c1a96c94912a440f5
 EBUILD fvwm-2.7.0-r1.ebuild 4207 BLAKE2B 9e5688558de8d59148f64192efb7af939b57196573fae988288aea1c7d083e9192e8abd659d580cf919166531218be5d1ad228501cefa347d808b0b0820341bd SHA512 45917c0c96c62574f88e8f8a95084a81df67360432e16a1f6edae99b297895108bf3b6ff42bdd350bf934a01d55e919ec3ecfc8254b94e769d0ccd8052fbcc79
+EBUILD fvwm-2.7.0-r2.ebuild 4206 BLAKE2B 278d410a18128eb3b377e4cfaf349b87380004b9e106835041f7f32921dae4b9ef7c3a97106375a5ff0dcbb9029480d78b0cbbd48469222598d8a117d60ff00c SHA512 0336a51e76ea913d6a0ba7ce9e9eeb67909f9a7e7f3dce5727529a279b3d580e308b067a6e2b0ac50e67cab9a24c76bba53badad7e48082cfb1ce4d38f575188
 EBUILD fvwm-2.7.0.ebuild 4256 BLAKE2B b88389581da14df1c3328b439068d619ce071d1a847d7259babe787e65a9e2851b310795aa1c93b6ecec766f515ad0792b33747358fb04979b82a2a2a60c87d1 SHA512 3f5956ae078e98839a50f09aa70a43e6f732a7fb7a3749032a43166fd57405f7f9363e12315d3c03ce81d3098495906f8f8ba1b72b2089a9e3201b4a02c8645a
 MISC metadata.xml 736 BLAKE2B c9ff0661b5a87747a83a9d0f88f2a994e23e9e741e669fab4bd42351f74eb9dd8d55ae7d9a56d3a865eef344484a489f08359cc0e44874787fed0538f977c159 SHA512 5b06fe1d24d811fe7c408f38849c06360a5e59d98e5076214cdf041f95f5ed5ae4b625331337ce7c0d00db62fd4db6ca78f6cb2902409f340ba47d8204ab5692
diff --git a/x11-wm/fvwm/files/fvwm-2.7.0-c99.patch b/x11-wm/fvwm/files/fvwm-2.7.0-c99.patch
new file mode 100644
index 000000000000..7bc137dc6cc2
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.7.0-c99.patch
@@ -0,0 +1,99 @@
+https://github.com/fvwmorg/fvwm/pull/100
+
+From 0b4daddf6b88b696daf54714448b8d89a615abf2 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Thu, 24 Nov 2022 13:06:50 +0100
+Subject: [PATCH 1/3] configure: Do not require support for implicit ints
+
+Implicit ints  have not been part of C since 1999, and future
+compilers will disable support for them by default.  Fortunatenly,
+only one configure check needs adjusting.
+---
+ acinclude.m4 | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 8b74ff1e5..b66042f9f 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -30,7 +30,7 @@ if test "$ac_cv_func_select" = yes; then
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif],
+-[extern select ($ac_cv_type_fd_set_size_t,
++[extern int select ($ac_cv_type_fd_set_size_t,
+  $ac_cv_type_fd_set *,	$ac_cv_type_fd_set *, $ac_cv_type_fd_set *,
+  $ac_type_timeval *);],
+ [ac_found=yes ; break 3],ac_found=no)
+diff --git a/configure.ac b/configure.ac
+index 97ab9e7a1..c9fcede6a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -220,7 +220,7 @@ AC_MINIX
+ 
+ # catch -Werror and similar options when running configure
+ AC_TRY_COMPILE([#include <stdio.h>],
+-[int i; static j; int *p; char *c;
++[int i; int *p; char *c;
+   switch (*p = p = *c) { case 0: printf("%Q", c, p); }
+   *c = &i; c = p;
+   while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1));
+
+From 6b9d100ae4e784821b5189474dc58e646417bcf6 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Thu, 24 Nov 2022 13:07:56 +0100
+Subject: [PATCH 2/3] acinclude.m4: Add missing <unistd.h> to
+ AM_SAFETY_CHECK_MKSTEMP
+
+Otherwise, the check fails on a compiler which does not support
+implicit function declarations (a language feature removed in 1999).
+---
+ acinclude.m4 | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index b66042f9f..4dee2abeb 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1154,6 +1154,9 @@ AC_DEFUN([AM_SAFETY_CHECK_MKSTEMP],[
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ int main(void)
+ {
+   char template[128];
+
+From 33537b8ae5a302e4016dc1c6cfe5577fb3fa36c9 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Tue, 19 Dec 2023 13:24:50 +0100
+Subject: [PATCH 3/3] configure: Further defang the -Werror check
+
+Incompatible pointer types are actually errors (in the sense
+that they are invalid C).  Compilers have merely tolerated them as
+warnings for backwards compatibility.  This is changing with Clang 16
+and GCC 14, so relax the check a little.
+---
+ configure.ac | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c9fcede6a..2e9615b2b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -220,9 +220,8 @@ AC_MINIX
+ 
+ # catch -Werror and similar options when running configure
+ AC_TRY_COMPILE([#include <stdio.h>],
+-[int i; int *p; char *c;
+-  switch (*p = p = *c) { case 0: printf("%Q", c, p); }
+-  *c = &i; c = p;
++[int unused; int *p; char *c;
++  printf("%Q", c, p);
+   while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1));
+ ], , AC_MSG_ERROR("
+ configure is not able to compile programs with warnings.  Please
+
diff --git a/x11-wm/fvwm/fvwm-2.7.0-r2.ebuild b/x11-wm/fvwm/fvwm-2.7.0-r2.ebuild
new file mode 100644
index 000000000000..8f75a2f03ab7
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.7.0-r2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools flag-o-matic python-single-r1 desktop
+
+DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
+HOMEPAGE="https://www.fvwm.org/"
+SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+ FVWM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="bidi debug doc netpbm nls perl png readline stroke svg tk truetype +vanilla xinerama lock"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/libiconv
+	$(python_gen_cond_dep '
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	')
+	bidi? ( dev-libs/fribidi )
+	nls? ( virtual/libintl )
+	png? ( media-libs/libpng:0= )
+	readline? (
+		sys-libs/ncurses:0=
+		sys-libs/readline:0=
+	)
+	stroke? ( dev-libs/libstroke )
+	svg? ( gnome-base/librsvg )
+	truetype? (
+		media-libs/fontconfig
+		x11-libs/libXft
+	)
+	xinerama? ( x11-libs/libXinerama )
+"
+RDEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-lang/perl
+	sys-apps/debianutils
+	perl? ( tk? (
+			dev-lang/tk
+			dev-perl/Tk
+			>=dev-perl/X11-Protocol-0.56
+		)
+	)
+	lock? ( x11-misc/xlockmore )
+	netpbm? ( media-libs/netpbm )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-lang/perl
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	if ! use vanilla; then
+		# Enables fast translucent menus; patch from fvwm-user mailing list.
+		eapply -p0 "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"
+
+		# Allow more mouse buttons, bug #411811
+		eapply -p0 "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch"
+	fi
+
+	eapply -p0 "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
+
+	eapply "${FILESDIR}"/fvwm-2.7.0-c99.patch
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
+		--enable-iconv
+		--enable-package-subdirs
+		--enable-mandoc
+		--without-rplay-library
+		$(use_enable bidi)
+		$(use_enable debug debug-msgs)
+		$(use_enable debug command-log)
+		$(use_enable doc htmldoc)
+		$(use_enable nls)
+		$(use_enable perl perllib)
+		$(use_enable png)
+		$(use_with readline readline-library)
+		$(use_with stroke stroke-library)
+		$(use_enable svg rsvg)
+		$(use_enable truetype xft)
+		$(use_enable xinerama)
+	)
+
+	# Non-upstream email where bugs should be sent; used in fvwm-bug.
+	export FVWM_BUGADDR="maintainer-needed@gentoo.org"
+
+	# Recommended by upstream, reference ????
+	append-flags -fno-strict-aliasing
+
+	# Signed chars are required.
+	use ppc && append-flags -fsigned-char
+
+	use readline && myeconfargs+=( --without-termcap-library )
+
+	export ac_cv_path_PYTHON="${PYTHON}"
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	make_session_desktop fvwm /usr/bin/fvwm
+
+	if ! use lock; then
+		find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
+	fi
+
+	if use perl; then
+		if ! use tk; then
+			rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Tk.pm || die
+			rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm || die
+			find "${D}"/usr/share/fvwm/perllib -depth -type d -exec rmdir '{}' \; 2>/dev/null
+		fi
+	else
+		# Completely wipe it if ! use perl
+		rm -r "${D}"/usr/bin/fvwm-perllib "${D}"/usr/share/man/man1/fvwm-perllib.1
+	fi
+
+	# Utility for testing FVWM behaviour by creating a simple window with
+	# configurable hints.
+	if use debug; then
+		dobin "${S}"/tests/hints/hints_test
+		newdoc "${S}"/tests/hints/README README.hints
+	fi
+
+	exeinto /etc/X11/Sessions
+	newexe - ${PN} <<-EOF
+	#!/bin/sh
+	${PN}
+	EOF
+
+	dodoc docs/{COMMANDS,DEVELOPERS.md}
+
+	# README file for translucent menus patch.
+	if ! use vanilla; then
+		dodoc "${FILESDIR}"/README.translucency
+		ewarn "You are using a patched build, so, please, don't"
+		ewarn "report bugs at the fvwm-workers list unless you are"
+		ewarn "also able to reproduce them with a vanilla build (USE=vanilla)."
+	fi
+}