diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest index 35798ab..e0b2e27 100644 --- a/x11-libs/vte/Manifest +++ b/x11-libs/vte/Manifest @@ -1,4 +1,4 @@ -DIST vte-0.58.3-command-notify.patch.xz 4964 BLAKE2B f8414d3bf124bd3de4c08e22a051feabdb11fbded7562a0bf9858fb8b8cf6327a3fdf7e18592eacd9f3608af5b720fe9a0cb598092a12c816d37d36899d88f6b SHA512 0de06ec0019127ec2729950228f8cae3e61a306207e177b8427789d4f6477f102d78232bd7f1a6e02cc218f507474427ad8366bc3c16c8a305b432dba96ba685 -DIST vte-0.58.3.tar.xz 514844 BLAKE2B 1f48e95ec81397937c8a5a3d34ea9a7d1835d6cacec6e1b90b78568505d509b375f55678462428dd01da00e7290e4543bbab2dbb0aea46a322788fbaf022427b SHA512 b0a38eb1cd7d923b0431af943dbdb89932833f9a2b0b8fc1fa9ee728c87418c1f5a424b2ccee661721093a80c569f3b41c721b0ba2302ba0c3a42d4c5e31aa9a DIST vte-0.60.3-command-notify.patch.xz 6108 BLAKE2B 1f96788c097b003a3f9041529a0ff8ad083fe60597920632450e65ce13ad7181cb3bd4f2713ee19ab7d15154e3546720cdd0a72fabb3710ea7149c63cb159a1f SHA512 070d17fa2dfeed5ccb5ad67687bfb65a6a9dd79db300bb6e00f7d35b8ab3563c331e5f48bbecc32f8037475db319fb71f35e72108f260b6446fd2dd8e1a2897e DIST vte-0.60.3.tar.xz 535504 BLAKE2B c5556fdb91d876aa681d2a9466fa4f4c0ee6be630d076949fbd01878baffdf319e50ec75575729c49c09484914d9ee103d4d491861aedb678b0e336cd4ddcc2e SHA512 3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18 +DIST vte-0.62.1-command-notify.patch.xz 4844 BLAKE2B 22301fdc5f1969beb2ad9b316fea8972f696f0e54e1a24d5eceedec71162afc2991b7963a71ce8925a94f6c40e5303d3db760b872d0eebbdc6d05b22d3c59ecc SHA512 491e241b0f5aae50e59d25751e95579d40c47e7e4c7f2b279522347f7f2f7f00c92bdf5fa4a651e4146bcfa9439f03b6311b4061fb20c5679c09b97a4924dcf1 +DIST vte-0.62.3.tar.xz 447152 BLAKE2B 2c55430490af577cdbad8bbcbb53902ccc4ab8d9643d5e8b3279e96b4285347e652e761644c957961732eeb50d12e33fa3d3c735be9899ad14c1e2f35377f2a7 SHA512 0475e2813b305bf1b5d48ece5959f2feb10e89b589fa3b75032ae466fd5254bf5c2fc6085dc296d65c5df84790a38892534ff401109843bf964ae62a8c540a81 diff --git a/x11-libs/vte/files/vte-0.58.3-disable-mouse.patch b/x11-libs/vte/files/vte-0.58.3-disable-mouse.patch deleted file mode 100644 index e3e8862..0000000 --- a/x11-libs/vte/files/vte-0.58.3-disable-mouse.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/vteseq.cc 2020-01-25 21:39:47.737317745 +0100 -+++ b/src/vteseq.cc 2020-01-25 21:40:12.811424242 +0100 -@@ -462,18 +462,7 @@ - void - Terminal::update_mouse_protocol() noexcept - { -- if (m_modes_private.XTERM_MOUSE_ANY_EVENT()) -- m_mouse_tracking_mode = MOUSE_TRACKING_ALL_MOTION_TRACKING; -- else if (m_modes_private.XTERM_MOUSE_BUTTON_EVENT()) -- m_mouse_tracking_mode = MOUSE_TRACKING_CELL_MOTION_TRACKING; -- else if (m_modes_private.XTERM_MOUSE_VT220_HIGHLIGHT()) -- m_mouse_tracking_mode = MOUSE_TRACKING_HILITE_TRACKING; -- else if (m_modes_private.XTERM_MOUSE_VT220()) -- m_mouse_tracking_mode = MOUSE_TRACKING_SEND_XY_ON_BUTTON; -- else if (m_modes_private.XTERM_MOUSE_X10()) -- m_mouse_tracking_mode = MOUSE_TRACKING_SEND_XY_ON_CLICK; -- else -- m_mouse_tracking_mode = MOUSE_TRACKING_NONE; -+ m_mouse_tracking_mode = MOUSE_TRACKING_NONE; - - m_mouse_smooth_scroll_delta = 0.0; diff --git a/x11-libs/vte/vte-0.58.3-r1.ebuild b/x11-libs/vte/vte-0.62.3-r1.ebuild similarity index 76% rename from x11-libs/vte/vte-0.58.3-r1.ebuild rename to x11-libs/vte/vte-0.62.3-r1.ebuild index 6983ad4..7ba54bf 100644 --- a/x11-libs/vte/vte-0.58.3-r1.ebuild +++ b/x11-libs/vte/vte-0.62.3-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 VALA_USE_DEPEND="vapigen" VALA_MIN_API_VERSION="0.32" @@ -12,19 +12,21 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE" LICENSE="LGPL-3+ GPL-3+" SLOT="2.91" -IUSE="+crypt debug gtk-doc +introspection mouse +vala vanilla" +IUSE="+crypt debug gtk-doc +icu +introspection systemd mouse +vala vanilla" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" REQUIRED_USE="vala? ( introspection )" -SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.58.3-command-notify.patch.xz )" +SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.62.1-command-notify.patch.xz )" RDEPEND=" - >=x11-libs/gtk+-3.16:3[introspection?] + >=x11-libs/gtk+-3.24.14:3[introspection?] >=dev-libs/fribidi-1.0.0 - >=dev-libs/glib-2.40:2 + >=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?] @@ -45,14 +47,14 @@ 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.58.3-command-notify.patch + eapply "${WORKDIR}"/${PN}-0.62.1-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}"/${P}-disable-mouse.patch + eapply "${FILESDIR}"/${PN}-0.60.3-disable-mouse.patch fi use vala && vala_src_prepare @@ -61,6 +63,7 @@ src_prepare() { src_configure() { local emesonargs=( + -Da11y=true $(meson_use debug debugg) $(meson_use gtk-doc docs) $(meson_use introspection gir) @@ -68,7 +71,8 @@ src_configure() { $(meson_use crypt gnutls) -Dgtk3=true -Dgtk4=false - -Diconv=true + $(meson_use icu) + $(meson_use systemd _systemd) $(meson_use vala vapi) ) meson_src_configure