From 1cdd9ad1551742801189a2841da952d856480dfc Mon Sep 17 00:00:00 2001 From: Alarig Le Lay Date: Wed, 19 Apr 2023 23:18:46 +0200 Subject: [PATCH] x11-libs/vte: add 0.70.3 --- x11-libs/vte/Manifest | 1 + ...-is-outside-the-valid-range-clang-16.patch | 47 ++++++++ x11-libs/vte/vte-0.70.3.ebuild | 105 ++++++++++++++++++ 3 files changed, 153 insertions(+) create mode 100644 x11-libs/vte/files/vte-0.70-integer-value-is-outside-the-valid-range-clang-16.patch create mode 100644 x11-libs/vte/vte-0.70.3.ebuild diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest index 0ace292..53261fa 100644 --- a/x11-libs/vte/Manifest +++ b/x11-libs/vte/Manifest @@ -1,3 +1,4 @@ DIST vte-0.70.0-command-notify.patch.xz 9040 BLAKE2B 108dd05d00409af90b1fd3e9b5c3b0e5586ac80204cef8840fda935204cbc480fec1193e2a0a2782f98e2b094c3caebbfe61cf18631b16921df05cf3808afd22 SHA512 92123e7f5cb6ef876f2b2b108dbef59bce212efebd64cd790d49d9ee3215344acd848eec5d326fe2c3bd236846ed3b896148024390093491b2f6e2f7c46e2bd1 DIST vte-0.70.1.tar.bz2 502044 BLAKE2B 0a9ce43c1863e823fcd073fd30fb6b2cb39e9168e850796fe12be2b9bdfc0b24ceea974b4c94bcdd10f2225613990e0e079194380241b7e625cb6dc4309a7476 SHA512 88de629b382eca8a42199b2ba9b248e231817e1de7183417aed150bcf61530084f7177d73dee9aab25fe4c3ab80d795b5fdcae336687560d3b582bd04181353d DIST vte-0.70.2.tar.bz2 502395 BLAKE2B ae127d8262c7038b3a2cda9a9622e9a075dfc1e06a7710810a4bb894a6646155790776553f663677cb86c3479e6d3faf92c38b5b97dd6970df37cee92dd963fa SHA512 1e113da0591830c057358dd78cfe2f814dd0bfabd037973369266823a9a4936a200b5b23faab3757ced4d08aa96a76d6b1120419815a181598493e35d2ea58d0 +DIST vte-0.70.3.tar.bz2 502706 BLAKE2B 1fee46dee38618137781d62b27730893b0c6969cf3badfa157628621a608983be48e35ef4d8e58099c93b8be91434b257d120cab2e7a943cfecaf37ff7b3fd5d SHA512 5520bc58b0ad2f803da27985e30862de987ecc31c0137895c6945c53f99a7c16ee0281646b9e04362de934364ee7beaa1acf47dad9baf5a16ab9898d5f746d2d diff --git a/x11-libs/vte/files/vte-0.70-integer-value-is-outside-the-valid-range-clang-16.patch b/x11-libs/vte/files/vte-0.70-integer-value-is-outside-the-valid-range-clang-16.patch new file mode 100644 index 0000000..ab6acea --- /dev/null +++ b/x11-libs/vte/files/vte-0.70-integer-value-is-outside-the-valid-range-clang-16.patch @@ -0,0 +1,47 @@ +# From 9400d41660e6c27b672f9c77855d736581f499bf Mon Sep 17 00:00:00 2001 +# From: Khem Raj +# Date: Thu, 2 Mar 2023 22:57:00 +0100 +# Subject: [PATCH] pty: Do not typecast to GSpawnFlags +# +# GSpawnFlags is enum with max value 1 << 15 which means it fits into +# a short, however here we are oring VTE_SPAWN_* as well which have +# higher values (by design). This fixes a compile error on clang 16 +# with the -Wenum-constexpr-conversion flag. +# +# Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2618 +# (cherry picked from commit 9b41cd1014299d01111b64b705f013e28398821a) +# +# Also refer: https://gitlab.gnome.org/GNOME/vte/-/commit/9400d41660e6c27b672f9c77855d736581f499bf.patch +--- a/src/vtepty.cc ++++ b/src/vtepty.cc +@@ -574,18 +574,18 @@ catch (...) + static constexpr inline auto + all_spawn_flags() noexcept + { +- return GSpawnFlags(G_SPAWN_LEAVE_DESCRIPTORS_OPEN | +- G_SPAWN_DO_NOT_REAP_CHILD | +- G_SPAWN_SEARCH_PATH | +- G_SPAWN_STDOUT_TO_DEV_NULL | +- G_SPAWN_STDERR_TO_DEV_NULL | +- G_SPAWN_CHILD_INHERITS_STDIN | +- G_SPAWN_FILE_AND_ARGV_ZERO | +- G_SPAWN_SEARCH_PATH_FROM_ENVP | +- G_SPAWN_CLOEXEC_PIPES | +- VTE_SPAWN_NO_PARENT_ENVV | +- VTE_SPAWN_NO_SYSTEMD_SCOPE | +- VTE_SPAWN_REQUIRE_SYSTEMD_SCOPE); ++ return (G_SPAWN_LEAVE_DESCRIPTORS_OPEN | ++ G_SPAWN_DO_NOT_REAP_CHILD | ++ G_SPAWN_SEARCH_PATH | ++ G_SPAWN_STDOUT_TO_DEV_NULL | ++ G_SPAWN_STDERR_TO_DEV_NULL | ++ G_SPAWN_CHILD_INHERITS_STDIN | ++ G_SPAWN_FILE_AND_ARGV_ZERO | ++ G_SPAWN_SEARCH_PATH_FROM_ENVP | ++ G_SPAWN_CLOEXEC_PIPES | ++ VTE_SPAWN_NO_PARENT_ENVV | ++ VTE_SPAWN_NO_SYSTEMD_SCOPE | ++ VTE_SPAWN_REQUIRE_SYSTEMD_SCOPE); + } + + static constexpr inline auto diff --git a/x11-libs/vte/vte-0.70.3.ebuild b/x11-libs/vte/vte-0.70.3.ebuild new file mode 100644 index 0000000..8a8f8ed --- /dev/null +++ b/x11-libs/vte/vte-0.70.3.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) + +inherit gnome.org meson python-any-r1 vala xdg + +DESCRIPTION="Library providing a virtual terminal emulator widget" +HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE" + +# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+) +LICENSE="LGPL-3+ GPL-3+" +SLOT="2.91" # vte_api_version in meson.build +IUSE="+crypt debug gtk-doc +icu +introspection mouse systemd +vala vanilla" +KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +REQUIRED_USE=" + gtk-doc? ( introspection ) + vala? ( introspection ) +" + +# Upstream is hostile and refuses to upload tarballs. +SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2" +SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.70.0-command-notify.patch.xz )" + +DEPEND=" + >=x11-libs/gtk+-3.24.22:3[introspection?] + >=dev-libs/fribidi-1.0.0 + >=dev-libs/glib-2.52:2 + crypt? ( >=net-libs/gnutls-3.2.7:0= ) + icu? ( dev-libs/icu:= ) + >=x11-libs/pango-1.22.0 + >=dev-libs/libpcre2-10.21:= + systemd? ( >=sys-apps/systemd-220:= ) + sys-libs/zlib + introspection? ( >=dev-libs/gobject-introspection-1.56:= ) + x11-libs/pango[introspection?] +" +RDEPEND="${DEPEND} + ~gui-libs/vte-common-${PV}[systemd?] +" +BDEPEND=" + ${PYTHON_DEPS} + dev-libs/libxml2:2 + dev-util/glib-utils + gtk-doc? ( dev-util/gi-docgen ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +src_prepare() { + default + use vala && vala_setup + xdg_environment_reset + + use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch + + if ! use vanilla; then + # Part of https://src.fedoraproject.org/rpms/vte291/raw/f37/f/vte291-cntnr-precmd-preexec-scroll.patch + # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere + eapply "${WORKDIR}"/${PN}-0.70.0-command-notify.patch + fi + + if ! use mouse; then + eapply "${FILESDIR}"/${PN}-0.60.3-disable-mouse.patch + fi + + # -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter + sed -e '/ggdb3/d' -i meson.build || die + sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk3_api_name/' meson.build || die +} + +src_configure() { + local emesonargs=( + -Da11y=true + $(meson_use debug debugg) + $(meson_use gtk-doc docs) + $(meson_use introspection gir) + -Dfribidi=true # pulled in by pango anyhow + -Dglade=true + $(meson_use crypt gnutls) + -Dgtk3=true + -Dgtk4=false + $(meson_use icu) + $(meson_use systemd _systemd) + $(meson_use vala vapi) + ) + meson_src_configure +} + +src_install() { + meson_install # not meson_src_install because this would include einstalldocs, which would result in file collisions with gui-libs/vte + # Remove files that are provided by gui-libs/vte-common + rm "${ED}"/usr/libexec/vte-urlencode-cwd || die + rm "${ED}"/etc/profile.d/vte.sh || die + rm "${ED}"/etc/profile.d/vte.csh || die + if use systemd; then + rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die + fi + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/ || die + mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/vte-${SLOT}-gtk3 || die + fi +}