summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorMatt Jolly <Matt.Jolly@footclan.ninja>2023-10-17 15:50:56 +1000
committerJoonas Niilola <juippis@gentoo.org>2023-10-17 09:37:46 +0300
commit6eb1cccd1b7165e4708372833e0779a3d2ad795f (patch)
tree9731c8730c235f317536ec6f42d533558760e767 /x11-wm
parentx11-wm/fvwm3: drop 1.0.4-r2, 1.0.6a, 1.0.7 (diff)
downloadgentoo-6eb1cccd1b7165e4708372833e0779a3d2ad795f.tar.gz
gentoo-6eb1cccd1b7165e4708372833e0779a3d2ad795f.tar.bz2
gentoo-6eb1cccd1b7165e4708372833e0779a3d2ad795f.zip
x11-wm/fvwm3: add 1.0.8
- add python 3.12 Closes: https://bugs.gentoo.org/915473 Bug: https://bugs.gentoo.org/901275 Signed-off-by: Matt Jolly <Matt.Jolly@footclan.ninja> Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/fvwm3/Manifest1
-rw-r--r--x11-wm/fvwm3/files/fvwm3-1.0.8-implicit-function-decl-configure.patch18
-rw-r--r--x11-wm/fvwm3/fvwm3-1.0.8.ebuild172
-rw-r--r--x11-wm/fvwm3/fvwm3-9999.ebuild2
4 files changed, 192 insertions, 1 deletions
diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest
index a7170599e5f2..86b92f252746 100644
--- a/x11-wm/fvwm3/Manifest
+++ b/x11-wm/fvwm3/Manifest
@@ -1 +1,2 @@
DIST fvwm3-1.0.7.tar.gz 4512128 BLAKE2B 9e7363355f3d3221dc72175c6ff449a476a32020248dc580c4b73687759c49b255bab8b7e29440fa1473153459ef984369e88d331a0b55154114e3c901867003 SHA512 91973abb7b3f79cec4fba28d9aa071923aa975eae3f3e00257e8633e2d376732cd5db7e42a4330bc849f807fc149abfbeef6100fe2ca6c05c847b61ee48236ed
+DIST fvwm3-1.0.8.tar.gz 5644021 BLAKE2B c2a0a4953f556f86128452c8b42d8f86e2a02c9314cca17688987a51ed91bb3ecccf29e77f2b01c7ed444b54f45e402859ed1cce39714ad6d47860f639509b80 SHA512 fef69b6d97b3533e6722b48336aa8904b399c42437c4adcab756edf55cf839126002255dfa268bf7159d3bb9caf4d44c43a9217c9df5dc6224cef8461ecf2c34
diff --git a/x11-wm/fvwm3/files/fvwm3-1.0.8-implicit-function-decl-configure.patch b/x11-wm/fvwm3/files/fvwm3-1.0.8-implicit-function-decl-configure.patch
new file mode 100644
index 000000000000..374afddcd6e4
--- /dev/null
+++ b/x11-wm/fvwm3/files/fvwm3-1.0.8-implicit-function-decl-configure.patch
@@ -0,0 +1,18 @@
+https://github.com/fvwmorg/fvwm3/pull/914
+From: Matt Jolly <Matt.Jolly@footclan.ninja>
+Date: Tue, 17 Oct 2023 16:01:33 +1000
+Subject: [PATCH] Fix implicit function declaration in configure
+
+Missing unistd.h include for `close` and `unlink`
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -996,6 +996,7 @@ AC_DEFUN([AM_SAFETY_CHECK_MKSTEMP],[
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ int main(void)
+ {
+ char template[128];
+--
+2.42.0
diff --git a/x11-wm/fvwm3/fvwm3-1.0.8.ebuild b/x11-wm/fvwm3/fvwm3-1.0.8.ebuild
new file mode 100644
index 000000000000..3cbbc80a0860
--- /dev/null
+++ b/x11-wm/fvwm3/fvwm3-1.0.8.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+GO_OPTIONAL=1
+inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs
+
+DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm"
+HOMEPAGE="https://www.fvwm.org/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git"
+ EGIT_BRANCH="main"
+else
+ SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~riscv"
+fi
+
+LICENSE="GPL-2+ FVWM
+ go? ( Apache-2.0 BSD MIT )"
+SLOT="0"
+IUSE="bidi debug doc +go netpbm nls perl readline stroke svg tk lock"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}"
+
+DOCS=( NEWS )
+
+if [[ ${PV} == 9999 ]]; then
+ DOCS+=(
+ dev-docs/COMMANDS
+ dev-docs/DEVELOPERS.md
+ dev-docs/INSTALL.md
+ dev-docs/PARSING.md
+ dev-docs/TODO.md
+ dev-docs/NEW-COMMANDS.md
+ )
+fi
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( dev-libs/libxslt
+ dev-ruby/asciidoctor )
+ app-arch/unzip
+ go? ( >=dev-lang/go-1.14 )
+"
+
+RDEPEND="${PYTHON_DEPS}
+ ${COMMON_DEPEND}
+ !x11-wm/fvwm
+ dev-lang/perl
+ dev-libs/glib:2
+ dev-libs/libevent:=
+ media-libs/fontconfig
+ media-libs/libpng:=
+ sys-apps/debianutils
+ 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/libXft
+ x11-libs/libXpm
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ bidi? ( dev-libs/fribidi )
+ lock? ( x11-misc/xlockmore )
+ netpbm? ( media-libs/netpbm )
+ perl? ( tk? (
+ dev-lang/tk
+ dev-perl/Tk
+ >=dev-perl/X11-Protocol-0.56
+ )
+ )
+ readline? (
+ sys-libs/ncurses:=
+ sys-libs/readline:=
+ )
+ stroke? ( dev-libs/libstroke )
+ svg? (
+ gnome-base/librsvg:2
+ x11-libs/cairo
+ )"
+
+DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto"
+
+PATCHES=(
+ "${FILESDIR}/${P}-implicit-function-decl-configure.patch"
+)
+
+src_prepare() {
+ default
+ use go && ( sed -e 's/GOFLAGS=-ldflags="-s -w"/GOFLAGS=/' \
+ -i bin/FvwmPrompt/Makefile.am || die )
+
+ eautoreconf
+}
+
+src_configure() {
+ # Non-upstream email where bugs should be sent; used in fvwm-bug.
+ export FVWM_BUGADDR="desktop-wm@nogentoo.org"
+
+ # Recommended by upstream for release. Doesn't really matter for live ebuilds.
+ append-flags -fno-strict-aliasing
+
+ # Signed chars are required.
+ for arch in arm arm64 ppc ppc64; do
+ use $arch && append-flags -fsigned-chars
+ done
+
+ local myconf=(
+ --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
+ --enable-package-subdirs
+ $(use_enable bidi)
+ $(use_enable doc mandoc)
+ $(use_enable go golang)
+ $(use_enable nls)
+ $(use_enable nls iconv)
+ $(use_enable perl perllib)
+ $(use_with readline readline-library)
+ $(use_enable svg rsvg)
+ --enable-png
+ )
+
+ use readline && myconf+=( --without-termcap-library )
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
+ if [[ ${PV} == *9999 ]]; then
+ use doc && emake -C doc
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install
+
+ exeinto /etc/X11/Sessions
+ newexe - ${PN} <<-EOF
+ #!/bin/sh
+ ${PN}
+ EOF
+
+ python_scriptinto "/usr/bin"
+ python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
+ einstalldocs
+
+ make_session_desktop fvwm3 /usr/bin/fvwm3
+}
+
+pkg_postinst() {
+ if use go; then
+ ewarn "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole."
+ ewarn "For compatibility with the existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper."
+ ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\";"
+ ewarn "however FvwmPrompt and FvwmCommand will not be installed."
+ else
+ ewarn "FvwmConsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild."
+ ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"."
+ ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way."
+ fi
+}
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 897728504f51..8bc78a359bc5 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
GO_OPTIONAL=1
inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs