commit: adf500dcaf4a0d228747ce71a219aaa27d432e42
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 13 15:34:50 2020 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 15:34:50 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=adf500dc
x11-libs/vte: sync with stable ::gentoo, cleanup old
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
x11-libs/vte/Manifest | 5 +-
.../vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch | 10 ---
x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch | 12 ---
x11-libs/vte/files/vte-0.28.2-interix.patch | 51 -------------
.../vte/files/vte-0.28.2-limit-arguments.patch | 40 ----------
...0.28.2-repaint-after-change-scroll-region.patch | 86 ----------------------
x11-libs/vte/files/vte-0.30.1-alt-meta.patch | 74 -------------------
x11-libs/vte/vte-0.28.2-r209.ebuild | 81 --------------------
.../vte/{vte-0.58.3.ebuild => vte-0.60.3.ebuild} | 20 +++--
9 files changed, 14 insertions(+), 365 deletions(-)
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 006d314..f7f6f1d 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,3 +1,2 @@
-DIST vte-0.28.2.tar.xz 962340 BLAKE2B
1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9
SHA512
d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
-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
diff --git a/x11-libs/vte/files/vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch
b/x11-libs/vte/files/vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch
deleted file mode 100644
index 3ca3983..0000000
--- a/x11-libs/vte/files/vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- vte-0.28.2.orig/src/pty.c
-+++ vte-0.28.2/src/pty.c
-@@ -28,6 +28,7 @@
- * Since: 0.26
- */
-
-+#define _GNU_SOURCE
- #include <config.h>
-
- #include "vtepty.h"
diff --git a/x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch
b/x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch
deleted file mode 100644
index 2d97a10..0000000
--- a/x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- vte-0.28.2.orig/config.h.in
-+++ vte-0.28.2/config.h.in
-@@ -82,6 +82,9 @@
- /* Define if you have the recvmsg function. */
- #undef HAVE_RECVMSG
-
-+/* Define to 1 if you have the `round' function. */
-+#undef HAVE_ROUND
-+
- /* Define to 1 if you have the `setpgid' function. */
- #undef HAVE_SETPGID
-
diff --git a/x11-libs/vte/files/vte-0.28.2-interix.patch
b/x11-libs/vte/files/vte-0.28.2-interix.patch
deleted file mode 100644
index c54d46e..0000000
--- a/x11-libs/vte/files/vte-0.28.2-interix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-reported upstream: https://bugzilla.gnome.org/show_bug.cgi?id=652290
-
-diff -ru vte-0.26.2.orig/configure.in vte-0.26.2/configure.in
---- vte-0.26.2.orig/configure.in 2011-08-17 08:30:55 +0200
-+++ vte-0.26.2/configure.in 2011-08-17 08:35:42 +0200
-@@ -362,7 +362,11 @@
- AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.])
- fi
- AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
--AC_CHECK_FUNCS([ceil floor])
-+dnl if the first check didn't find floor, it caches the "no" value,
-+dnl and doesn't recheck. this makes the below check fail always on
-+dnl systems with floor in -lm. thus we unset the chached result.
-+unset ac_cv_func_floor
-+AC_CHECK_FUNCS([ceil floor round])
-
- # Look for tgetent
-
---- vte-0.26.2.orig/configure 2012-04-30 20:02:55.000000000 +0200
-+++ vte-0.26.2/configure 2012-04-30 20:03:16.000000000 +0200
-@@ -13277,7 +13277,7 @@
-
- fi
-
--for ac_func in ceil floor
-+for ac_func in ceil floor round
- do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-diff -ru vte-0.26.2.orig/src/vte.c vte-0.26.2/src/vte.c
---- vte-0.26.2.orig/src/vte.c 2011-08-17 08:30:58 +0200
-+++ vte-0.26.2/src/vte.c 2011-08-17 08:38:09 +0200
-@@ -63,6 +63,18 @@
- #include <locale.h>
- #endif
-
-+#ifndef HAVE_ROUND
-+# if defined(HAVE_CEIL) && defined(HAVE_FLOOR)
-+static inline double round(double x) {
-+ if(x - floor(x) < 0.5) {
-+ return floor(x);
-+ } else {
-+ return ceil(x);
-+ }
-+}
-+# endif
-+#endif
-+
- #if GTK_CHECK_VERSION (2, 90, 7)
- #define GDK_KEY(symbol) GDK_KEY_##symbol
- #else
diff --git a/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch
b/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch
deleted file mode 100644
index fd45407..0000000
--- a/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From feeee4b5832b17641e505b7083e0d299fdae318e Mon Sep 17 00:00:00 2001
-From: Christian Persch <c...@gnome.org>
-Date: Sat, 19 May 2012 17:36:09 +0000
-Subject: emulation: Limit integer arguments to 65535
-
-To guard against malicious sequences containing excessively big numbers,
-limit all parsed numbers to 16 bit range. Doing this here in the parsing
-routine is a catch-all guard; this doesn't preclude enforcing
-more stringent limits in the handlers themselves.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=676090
----
-diff --git a/src/table.c b/src/table.c
-index 140e8c8..85cf631 100644
---- a/src/table.c
-+++ b/src/table.c
-@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array,
- if (G_UNLIKELY (*array == NULL)) {
- *array = g_value_array_new(1);
- }
-- g_value_set_long(&value, total);
-+ g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));
- g_value_array_append(*array, &value);
- } while (i++ < arginfo->length);
- g_value_unset(&value);
-diff --git a/src/vteseq.c b/src/vteseq.c
-index 457c06a..46def5b 100644
---- a/src/vteseq.c
-+++ b/src/vteseq.c
-@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal,
- GValueArray *params,
- VteTerminalSequenceHandler handler)
- {
-- vte_sequence_handler_multiple_limited(terminal, params, handler,
G_MAXLONG);
-+ vte_sequence_handler_multiple_limited(terminal, params, handler,
G_MAXUSHORT);
- }
-
- static void
---
-cgit v0.9.0.2
diff --git
a/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch
b/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch
deleted file mode 100644
index 86e5471..0000000
--- a/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-https://git.gnome.org/browse/vte/commit/?id=88e8e89560a62d0981ce2b18974a230d0a07dbdd
-
-From 88e8e89560a62d0981ce2b18974a230d0a07dbdd Mon Sep 17 00:00:00 2001
-From: Micah Cowan <mi...@cowan.name>
-Date: Tue, 22 Oct 2013 23:30:43 +0200
-Subject: widget: Fix invalidation region
-
-When the sequence handler moves the cursor into the restricted scrolling
region,
-the bbox needs to be reset, too.
-Fixes glitches with interspersing writes to the bottom line with scrolls of the
-upper region, and also fixes missing screen redraws when using mosh.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=542087
-https://bugzilla.gnome.org/show_bug.cgi?id=686097
-
-diff --git a/src/vte.c b/src/vte.c
-index 9f6d7d8..a4d9d25 100644
---- a/src/vte.c
-+++ b/src/vte.c
-@@ -4077,6 +4077,7 @@ vte_terminal_process_incoming(VteTerminal *terminal)
- long wcount, start, delta;
- gboolean leftovers, modified, bottom, again;
- gboolean invalidated_text;
-+ gboolean in_scroll_region;
- GArray *unichars;
- struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL;
-
-@@ -4096,6 +4097,10 @@ vte_terminal_process_incoming(VteTerminal *terminal)
- cursor = screen->cursor_current;
- cursor_visible = terminal->pvt->cursor_visible;
-
-+ in_scroll_region = screen->scrolling_restricted
-+ && (screen->cursor_current.row >= (screen->insert_delta +
screen->scrolling_region.start))
-+ && (screen->cursor_current.row <= (screen->insert_delta +
screen->scrolling_region.end));
-+
- /* We should only be called when there's data to process. */
- g_assert(terminal->pvt->incoming ||
- (terminal->pvt->pending->len > 0));
-@@ -4194,6 +4199,8 @@ skip_chunk:
- * points to the first character which isn't part of this
- * sequence. */
- if ((match != NULL) && (match[0] != '\0')) {
-+ gboolean new_in_scroll_region;
-+
- /* Call the right sequence handler for the requested
- * behavior. */
- _vte_terminal_handle_sequence(terminal,
-@@ -4204,12 +4211,21 @@ skip_chunk:
- start = (next - wbuf);
- modified = TRUE;
-
-- /* if we have moved during the sequence handler,
restart the bbox */
-+ new_in_scroll_region = screen->scrolling_restricted
-+ && (screen->cursor_current.row >=
(screen->insert_delta + screen->scrolling_region.start))
-+ && (screen->cursor_current.row <=
(screen->insert_delta + screen->scrolling_region.end));
-+
-+ delta = screen->scroll_delta; /* delta may have
changed from sequence. */
-+
-+ /* if we have moved greatly during the sequence
handler, or moved
-+ * into a scroll_region from outside it, restart the
bbox.
-+ */
- if (invalidated_text &&
-- (screen->cursor_current.col >
bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
-- screen->cursor_current.col <
bbox_topleft.x - VTE_CELL_BBOX_SLACK ||
-- screen->cursor_current.row >
bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
-- screen->cursor_current.row <
bbox_topleft.y - VTE_CELL_BBOX_SLACK)) {
-+ ((new_in_scroll_region &&
!in_scroll_region) ||
-+ (screen->cursor_current.col >
bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
-+ screen->cursor_current.col <
bbox_topleft.x - VTE_CELL_BBOX_SLACK ||
-+ screen->cursor_current.row >
bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
-+ screen->cursor_current.row <
bbox_topleft.y - VTE_CELL_BBOX_SLACK))) {
- /* Clip off any part of the box which isn't
already on-screen. */
- bbox_topleft.x = MAX(bbox_topleft.x, 0);
- bbox_topleft.y = MAX(bbox_topleft.y, delta);
-@@ -4229,6 +4245,8 @@ skip_chunk:
- bbox_bottomright.x = bbox_bottomright.y =
-G_MAXINT;
- bbox_topleft.x = bbox_topleft.y = G_MAXINT;
- }
-+
-+ in_scroll_region = new_in_scroll_region;
- } else
- /* Second, we have a NULL match, and next points to the very
- * next character in the buffer. Insert the character which
---
-cgit v0.10.2
-
diff --git a/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
deleted file mode 100644
index bd364be..0000000
--- a/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetrom...@gentoo.org>
-Date: Tue, 15 Nov 2011 03:06:40 -0500
-Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2
- compatibility
-
-Also, since VTE_META_MASK is now a mask with multiple bits set, code that
-compares gdk key modifiers to VTE_META_MASK by numerical equality is no
-longer guaranteed to work. Therefore, for such comparisons a new function,
-vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits
-matching matching VTE_META_MASK are set, then all are set.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=663779
----
- src/keymap.c | 15 +++++++++++++--
- src/keymap.h | 2 +-
- 2 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/src/keymap.c b/src/keymap.c
-index 9a21669..95b4c5b 100644
---- a/src/keymap.c
-+++ b/src/keymap.c
-@@ -990,6 +990,17 @@ static const struct _vte_keymap_group {
- {GDK_KEY (F35), _vte_keymap_GDK_F35},
- };
-
-+/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK,
-+ * despite being a compound mask, is treated as indivisible. */
-+GdkModifierType
-+_vte_keymap_fixup_modifiers(GdkModifierType modifiers,
-+ GdkModifierType mask)
-+{
-+ if (modifiers & VTE_META_MASK)
-+ modifiers |= VTE_META_MASK;
-+ return modifiers & mask;
-+}
-+
- /* Map the specified keyval/modifier setup, dependent on the mode, to either
- * a literal string or a capability name. */
- void
-@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval,
- } else {
- fkey_mode = fkey_default;
- }
-- modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK |
VTE_NUMLOCK_MASK);
-+ modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK |
GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
-
- /* Search for the conditions. */
- for (i = 0; entries[i].normal_length || entries[i].special[0]; i++)
-@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
- return;
- }
-
-- switch (modifiers & significant_modifiers) {
-+ switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) {
- case 0:
- modifier = 0;
- break;
-diff --git a/src/keymap.h b/src/keymap.h
-index 243e22e..21d9b8e 100644
---- a/src/keymap.h
-+++ b/src/keymap.h
-@@ -27,7 +27,7 @@
-
- G_BEGIN_DECLS
-
--#define VTE_META_MASK GDK_META_MASK
-+#define VTE_META_MASK (GDK_META_MASK | GDK_MOD1_MASK)
- #define VTE_NUMLOCK_MASK GDK_MOD2_MASK
-
- /* Map the specified keyval/modifier setup, dependent on the mode, to either
---
-1.7.8.rc3
-
diff --git a/x11-libs/vte/vte-0.28.2-r209.ebuild
b/x11-libs/vte/vte-0.28.2-r209.ebuild
deleted file mode 100644
index 0728488..0000000
--- a/x11-libs/vte/vte-0.28.2-r209.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit gnome2
-
-DESCRIPTION="GNOME terminal widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE";
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc64 x86"
-IUSE="debug +introspection"
-
-RDEPEND="
- >=dev-libs/glib-2.26:2
- >=x11-libs/gtk+-2.20:2[introspection?]
- >=x11-libs/pango-1.22.0
-
- sys-libs/ncurses:0=
- x11-libs/libX11
- x11-libs/libXft
-
- introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.35
- virtual/pkgconfig
- sys-devel/gettext
-"
-PDEPEND="x11-libs/gnome-pty-helper"
-
-PATCHES=(
- # https://bugzilla.gnome.org/show_bug.cgi?id=663779
- "${FILESDIR}"/${PN}-0.30.1-alt-meta.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=652290
- "${FILESDIR}"/${PN}-0.28.2-interix.patch
-
- # Fix CVE-2012-2738, upstream bug #676090
- "${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch
-
- # Fix https://bugzilla.gnome.org/show_bug.cgi?id=542087
- # Patch from
https://github.com/pld-linux/vte0/commit/1e8dce16b239e5d378b02e4d04a60e823df36257
- "${FILESDIR}"/${PN}-0.28.2-repaint-after-change-scroll-region.patch
-
- # Fix musl issues, bug #554416
- "${FILESDIR}"/${PN}-0.28.2-add_HAVE_ROUND.patch
- "${FILESDIR}"/${PN}-0.28.2-GNU_SOURCE-for-ptsname_r.patch
-)
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_configure() {
- local myconf=""
-
- if [[ ${CHOST} == *-interix* ]]; then
- myconf="${myconf} --disable-Bsymbolic"
-
- # interix stropts.h is empty...
- export ac_cv_header_stropts_h=no
- fi
-
- # Do not disable gnome-pty-helper, bug #401389
- gnome2_src_configure --disable-python \
- --disable-deprecation \
- --disable-glade-catalogue \
- --disable-static \
- $(use_enable debug) \
- $(use_enable introspection) \
- --with-gtk=2.0 \
- ${myconf}
-}
-
-src_install() {
- gnome2_src_install
-
- rm -v "${ED}usr/libexec/gnome-pty-helper" || die
-}
diff --git a/x11-libs/vte/vte-0.58.3.ebuild b/x11-libs/vte/vte-0.60.3.ebuild
similarity index 77%
rename from x11-libs/vte/vte-0.58.3.ebuild
rename to x11-libs/vte/vte-0.60.3.ebuild
index abdbca2..9605876 100644
--- a/x11-libs/vte/vte-0.58.3.ebuild
+++ b/x11-libs/vte/vte-0.60.3.ebuild
@@ -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 +vala vanilla"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc64 x86"
+IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
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/~leio/distfiles/${PN}-0.60.3-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,10 +47,10 @@ 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.60.3-command-notify.patch
fi
- eapply "${FILESDIR}/${PN}-0.54.2-musl-remove-W_EXITCODE.patch"
+ use elibc_musl && eapply
"${FILESDIR}/${PN}-0.54.2-musl-remove-W_EXITCODE.patch"
# -Ddebugg option enables various debug support via VTE_DEBUG, but also
ggdb3; strip the latter
sed -e '/ggdb3/d' -i meson.build || die
@@ -59,6 +61,7 @@ src_prepare() {
src_configure() {
local emesonargs=(
+ -Da11y=true
$(meson_use debug debugg)
$(meson_use gtk-doc docs)
$(meson_use introspection gir)
@@ -66,7 +69,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
