x11-wm/fvwm3: add 1.1.4

Signed-off-by: Matt Jolly <kangie@gentoo.org>
This commit is contained in:
Matt Jolly
2026-03-09 12:21:25 +10:00
parent 0397b283fa
commit 98ceed68de
6 changed files with 180 additions and 12 deletions

View File

@@ -4,3 +4,5 @@ DIST fvwm3-1.1.2-docs.tar.xz 248024 BLAKE2B fbc182f3a5ea38135f487f75c9b4e399855f
DIST fvwm3-1.1.2.tar.gz 4019330 BLAKE2B 1bf8b82c060e6724375758838dd4b91b189cb1263c510b323a673ea3eb83c8b5e3eb358965a89c3c205ed04c8a90e50a07e4690d9746d54abcafd4cf15a879bd SHA512 1b9473ebde6e9a6399fd185f83c0fc403e84f6e7d3648d141f6418e4b6489d0955d384bb2249b85b8372b8731ab205a99dcd64b0aeb697129b1164fb33090f56
DIST fvwm3-1.1.3-docs.tar.xz 249336 BLAKE2B 5279c29960dfc335af11f70f3c4af70bd106121116bafd501f7b5c53cc6fc390e9f41444a2062a8189cd1465f4c25aad2e016c5a0450b8d4faadaba5b7afe14f SHA512 7a781b639b735d0cc83f536221143a1cb0a33f2ca0782c10eaace96012cc820b8dc7bf2fa886399e712fc9c31bc039517c5e9c8c21070bea096a989f4e55ef51
DIST fvwm3-1.1.3.tar.gz 3981597 BLAKE2B 6faa6d332660858b25e3da7ecbf712a5c69e00ccaa0bb22a2e10a5dad1ef26cd42b86a9eb96a5a29b9d7f39c0199fed42142a7aae8eb40c012666eaf130bad38 SHA512 0f774e282ea86d93f20fedd9ca91e9d7c3e94d01160631ff87e331f8a48923949b965624546557c1d9fdbe3b3dd81d51bd90137a21b60c7b0960ae137476b48d
DIST fvwm3-1.1.4-docs.tar.xz 249644 BLAKE2B 9b87b6a2f76c628d44e0e4a518955610345b69363299e84277b0b7f1706e7cdc2b4628c3e4419c81d79bd0e0f02d3b63c7ed966029abdef6ab6c9f3a6fc3569a SHA512 dabccc8d3f7fdd9e8e70deeff6ee67f75e2efaa255ee5489e7201ebc329e1eb03522d0ad8744ce7911adf1ff1acfeed22fc448bfd3aaa2ee87df1b3f58de80e6
DIST fvwm3-1.1.4.tar.gz 3994027 BLAKE2B 3a98ee267110acb05495b59231bb0b1b5b50c5392c468efd6a30eb5ddcce6bcc31488b2cc2047e863a6607c2604a371fbc857476983f6b8ce30197e25296e50e SHA512 82f0ecc4844cbc45ca53cd884ac1cff9776b881566595993978d0d4e91a74efdf39000a536309f4acd6131c248534ff7b562fd0acd82ae98dbeb3328bed7e712

View File

@@ -1,10 +1,9 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs
# for release ebuilds.
# Doc generation pulls in asciidoc/ruby; we'll prebuild docs for release ebuilds.
# Scripting for this is in sam-gentoo-scripts.
: ${FVWM3_DOCS_PREBUILT:=1}

View File

@@ -1,10 +1,9 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs
# for release ebuilds.
# Doc generation pulls in asciidoc/ruby; we'll prebuild docs for release ebuilds.
# Scripting for this is in sam-gentoo-scripts.
: ${FVWM3_DOCS_PREBUILT:=1}

View File

@@ -1,10 +1,9 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs
# for release ebuilds.
# Doc generation pulls in asciidoc/ruby; we'll prebuild docs for release ebuilds.
# Scripting for this is in sam-gentoo-scripts.
: ${FVWM3_DOCS_PREBUILT:=1}

View File

