CVS commit: pkgsrc/x11/vte3

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun Apr 10 22:14:50 UTC 2022

Modified Files:
        pkgsrc/x11/vte3: Makefile distinfo
        pkgsrc/x11/vte3/patches: patch-src_pty.cc

Log Message:
vte3: fix basic terminal operation on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/x11/vte3/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/vte3/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/vte3/patches/patch-src_pty.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/vte3/Makefile
diff -u pkgsrc/x11/vte3/Makefile:1.49 pkgsrc/x11/vte3/Makefile:1.50
--- pkgsrc/x11/vte3/Makefile:1.49       Sun Apr 10 03:53:32 2022
+++ pkgsrc/x11/vte3/Makefile    Sun Apr 10 22:14:50 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2022/04/10 03:53:32 gutteridge Exp $
+# $NetBSD: Makefile,v 1.50 2022/04/10 22:14:50 gutteridge Exp $
 
 DISTNAME=      vte-0.68.0
 PKGNAME=       ${DISTNAME:S/vte/vte3/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=GNOME/}
 GITHUB_PROJECT=        vte

Index: pkgsrc/x11/vte3/distinfo
diff -u pkgsrc/x11/vte3/distinfo:1.18 pkgsrc/x11/vte3/distinfo:1.19
--- pkgsrc/x11/vte3/distinfo:1.18       Sun Apr 10 03:53:32 2022
+++ pkgsrc/x11/vte3/distinfo    Sun Apr 10 22:14:50 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2022/04/10 03:53:32 gutteridge Exp $
+$NetBSD: distinfo,v 1.19 2022/04/10 22:14:50 gutteridge Exp $
 
 BLAKE2s (vte-0.68.0.tar.gz) = 1583ddbed30f848687a1ce02df9d03ce89a5b905a72a9cd1d866195931acbcb1
 SHA512 (vte-0.68.0.tar.gz) = fb2260ae1363203cdccd0e0c6cafe29e5fb25947d2830a7ce1051f672fdc11c067791a8b74cb3017548e366976763fec2022e0c196ed501f46abb08876ad24d6
@@ -10,5 +10,5 @@ SHA1 (patch-src_dumpkeys.c) = 102f24d740
 SHA1 (patch-src_meson.build) = a8e159688fb36e4cfac40249e279a670c9c6cda8
 SHA1 (patch-src_mev.c) = b38dc42e02a8d5fa1e579349319f0b8c8b31dbce
 SHA1 (patch-src_missing.cc) = 4bd47362721afb27594ea12aa2c80495205bd906
-SHA1 (patch-src_pty.cc) = bf65a5384090772eafb441cd8d3aae4eb8383d5b
+SHA1 (patch-src_pty.cc) = 24d0f4e17fce33fc525184d4829625ca84be8b4e
 SHA1 (patch-src_widget.cc) = cbc8b715b21248996bfb7c6abe355c5f4e510539

Index: pkgsrc/x11/vte3/patches/patch-src_pty.cc
diff -u pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.6 pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.7
--- pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.6        Tue Apr  5 15:51:58 2022
+++ pkgsrc/x11/vte3/patches/patch-src_pty.cc    Sun Apr 10 22:14:50 2022
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_pty.cc,v 1.6 2022/04/05 15:51:58 jperkin Exp $
+$NetBSD: patch-src_pty.cc,v 1.7 2022/04/10 22:14:50 gutteridge Exp $
 
 Use correct includes on SunOS.
+Functional fix of posix_openpt() on NetBSD.
 
 --- src/pty.cc.orig    2022-03-27 17:52:19.000000000 +0000
 +++ src/pty.cc
@@ -15,3 +16,18 @@ Use correct includes on SunOS.
  #include <stropts.h>
  #endif
  #include <glib.h>
+@@ -426,7 +428,13 @@ _vte_pty_open_posix(void)
+         auto fd = vte::libc::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 /* __NetBSD__ */
++
+         if (!fd && errno == EINVAL) {
+                 /* Try without NONBLOCK and apply the flag afterward */
+                 need_nonblocking = true;