From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A8B8A158042 for ; Sun, 20 Oct 2024 22:06:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9E40E087A; Sun, 20 Oct 2024 22:06:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC1F8E087A for ; Sun, 20 Oct 2024 22:06:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94CCC341256 for ; Sun, 20 Oct 2024 22:06:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C971819CB for ; Sun, 20 Oct 2024 22:06:53 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1729462004.22ef345f27fadc516cd27cbeb7271e9cd76d3455.kangie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/fvwm3/fvwm3-9999.ebuild X-VCS-Directories: x11-wm/fvwm3/ X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 22ef345f27fadc516cd27cbeb7271e9cd76d3455 X-VCS-Branch: master Date: Sun, 20 Oct 2024 22:06:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 100d87f9-bc6e-4157-9d15-d8c4c8b7601d X-Archives-Hash: 4b84b0bd53fdbfca9135dd3715ffefff commit: 22ef345f27fadc516cd27cbeb7271e9cd76d3455 Author: Matt Jolly gentoo org> AuthorDate: Sun Oct 20 22:05:38 2024 +0000 Commit: Matt Jolly gentoo org> CommitDate: Sun Oct 20 22:06:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22ef345f x11-wm/fvwm3: update live - Meson Build - enable py3.13 - sanity check deps Signed-off-by: Matt Jolly gentoo.org> x11-wm/fvwm3/fvwm3-9999.ebuild | 101 ++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 63 deletions(-) diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild index 9a9eba17220d..f4eabc6cad94 100644 --- a/x11-wm/fvwm3/fvwm3-9999.ebuild +++ b/x11-wm/fvwm3/fvwm3-9999.ebuild @@ -8,9 +8,9 @@ EAPI=8 # Scripting for this is in sam-gentoo-scripts. : ${FVWM3_DOCS_PREBUILT:=1} -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) GO_OPTIONAL=1 -inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs +inherit flag-o-matic go-module meson python-single-r1 DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm" HOMEPAGE="https://www.fvwm.org/" @@ -31,9 +31,8 @@ fi LICENSE="GPL-2+ FVWM go? ( Apache-2.0 BSD MIT )" SLOT="0" -IUSE="bidi debug +go netpbm nls perl readline stroke svg tk lock" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE}" +IUSE="bidi +go netpbm nls perl readline svg" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" DOCS=( NEWS ) @@ -83,20 +82,15 @@ RDEPEND="${PYTHON_DEPS} x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender + x11-misc/xlockmore + dev-lang/tk + dev-perl/Tk + >=dev-perl/X11-Protocol-0.56 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 @@ -105,14 +99,6 @@ RDEPEND="${PYTHON_DEPS} DEPEND="${COMMON_DEPEND} x11-base/xorg-proto" -src_prepare() { - default - use go && ( sed -e 's/GOFLAGS=-ldflags="-s -w"/GOFLAGS=/' \ - -i bin/FvwmPrompt/Makefile.am || die ) - - eautoreconf -} - src_configure() { # Recommended by upstream for release. Doesn't really matter for live ebuilds. append-flags -fno-strict-aliasing @@ -122,68 +108,57 @@ src_configure() { 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 go golang) - $(use_enable nls) - $(use_enable nls iconv) - $(use_enable perl perllib) - $(use_with readline readline-library) - $(use_enable svg rsvg) - --enable-png + local emesonargs=( + "-Dpng=enabled" + "-Dsm=enabled" + "-Dxcursor=enabled" + "-Dxkbcommon=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} == 0 ]]; then - myconf+=( - --enable-mandoc - --enable-htmldoc + emesonargs+=( + "-Dhtmldoc=true" + "-Dmandoc=true" ) else # Probably not required, but let's be safe - myconf+=( - --disable-mandoc - --disable-htmldoc + emesonargs+=( + "-Dhtmldoc=false" + "-Dmandoc=false" ) fi - use readline && myconf+=( --without-termcap-library ) - - econf "${myconf[@]}" -} - -src_compile() { - PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)" + 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 via emake + # 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/* - else - HTML_DOCS="${S}"/doc/*.html - doman "${S}"/doc/*.[0-8] fi - einstalldocs - 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" - - make_session_desktop fvwm3 /usr/bin/fvwm3 + meson_src_install + if ! use go; then + python_scriptinto "/usr/bin" + python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop" + fi } pkg_postinst() {