@@ -0,0 +1,170 @@
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# Doc generation pulls in asciidoc/ruby; we'll prebuild docs for release ebuilds.
# Scripting for this is in sam-gentoo-scripts.
: ${FVWM3_DOCS_PREBUILT:=1}
PYTHON_COMPAT=( python3_{11..13} )
GO_OPTIONAL=1
inherit go-module meson optfeature python-single-r1
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"
FVWM3_DOCS_PREBUILT=0
else
SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz"
if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz"
fi
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2+ FVWM
go? ( Apache-2.0 BSD MIT )"
SLOT="0"
IUSE="bidi +go nls readline svg"
# Strictly speaking readline is not required for go,
# but as most systems already have it installed we don't users to stub their toe on REQUIRED_USE
REQUIRED_USE="${PYTHON_REQUIRED_USE} !go? ( readline )"
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
app-arch/unzip
go? ( >=dev-lang/go-1.20 )
"
if [[ ${FVWM3_DOCS_PREBUILT} -ne 1 ]]; then
BDEPEND+="
dev-libs/libxslt
dev-ruby/asciidoctor
"
fi
COMMON_DEPEND="
dev-lang/perl
dev-libs/glib:2
dev-libs/libevent:=
media-libs/fontconfig
media-libs/libpng:=
x11-base/xorg-proto
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libxcb
x11-libs/libXcursor
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXft
x11-libs/libxkbcommon
x11-libs/libXpm
x11-libs/libXrandr
x11-libs/libXrender
x11-libs/xtrans
bidi? ( dev-libs/fribidi )
readline? (
sys-libs/readline:=
)
svg? (
gnome-base/librsvg:2
x11-libs/cairo
)
"
RDEPEND="
${COMMON_DEPEND}
${PYTHON_DEPS}
!x11-wm/fvwm
"
DEPEND="${COMMON_DEPEND}"
src_configure() {
local emesonargs=(
"-Dpng=enabled"
"-Dsm=enabled"
"-Dxcursor=enabled"
"-Dxfixes=enabled"
"-Dxpm=enabled"
"-Dxrender=enabled"
$(meson_feature bidi)
$(meson_feature go golang)
$(meson_feature nls iconv)
$(meson_feature nls)
$(meson_feature readline) # not required for go but it won't hurt to enable it
$(meson_feature svg cairo) # Pick 1 of 'cairo', 'cairo-svg', or 'libsvg-cairo'; add the appropriate dependency
$(meson_feature svg)
"-Dcairo-svg=disabled"
"-Dlibsvg-cairo=disabled"
"-Ddocdir=${EPREFIX}/usr/share/doc/${PF}"
)
if [[ ${FVWM3_DOCS_PREBUILT} -ne 1 ]]; then
emesonargs+=(
"-Dhtmldoc=true"
"-Dmandoc=true"
)
else
# Probably not required, but let's be safe
emesonargs+=(
"-Dhtmldoc=false"
"-Dmandoc=false"
)
fi
meson_src_configure
}
src_install() {
# Since we're manually handling docs installation, let's do that first
# and then install the rest of the files "normally".
local HTML_DOCS
if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then
doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8]
HTML_DOCS="${WORKDIR}"/${P}-docs/html/*
fi
einstalldocs
meson_src_install
python_scriptinto "/usr/bin"
python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
}
pkg_postinst() {
einfo "For compatibility with existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper."
if use go; then
einfo "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole."
einfo "If you need FvwmConsole, install ${PN} with USE=\"-go\"; however FvwmPrompt will not be installed."
else
einfo "FvwmConsole has been installed, hovever it is a legacy tool."
einfo "Consider installing with USE=\"go\" which will have FvwmPrompt replace FvwmConsole to"
einfo "provide the same functionality in a more flexible way."
fi
optfeature_header "Useful optional features:"
optfeature "Screen locking" x11-misc/xlockmore
optfeature "NetPBM support (used by FvwmScript-ScreenDump)" media-libs/netpbm
}

View File

@@ -1,10 +1,9 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs
# for release ebuilds.
# Doc generation pulls in asciidoc/ruby; we'll prebuild docs for release ebuilds.
# Scripting for this is in sam-gentoo-scripts.
: ${FVWM3_DOCS_PREBUILT:=1}