From c472e91a03b4a5c972552c46b4b08268f6a28312 Mon Sep 17 00:00:00 2001 From: Alarig Le Lay Date: Sun, 19 Feb 2023 19:58:51 +0100 Subject: [PATCH] x11-libs/vte: vte-0.70.2 --- x11-libs/vte/Manifest | 5 +- x11-libs/vte/vte-0.66.2.ebuild | 94 ------------------- .../{vte-0.68.0.ebuild => vte-0.70.2.ebuild} | 53 ++++++----- 3 files changed, 32 insertions(+), 120 deletions(-) delete mode 100644 x11-libs/vte/vte-0.66.2.ebuild rename x11-libs/vte/{vte-0.68.0.ebuild => vte-0.70.2.ebuild} (60%) diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest index 5d3a070..0ace292 100644 --- a/x11-libs/vte/Manifest +++ b/x11-libs/vte/Manifest @@ -1,6 +1,3 @@ -DIST vte-0.66.2-command-notify.patch.xz 9672 BLAKE2B 8153a250f571f491845041627029065029bd32ab63c127aacc0852f42abee0834c716d63248120a49011857901d775b75fc0c31a513cfb113563e8ffb599e478 SHA512 d491f8332fbd21e8dfe225636ca035339ab1da3bd7dc74436cdd2f3de3c5f24f609f9825c4eb0b816c9f60862da62b97f36381c5cc5af0203b3698d56fc77d3e -DIST vte-0.66.2.tar.bz2 503503 BLAKE2B 174a0d9bfdaf2318255e62041ed94aa53f8fc110ed55f3e7b24baa70dd01a4851306ac47cc3f1d6699341c9ab41f85aee57c460b9f96bfd14618f0f40e4bd657 SHA512 6e9e2cc03b72c2d04aa3d7633dcf86649dcef39fdfecbe7a0c4b063eaccdb2ea83207f592edf348fad5a36f091d9261cc46fd0a4e9e5db6006fcecb0d01a6ccc -DIST vte-0.68.0-command-notify.patch.xz 9748 BLAKE2B de2d4c9b7f2c2b21518984f818d0052c0084398f5f4ee30d766a6adb9c4536fdec5027c753d3d710fb7432e67472b7f8ca44f1dd5f51aaef48d9124708975d24 SHA512 89be91cdba36749f97bac872f0f2196be7d36a58beaf94fa24a3ae9c266bdfbf4f4fbf1d10f43a276540653fff7062eb844107016e7f014437f2903d251dc1d7 -DIST vte-0.68.0.tar.bz2 507598 BLAKE2B 10274d9e804f00bf071b7848633ca8de2953f4e91dc2967e33b7d6698bb304baac4f0e0431debae5a972c2c56c65efd1c5b92455a17db08cf254ddec56d3276e SHA512 785df7261b5075f166e59de7d3535b381564715ce65efd4837a130e153528691b610fc6160c00f0f17008f5f4ee94c23350d9a477b4b1d58da6ace083e5caae1 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 diff --git a/x11-libs/vte/vte-0.66.2.ebuild b/x11-libs/vte/vte-0.66.2.ebuild deleted file mode 100644 index 372393b..0000000 --- a/x11-libs/vte/vte-0.66.2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) -VALA_USE_DEPEND="vapigen" -VALA_MIN_API_VERSION="0.48" - -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" -IUSE="+crypt debug gtk-doc +icu +introspection mouse systemd +vala vanilla" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -REQUIRED_USE="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.66.2-command-notify.patch.xz )" - -RDEPEND=" - >=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?] -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - dev-libs/libxml2:2 - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.13 - app-text/docbook-xml-dtd:4.1.2 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - - vala? ( $(vala_depend) ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch -) - -src_prepare() { - if ! use vanilla; then - # Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch - # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere - eapply "${WORKDIR}"/${PN}-0.66.2-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 - - if ! use mouse; then - eapply "${FILESDIR}"/${PN}-0.60.3-disable-mouse.patch - fi - - use vala && vala_src_prepare - xdg_src_prepare -} - -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_src_install - mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die -} diff --git a/x11-libs/vte/vte-0.68.0.ebuild b/x11-libs/vte/vte-0.70.2.ebuild similarity index 60% rename from x11-libs/vte/vte-0.68.0.ebuild rename to x11-libs/vte/vte-0.70.2.ebuild index 1392640..8a8f8ed 100644 --- a/x11-libs/vte/vte-0.68.0.ebuild +++ b/x11-libs/vte/vte-0.70.2.ebuild @@ -1,56 +1,54 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -VALA_MIN_API_VERSION="0.48" +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 https://gitlab.gnome.org/GNOME/vte" +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" +SLOT="2.91" # vte_api_version in meson.build IUSE="+crypt debug gtk-doc +icu +introspection mouse systemd +vala vanilla" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -REQUIRED_USE="vala? ( introspection )" +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.68.0-command-notify.patch.xz )" +SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.70.0-command-notify.patch.xz )" -RDEPEND=" +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 + >=dev-libs/libpcre2-10.21:= systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?] " -DEPEND="${RDEPEND}" +RDEPEND="${DEPEND} + ~gui-libs/vte-common-${PV}[systemd?] +" BDEPEND=" ${PYTHON_DEPS} dev-libs/libxml2:2 dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.13 - app-text/docbook-xml-dtd:4.1.2 ) + gtk-doc? ( dev-util/gi-docgen ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig - vala? ( $(vala_depend) ) " -PATCHES=( - "${FILESDIR}"/${PN}-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch -) - src_prepare() { default use vala && vala_setup @@ -59,9 +57,9 @@ src_prepare() { 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/f31/f/vte291-cntnr-precmd-preexec-scroll.patch + # 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.68.0-command-notify.patch + eapply "${WORKDIR}"/${PN}-0.70.0-command-notify.patch fi if ! use mouse; then @@ -70,6 +68,7 @@ src_prepare() { # -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() { @@ -91,6 +90,16 @@ src_configure() { } src_install() { - meson_src_install - mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die + 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 }