From 90e9e4843d7d63c5e7fa1f5d6d6f4cc7350ce77c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Sep 2022 21:08:42 +0100 Subject: gentoo auto-resync : 26:09:2022 - 21:08:42 --- gui-libs/Manifest.gz | Bin 3791 -> 4124 bytes gui-libs/vte-common/Manifest | 4 + .../files/vte-common-0.70.0-musl-W_EXITCODE.patch | 29 ++++++ gui-libs/vte-common/metadata.xml | 12 +++ gui-libs/vte-common/vte-common-0.70.0.ebuild | 78 ++++++++++++++++ gui-libs/vte/Manifest | 5 + .../vte/files/vte-0.66.2-musl-W_EXITCODE.patch | 29 ++++++ gui-libs/vte/metadata.xml | 13 +++ gui-libs/vte/vte-0.70.0.ebuild | 101 +++++++++++++++++++++ 9 files changed, 271 insertions(+) create mode 100644 gui-libs/vte-common/Manifest create mode 100644 gui-libs/vte-common/files/vte-common-0.70.0-musl-W_EXITCODE.patch create mode 100644 gui-libs/vte-common/metadata.xml create mode 100644 gui-libs/vte-common/vte-common-0.70.0.ebuild create mode 100644 gui-libs/vte/Manifest create mode 100644 gui-libs/vte/files/vte-0.66.2-musl-W_EXITCODE.patch create mode 100644 gui-libs/vte/metadata.xml create mode 100644 gui-libs/vte/vte-0.70.0.ebuild (limited to 'gui-libs') diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz index dd753ae9ea3e..b306f9b4ed0d 100644 Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ diff --git a/gui-libs/vte-common/Manifest b/gui-libs/vte-common/Manifest new file mode 100644 index 000000000000..22f2e75c9493 --- /dev/null +++ b/gui-libs/vte-common/Manifest @@ -0,0 +1,4 @@ +AUX vte-common-0.70.0-musl-W_EXITCODE.patch 779 BLAKE2B c35f3cd21e59b9693d75b00232ef8b2d95448f4ff7031142050e9286ff854a19095bb56cec471d50585302ac08ca7a1d40ad068c013d8af142b0165d4c8d2112 SHA512 a3dd31fb4fcc9c2e725cfd64bbc63def63c1c1a85b6896b4a82083d6ff985df885c3a587e8c3c001de2acae476cb950f05a1e31b33bb263ba4895d25fa1e275b +DIST vte-0.70.0.tar.bz2 499283 BLAKE2B 694cf4dfee334e9b54bb8e47f862167acbb8ffc7ac8e81889acd4786449cb45944a87a5adaa036f46458c350ca2119bb356e90dfa71f03638c9c2b14d2ccb877 SHA512 362b71296ae39a16b55402f524a39b063f66ae237e6e161ccc89ca2bb1f2a5c43f4d706d9f3bfae12a99fdb81c4e70408c7f3eca2c01316950b0a3a1a1d79423 +EBUILD vte-common-0.70.0.ebuild 1875 BLAKE2B 33d970a32aa2880b787e24e295e55132c6ec47094d418a2c9033709507561b6e69d603d744b60bd8b821e1337c8f0e4e89a5b9251f86fadda88dbc53dfee08e8 SHA512 738d0259ebd7b68d15c682159f3cd40267e593ce9728474b8e4c5d6031e85b18f7f7508c2debdafe80948cd9dd05b44441a8ceaae715b676fc649a598ce23439 +MISC metadata.xml 433 BLAKE2B 2c71854e6417f0cb37252264beb583f6d0beaada3da3f8ca80c94a0e244065113827f2acf0655632387e2d1689e85dc91ce3be9989b68f0e61bc44b39d898cd8 SHA512 88d6c25bc0de5ef7642320fadb60922d9dfe745e77a99d7aa51d6d55c5355d3f20f65ec29ce951474ccfa158d4c1a81613c24ab274b4cff1b8908e9979c0108e diff --git a/gui-libs/vte-common/files/vte-common-0.70.0-musl-W_EXITCODE.patch b/gui-libs/vte-common/files/vte-common-0.70.0-musl-W_EXITCODE.patch new file mode 100644 index 000000000000..b629613feaf6 --- /dev/null +++ b/gui-libs/vte-common/files/vte-common-0.70.0-musl-W_EXITCODE.patch @@ -0,0 +1,29 @@ +https://gitlab.gnome.org/GNOME/vte/-/issues/72 +https://bugs.gentoo.org/835489 +https://bugs.gentoo/org/554416 + +From 1c1de9e9119cf1e0ef45a594ca9bbf306d2209cb Mon Sep 17 00:00:00 2001 +From: +Date: Fri, 12 Mar 2021 08:41:13 -0600 +Subject: [PATCH] Expanded non-standard W_EXITCODE macro for Musl compatibility + +--- a/src/widget.cc ++++ b/src/widget.cc +@@ -20,8 +20,6 @@ + + #include "widget.hh" + +-#include // for W_EXITCODE +- + #include + #include + #include +@@ -235,7 +233,7 @@ void + Widget::dispose() noexcept + { + if (m_terminal->terminate_child()) { +- int status = W_EXITCODE(0, SIGKILL); ++ int status = (0) << 8 | (SIGKILL); // W_EXITCODE(ret, sig) + emit_child_exited(status); + } + } diff --git a/gui-libs/vte-common/metadata.xml b/gui-libs/vte-common/metadata.xml new file mode 100644 index 000000000000..27f2ae98ad3b --- /dev/null +++ b/gui-libs/vte-common/metadata.xml @@ -0,0 +1,12 @@ + + + + + gnome@gentoo.org + Gentoo GNOME Desktop + + + Support moving terminal child processes to their own systemd user scopes + to avoid terminal getting killed due to child causing OOM + + diff --git a/gui-libs/vte-common/vte-common-0.70.0.ebuild b/gui-libs/vte-common/vte-common-0.70.0.ebuild new file mode 100644 index 000000000000..23bef45e9c29 --- /dev/null +++ b/gui-libs/vte-common/vte-common-0.70.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..11} ) + +inherit gnome.org meson python-any-r1 + +DESCRIPTION="Library providing a virtual terminal emulator widget" +HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/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="systemd" +KEYWORDS="~amd64" + +# Upstream is hostile and refuses to upload tarballs. +SRC_URI="https://gitlab.gnome.org/GNOME/vte/-/archive/${PV}/vte-${PV}.tar.bz2" + +DEPEND=" + || ( >=gui-libs/gtk-4.0.1:4 >=x11-libs/gtk+-3.24.22:3 ) + >=dev-libs/fribidi-1.0.0 + >=dev-libs/glib-2.52:2 + >=x11-libs/pango-1.22.0 + >=dev-libs/libpcre2-10.21 + systemd? ( >=sys-apps/systemd-220:= ) + sys-libs/zlib + x11-libs/pango +" +RDEPEND=" + ! // for W_EXITCODE +- + #include + #include + #include +@@ -235,7 +233,7 @@ void + Widget::dispose() noexcept + { + if (m_terminal->terminate_child()) { +- int status = W_EXITCODE(0, SIGKILL); ++ int status = (0) << 8 | (SIGKILL); // W_EXITCODE(ret, sig) + emit_child_exited(status); + } + } diff --git a/gui-libs/vte/metadata.xml b/gui-libs/vte/metadata.xml new file mode 100644 index 000000000000..da14147f6e15 --- /dev/null +++ b/gui-libs/vte/metadata.xml @@ -0,0 +1,13 @@ + + + + + gnome@gentoo.org + Gentoo GNOME Desktop + + + Enable legacy charset support using dev-libs/icu + Support moving terminal child processes to their own systemd user scopes + to avoid terminal getting killed due to child causing OOM + + diff --git a/gui-libs/vte/vte-0.70.0.ebuild b/gui-libs/vte/vte-0.70.0.ebuild new file mode 100644 index 000000000000..8f8f7969670b --- /dev/null +++ b/gui-libs/vte/vte-0.70.0.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..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 https://gitlab.gnome.org/GNOME/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-gtk4" # vte_api_version + "-gtk4" in meson.build +IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla" +KEYWORDS="~amd64" +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=" + >=gui-libs/gtk-4.0.1:4[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 + + # -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_gtk4_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=false + -Dgtk4=true + $(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 x11-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/ || die + fi +} -- cgit v1.2.3