vte3: Update to 0.68.0.

The recent vala update broke this build, this seems to get it back up
and running again.  Unfortunately upstream have switched to a "git log"
changelog which is only available in distfiles and is all but useless,
so no list of useful changes since 0.60.3 other than "bugfixes?".

Tested on NetBSD and SmartOS.

11 files changed, 68 insertions, 375 deletions

diff --git a/x11/vte3/Makefile b/x11/vte3/Makefile
index 5484801588f..d12927be3ce 100644
--- a/x11/vte3/Makefile
+++ b/x11/vte3/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.46 2022/03/30 10:02:26 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2022/04/05 15:51:57 jperkin Exp $
 
-DISTNAME=	vte-0.60.3
+DISTNAME=	vte-0.68.0
 PKGNAME=	${DISTNAME:S/vte/vte3/}
-PKGREVISION=	14
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vte/0.60/}
-EXTRACT_SUFX=	.tar.xz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=GNOME/}
+GITHUB_PROJECT=	vte
+GITHUB_TAG=	${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.gnome.org/
@@ -33,6 +33,7 @@ CONF_FILES+=		${PREFIX}/share/examples/profile.d/vte.csh \
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/profile.d
 
 PYTHON_FOR_BUILD_ONLY=	tool
+REPLACE_PYTHON=		src/*.py
 
 .include "options.mk"
 .include "../../devel/meson/build.mk"
@@ -42,7 +43,7 @@ PYTHON_FOR_BUILD_ONLY=	tool
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-BUILDLINK_DEPMETHOD.vala?=	build
+.include "../../lang/python/tool.mk"
 .include "../../lang/vala/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
diff --git a/x11/vte3/PLIST b/x11/vte3/PLIST
index 6b0fdbd052c..98edcaffd2a 100644
--- a/x11/vte3/PLIST
+++ b/x11/vte3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/11/17 12:05:01 nia Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/04/05 15:51:57 jperkin Exp $
 bin/vte-2.91
 include/vte-2.91/vte/vte.h
 include/vte-2.91/vte/vtedeprecated.h
@@ -8,17 +8,22 @@ include/vte-2.91/vte/vtemacros.h
 include/vte-2.91/vte/vtepty.h
 include/vte-2.91/vte/vteregex.h
 include/vte-2.91/vte/vteterminal.h
+include/vte-2.91/vte/vtetypebuiltins-gtk3.h
 include/vte-2.91/vte/vtetypebuiltins.h
 include/vte-2.91/vte/vteversion.h
 lib/girepository-1.0/Vte-2.91.typelib
 lib/libvte-2.91.so
 lib/libvte-2.91.so.0
-lib/libvte-2.91.so.0.6000.3
+lib/libvte-2.91.so.0.6800.0
 lib/pkgconfig/vte-2.91.pc
 libexec/vte-urlencode-cwd
 share/examples/profile.d/vte.csh
 share/examples/profile.d/vte.sh
 share/gir-1.0/Vte-2.91.gir
+share/glade/catalogs/vte-2.91.xml
+share/glade/pixmaps/hicolor/16x16/actions/widget-vte-terminal.png
+share/glade/pixmaps/hicolor/22x22/actions/widget-vte-terminal.png
+share/locale/ab/LC_MESSAGES/vte-2.91.mo
 share/locale/am/LC_MESSAGES/vte-2.91.mo
 share/locale/an/LC_MESSAGES/vte-2.91.mo
 share/locale/ang/LC_MESSAGES/vte-2.91.mo
diff --git a/x11/vte3/distinfo b/x11/vte3/distinfo
index 9fcf3774a99..6438b318ff6 100644
--- a/x11/vte3/distinfo
+++ b/x11/vte3/distinfo
@@ -1,17 +1,13 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 11:34:31 nia Exp $
+$NetBSD: distinfo,v 1.17 2022/04/05 15:51:57 jperkin Exp $
 
-BLAKE2s (vte-0.60.3.tar.xz) = 461043eadab4af4579353914eee51daeecb65ddd7d4fc402c499c192030ea7d2
-SHA512 (vte-0.60.3.tar.xz) = 3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18
-Size (vte-0.60.3.tar.xz) = 535504 bytes
+BLAKE2s (vte-0.68.0.tar.gz) = 1583ddbed30f848687a1ce02df9d03ce89a5b905a72a9cd1d866195931acbcb1
+SHA512 (vte-0.68.0.tar.gz) = fb2260ae1363203cdccd0e0c6cafe29e5fb25947d2830a7ce1051f672fdc11c067791a8b74cb3017548e366976763fec2022e0c196ed501f46abb08876ad24d6
+Size (vte-0.68.0.tar.gz) = 641981 bytes
 SHA1 (patch-bindings_vala_app.vala) = 09444285f642ab48849bbbc1ae663bee3567b8d4
-SHA1 (patch-meson.build) = ac82a0168f221fb67839062cb9a832b542470616
-SHA1 (patch-src_app_app.cc) = ff76c74840342195a4d318418474f69e385f6571
-SHA1 (patch-src_decoder-cat.cc) = 438b934314a440f04ab586022fdb057b6512167b
+SHA1 (patch-meson.build) = 82125d3c18d848afffcb7a063c9e53ad8fd4ac62
+SHA1 (patch-src_app_app.cc) = 2548e01629aa563595387328638a52a5616ff0bd
 SHA1 (patch-src_dumpkeys.c) = 102f24d7404d46b13194f3431d0a864d480e5da7
 SHA1 (patch-src_meson.build) = a8e159688fb36e4cfac40249e279a670c9c6cda8
 SHA1 (patch-src_mev.c) = b38dc42e02a8d5fa1e579349319f0b8c8b31dbce
-SHA1 (patch-src_parser-cat.cc) = 2ee7d7113b4688a631021bcbef13ee6196f534e9
-SHA1 (patch-src_pty.cc) = a9f52d89f356eb0a34de90748a7881d34ae27f12
-SHA1 (patch-src_vte.cc) = 6f8c3a7d64be7a813b740d098d51e17d3187b2ce
-SHA1 (patch-src_vtedraw.cc) = 1deab7738ae7c7bbb53e5b951df4d8a6ad9312f9
-SHA1 (patch-src_widget.cc) = adcecb612c6a0945f13c26e3b6a89131bcab4b1f
+SHA1 (patch-src_pty.cc) = bf65a5384090772eafb441cd8d3aae4eb8383d5b
+SHA1 (patch-src_widget.cc) = cbc8b715b21248996bfb7c6abe355c5f4e510539
diff --git a/x11/vte3/patches/patch-meson.build b/x11/vte3/patches/patch-meson.build
index a8603b85c8e..78ebb70f265 100644
--- a/x11/vte3/patches/patch-meson.build
+++ b/x11/vte3/patches/patch-meson.build
@@ -1,21 +1,33 @@
-$NetBSD: patch-meson.build,v 1.1 2020/09/25 08:51:41 jperkin Exp $
+$NetBSD: patch-meson.build,v 1.2 2022/04/05 15:51:58 jperkin Exp $
 
 Remove silly asserts that do nothing except break portability.
+NetBSD requires -D_NETBSD_SOURCE for grantpt().
 
---- meson.build.orig	2020-05-13 09:51:07.000000000 +0000
+--- meson.build.orig	2022-03-27 17:52:19.000000000 +0000
 +++ meson.build
-@@ -170,10 +170,6 @@ check_symbols_required = [
-   ['TIOCGWINSZ', 'sys/ioctl.h'],
- ]
+@@ -230,13 +230,6 @@ endforeach
  
+ # Check for symbols
+ 
+-check_symbols_required = [
+-  ['TIOCGWINSZ', 'sys/ioctl.h'],
+-]
+-
 -foreach symbol: check_symbols_required
 -  assert(cxx.has_header_symbol(symbol[1], symbol[0]), symbol[0] + ' not found')
 -endforeach
--
+ 
  # Check for functions
  
- check_functions_required = [
-@@ -389,14 +385,10 @@ linker_flags = [
+@@ -388,6 +381,7 @@ foreach func: check_functions
+     args: [
+       '-D_GNU_SOURCE',
+       '-D_XOPEN_SOURCE',
++      '-D_NETBSD_SOURCE',
+     ],
+     dependencies: __deps,
+     name: __name,
+@@ -558,14 +552,10 @@ linker_flags = [
  foreach flag: linker_flags
    if cc.has_link_argument(flag[0])
      add_project_link_arguments(flag[0], language: 'c')
diff --git a/x11/vte3/patches/patch-src_app_app.cc b/x11/vte3/patches/patch-src_app_app.cc
index 91ffdf2a16b..8f6c96fe8cd 100644
--- a/x11/vte3/patches/patch-src_app_app.cc
+++ b/x11/vte3/patches/patch-src_app_app.cc
@@ -1,32 +1,22 @@
-$NetBSD: patch-src_app_app.cc,v 1.4 2019/03/07 21:36:07 jmcneill Exp $
+$NetBSD: patch-src_app_app.cc,v 1.5 2022/04/05 15:51:58 jperkin Exp $
 
-Fix NetBSD build.
+Add SunOS compat for cfmakeraw().
 
---- src/app/app.cc.orig	2018-12-10 21:32:12.000000000 +0000
+--- src/app/app.cc.orig	2022-03-27 17:52:19.000000000 +0000
 +++ src/app/app.cc
-@@ -23,6 +23,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <errno.h>
- 
- #include <glib.h>
- #include <glib/gprintf.h>
-@@ -308,7 +309,7 @@ public:
-                 else
-                         alpha = get_alpha();
- 
--                GdkRGBA color{bg_color};
-+                GdkRGBA color = bg_color;
-                 color.alpha = alpha;
-                 return color;
-         }
-@@ -1292,7 +1293,7 @@ vteapp_window_fork(VteappWindow* window,
-         auto pid = fork();
-         switch (pid) {
-         case -1: /* error */
--                g_set_error(error, G_IO_ERROR, G_IO_ERROR_FAILED, "Error forking: %m");
-+                g_set_error(error, G_IO_ERROR, G_IO_ERROR_FAILED, "Error forking: %s", strerror(errno));
-                 return false;
- 
-         case 0: /* child */ {
+@@ -3040,7 +3040,15 @@ main(int argc,
+                struct termios tcattr;
+                if (tcgetattr(STDIN_FILENO, &tcattr) == 0) {
+                        saved_tcattr = tcattr;
++#ifdef __sun
++                       tcattr.c_iflag &= ~(IMAXBEL|IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
++                       tcattr.c_oflag &= ~OPOST;
++                       tcattr.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
++                       tcattr.c_cflag &= ~(CSIZE|PARENB);
++                       tcattr.c_cflag |= CS8;
++#else
+                        cfmakeraw(&tcattr);
++#endif
+                        if (tcsetattr(STDIN_FILENO, TCSANOW, &tcattr) == 0)
+                                reset_termios = true;
+                }
diff --git a/x11/vte3/patches/patch-src_decoder-cat.cc b/x11/vte3/patches/patch-src_decoder-cat.cc
deleted file mode 100644
index 0ea08065808..00000000000
--- a/x11/vte3/patches/patch-src_decoder-cat.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_decoder-cat.cc,v 1.1 2020/06/20 16:00:07 nia Exp $
-
-Fix NetBSD build.
-
---- src/decoder-cat.cc.orig	2020-05-13 09:51:07.000000000 +0000
-+++ src/decoder-cat.cc
-@@ -422,7 +422,7 @@ private:
- 
-                 for (auto i = 0; i < options.repeat(); ++i) {
-                         if (i > 0 && lseek(fd, 0, SEEK_SET) != 0) {
--                                g_printerr("Failed to seek: %m\n");
-+                                g_printerr("Failed to seek: %s\n", strerror(errno));
-                                 return false;
-                         }
- 
-@@ -472,7 +472,7 @@ public:
-                                 } else {
-                                         fd = ::open(filename, O_RDONLY);
-                                         if (fd == -1) {
--                                                g_printerr("Error opening file %s: %m\n", filename);
-+                                                g_printerr("Error opening file %s: %s\n", filename, strerror(errno));
-                                         }
-                                 }
-                                 if (fd != -1) {
diff --git a/x11/vte3/patches/patch-src_parser-cat.cc b/x11/vte3/patches/patch-src_parser-cat.cc
deleted file mode 100644
index ddff2af7500..00000000000
--- a/x11/vte3/patches/patch-src_parser-cat.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_parser-cat.cc,v 1.1 2020/06/20 16:00:07 nia Exp $
-
-Fix NetBSD build.
-
---- src/parser-cat.cc.orig	2020-05-13 09:51:07.000000000 +0000
-+++ src/parser-cat.cc
-@@ -706,7 +706,7 @@ private:
- 
-                 for (auto i = 0; i < repeat; ++i) {
-                         if (i > 0 && lseek(fd, 0, SEEK_SET) != 0) {
--                                g_printerr("Failed to seek: %m\n");
-+                                g_printerr("Failed to seek: %s\n", strerror(errno));
-                                 return false;
-                         }
- 
-@@ -747,7 +747,7 @@ public:
-                                 } else {
-                                         fd = open(filename, O_RDONLY);
-                                         if (fd == -1) {
--                                                g_printerr("Error opening file %s: %m\n", filename);
-+                                                g_printerr("Error opening file %s: %s\n", filename, strerror(errno));
-                                         }
-                                 }
-                                 if (fd != -1) {
diff --git a/x11/vte3/patches/patch-src_pty.cc b/x11/vte3/patches/patch-src_pty.cc
index 6754e8de6a9..19b76fb68f9 100644
--- a/x11/vte3/patches/patch-src_pty.cc
+++ b/x11/vte3/patches/patch-src_pty.cc
@@ -1,12 +1,10 @@
-$NetBSD: patch-src_pty.cc,v 1.5 2020/06/20 16:00:07 nia Exp $
+$NetBSD: patch-src_pty.cc,v 1.6 2022/04/05 15:51:58 jperkin Exp $
 
-NetBSD fix
 Use correct includes on SunOS.
-Don't use packet mode on SunOS.
 
---- src/pty.cc.orig	2020-05-13 09:51:07.000000000 +0000
+--- src/pty.cc.orig	2022-03-27 17:52:19.000000000 +0000
 +++ src/pty.cc
-@@ -64,7 +64,9 @@
+@@ -62,7 +62,9 @@
  #ifdef HAVE_PTY_H
  #include <pty.h>
  #endif
@@ -17,165 +15,3 @@ Don't use packet mode on SunOS.
  #include <stropts.h>
  #endif
  #include <glib.h>
-@@ -111,7 +113,7 @@ Pty::child_setup() const noexcept
-         sigset_t set;
-         sigemptyset(&set);
-         if (pthread_sigmask(SIG_SETMASK, &set, nullptr) == -1) {
--                _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %m\n", "pthread_sigmask");
-+                _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %s\n", "pthread_sigmask", strerror(errno));
-                 _exit(127);
-         }
- 
-@@ -134,7 +136,7 @@ Pty::child_setup() const noexcept
-                  */
-                 _vte_debug_print (VTE_DEBUG_PTY, "Starting new session\n");
-                 if (setsid() == -1) {
--                        _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %m\n", "setsid");
-+                        _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %s\n", "setsid", strerror(errno));
-                         _exit(127);
-                 }
-         }
-@@ -158,7 +160,7 @@ Pty::child_setup() const noexcept
-         if (fd == -1 &&
-             errno != EINVAL &&
-             errno != ENOTTY) {
--		_vte_debug_print(VTE_DEBUG_PTY, "%s failed: %m\n", "ioctl(TIOCGPTPEER)");
-+		_vte_debug_print(VTE_DEBUG_PTY, "%s failed: %s\n", "ioctl(TIOCGPTPEER)", strerror(errno));
- 		_exit(127);
-         }
- 
-@@ -168,7 +170,7 @@ Pty::child_setup() const noexcept
-         if (fd == -1) {
-                 auto const name = ptsname(masterfd);
-                 if (name == nullptr) {
--                        _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %m\n", "ptsname");
-+                        _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %s\n", "ptsname", strerror(errno));
-                         _exit(127);
-                 }
- 
-@@ -178,7 +180,7 @@ Pty::child_setup() const noexcept
- 
-                 fd = ::open(name, fd_flags);
-                 if (fd == -1) {
--                        _vte_debug_print (VTE_DEBUG_PTY, "Failed to open PTY: %m\n");
-+                        _vte_debug_print (VTE_DEBUG_PTY, "Failed to open PTY: %s\n", strerror(errno));
-                         _exit(127);
-                 }
-         }
-@@ -192,7 +194,7 @@ Pty::child_setup() const noexcept
-          */
-         if (!(m_flags & VTE_PTY_NO_CTTY)) {
-                 if (ioctl(fd, TIOCSCTTY, fd) != 0) {
--                        _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %m\n", "ioctl(TIOCSCTTY)");
-+                        _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %s\n", "ioctl(TIOCSCTTY)", strerror(errno));
-                         _exit(127);
-                 }
-         }
-@@ -533,7 +535,7 @@ Pty::set_size(int rows,
-         if (ret != 0) {
-                 vte::util::restore_errno errsv;
-                 _vte_debug_print(VTE_DEBUG_PTY,
--                                 "Failed to set size on %d: %m\n", master);
-+                                 "Failed to set size on %d: %s\n", master, strerror(errno));
-         }
- 
-         return ret == 0;
-@@ -574,7 +576,7 @@ Pty::get_size(int* rows,
- 
-         vte::util::restore_errno errsv;
-         _vte_debug_print(VTE_DEBUG_PTY,
--                         "Failed to read size from fd %d: %m\n", master);
-+                         "Failed to read size from fd %d: %s\n", master, strerror(errno));
- 
-         return false;
- }
-@@ -614,13 +616,13 @@ fd_setup(int fd)
- {
-         if (grantpt(fd) != 0) {
-                 vte::util::restore_errno errsv;
--                _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %m\n", "grantpt");
-+                _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %s\n", "grantpt", strerror(errno));
-                 return -1;
-         }
- 
-         if (unlockpt(fd) != 0) {
-                 vte::util::restore_errno errsv;
--                _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %m\n", "unlockpt");
-+                _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %s\n", "unlockpt", strerror(errno));
-                 return -1;
-         }
- 
-@@ -638,12 +640,14 @@ fd_setup(int fd)
-                 return -1;
-         }
- 
-+#ifndef __sun
-         if (fd_set_cpkt(fd) < 0) {
-                 vte::util::restore_errno errsv;
-                 _vte_debug_print(VTE_DEBUG_PTY,
-                                  "%s failed: %s", "ioctl(TIOCPKT)", g_strerror(errsv));
-                 return -1;
-         }
-+#endif
- 
-         return 0;
- }
-@@ -665,7 +669,12 @@ _vte_pty_open_posix(void)
-         fd = posix_openpt(O_RDWR | O_NOCTTY | O_NONBLOCK | O_CLOEXEC);
- #ifndef __linux__
-         /* Other kernels may not support CLOEXEC or NONBLOCK above, so try to fall back */
--        bool need_cloexec = false, need_nonblocking = false;
-+        bool need_cloexec = false;
-+#ifdef __NetBSD__
-+	bool need_nonblocking = true;
-+#else
-+	bool need_nonblocking = false;
-+#endif
-         if (fd == -1 && errno == EINVAL) {
-                 /* Try without NONBLOCK and apply the flag afterward */
-                 need_nonblocking = true;
-@@ -701,22 +710,24 @@ _vte_pty_open_posix(void)
-         }
- #endif /* !linux */
- 
-+#ifndef __sun
-         if (fd_set_cpkt(fd) < 0) {
-                 vte::util::restore_errno errsv;
-                 _vte_debug_print(VTE_DEBUG_PTY,
-                                  "%s failed: %s", "ioctl(TIOCPKT)", g_strerror(errsv));
-                 return -1;
-         }
-+#endif
- 
-         if (grantpt(fd) != 0) {
-                 vte::util::restore_errno errsv;
--                _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %m\n", "grantpt");
-+                _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %s\n", "grantpt", strerror(errno));
-                 return {};
-         }
- 
-         if (unlockpt(fd) != 0) {
-                 vte::util::restore_errno errsv;
--                _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %m\n", "unlockpt");
-+                _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %s\n", "unlockpt", strerror(errno));
-                 return {};
-         }
- 
-@@ -757,7 +768,7 @@ Pty::set_utf8(bool utf8) const noexcept
- 	struct termios tio;
-         if (tcgetattr(fd(), &tio) == -1) {
-                 vte::util::restore_errno errsv;
--                _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %m", "tcgetattr");
-+                _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %s", "tcgetattr", strerror(errno));
-                 return false;
-         }
- 
-@@ -772,7 +783,7 @@ Pty::set_utf8(bool utf8) const noexcept
-         if (saved_cflag != tio.c_iflag &&
-             tcsetattr(fd(), TCSANOW, &tio) == -1) {
-                 vte::util::restore_errno errsv;
--                _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %m", "tcsetattr");
-+                _vte_debug_print(VTE_DEBUG_PTY, "%s failed: %s", "tcsetattr", strerror(errno));
-                 return false;
- 	}
- #endif
diff --git a/x11/vte3/patches/patch-src_vte.cc b/x11/vte3/patches/patch-src_vte.cc
deleted file mode 100644
index c976aba3b5f..00000000000
--- a/x11/vte3/patches/patch-src_vte.cc
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD: patch-src_vte.cc,v 1.4 2020/06/20 16:00:07 nia Exp $
-
-Use correct includes on SunOS.
-Don't use packet mode on SunOS.
-
---- src/vte.cc.orig	2020-05-13 09:51:07.000000000 +0000
-+++ src/vte.cc
-@@ -3966,6 +3966,9 @@ Terminal::pty_io_read(int const fd,
- 			bp = chunk->data + chunk->len;
- 			len = 0;
- 			do {
-+#ifdef __sun
-+				int ret = read (fd, bp, rem);
-+#else
-                                 /* We'd like to read (fd, bp, rem); but due to TIOCPKT mode
-                                  * there's an extra input byte returned at the beginning.
-                                  * We need to see what that byte is, but otherwise drop it
-@@ -3977,6 +3980,7 @@ Terminal::pty_io_read(int const fd,
-                                 int ret = read (fd, bp - 1, rem + 1);
-                                 pkt_header = bp[-1];
-                                 bp[-1] = save;
-+#endif
- 				switch (ret){
- 					case -1:
- 						err = errno;
-@@ -3985,12 +3989,15 @@ Terminal::pty_io_read(int const fd,
- 						eos = true;
- 						goto out;
- 					default:
-+#ifndef __sun
-                                                 ret--;
--
-                                                 if (pkt_header == TIOCPKT_DATA) {
-+#endif
-                                                         bp += ret;
-                                                         rem -= ret;
-                                                         len += ret;
-+#ifndef __sun
-+                                                ret--;
-                                                 } else {
-                                                         if (pkt_header & TIOCPKT_IOCTL) {
-                                                                 /* We'd like to always be informed when the termios change,
-@@ -4012,6 +4019,7 @@ Terminal::pty_io_read(int const fd,
-                                                                 pty_scroll_lock_changed(false);
-                                                         }
-                                                 }
-+#endif
- 						break;
- 				}
- 			} while (rem);
-@@ -4052,7 +4060,7 @@ out:
-         case EBUSY: /* do nothing */
-                 break;
-         default:
--                _vte_debug_print (VTE_DEBUG_IO, "Error reading from child: %m");
-+                _vte_debug_print (VTE_DEBUG_IO, "Error reading from child: %s", strerror(errno));
-                 break;
- 	}
- 
-@@ -7655,7 +7663,7 @@ Terminal::set_size(long columns,
- 		 * in case something went awry.
-                  */
- 		if (!pty()->set_size(rows, columns))
--			g_warning("Failed to set PTY size: %m\n");
-+			g_warning("Failed to set PTY size: %s\n", strerror(errno));
- 		refresh_size();
- 	} else {
- 		m_row_count = rows;
-@@ -10074,7 +10082,7 @@ Terminal::set_pty(vte::base::Pty *new_pt
-         set_size(m_column_count, m_row_count);
- 
-         if (!pty()->set_utf8(data_syntax() == DataSyntax::eECMA48_UTF8))
--                g_warning ("Failed to set UTF8 mode: %m\n");
-+                g_warning ("Failed to set UTF8 mode: %s\n", strerror(errno));
- 
-         /* Open channels to listen for input on. */
-         connect_pty_read();
diff --git a/x11/vte3/patches/patch-src_vtedraw.cc b/x11/vte3/patches/patch-src_vtedraw.cc
deleted file mode 100644
index 001d1d2f83c..00000000000
--- a/x11/vte3/patches/patch-src_vtedraw.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_vtedraw.cc,v 1.1 2018/06/15 10:44:15 jperkin Exp $
-
-Avoid ambiguous function call.
-
---- src/vtedraw.cc.orig	2018-05-21 19:31:53.000000000 +0000
-+++ src/vtedraw.cc
-@@ -1674,13 +1674,13 @@ _vte_draw_draw_line(struct _vte_draw *dr
- static inline double
- _vte_draw_get_undercurl_rad(gint width)
- {
--        return width / 2. / sqrt(2);
-+        return width / 2. / sqrt((double)2);
- }
- 
- static inline double
- _vte_draw_get_undercurl_arc_height(gint width)
- {
--        return _vte_draw_get_undercurl_rad(width) * (1. - sqrt(2) / 2.);
-+        return _vte_draw_get_undercurl_rad(width) * (1. - sqrt((double)2) / 2.);
- }
- 
- double
diff --git a/x11/vte3/patches/patch-src_widget.cc b/x11/vte3/patches/patch-src_widget.cc
index bc856fa213d..82c4b52841b 100644
--- a/x11/vte3/patches/patch-src_widget.cc
+++ b/x11/vte3/patches/patch-src_widget.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_widget.cc,v 1.1 2019/03/27 11:19:10 jperkin Exp $
+$NetBSD: patch-src_widget.cc,v 1.2 2022/04/05 15:51:58 jperkin Exp $
 
 Provide W_EXITCODE compat.
 
---- src/widget.cc.orig	2018-12-10 21:32:09.000000000 +0000
+--- src/widget.cc.orig	2022-03-27 17:52:19.000000000 +0000
 +++ src/widget.cc
 @@ -22,6 +22,10 @@
  
@@ -12,6 +12,6 @@ Provide W_EXITCODE compat.
 +#define W_EXITCODE(ret, sig)	((ret) << 8 | (sig))
 +#endif
 +
+ #include <exception>
  #include <new>
- #include <string>
- 
+ #include <stdexcept>