CVS commit: pkgsrc/x11/vte3

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Sep  1 01:17:27 UTC 2022

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

Log Message:
vte3: amend previous NetBSD fix patch

The original version of the NetBSD fix in the patch was added back in
2018, then lost in churn in 2022, and put back by me. (There was no
technical explanation of the patch in the original commit, and it looks
kind of odd.) In fact, it was missing the fact CLOEXEC wasn't getting
set, either.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/x11/vte3/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/vte3/distinfo
cvs rdiff -u -r1.7 -r1.8 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.56 pkgsrc/x11/vte3/Makefile:1.57
--- pkgsrc/x11/vte3/Makefile:1.56       Thu Aug 11 05:09:33 2022
+++ pkgsrc/x11/vte3/Makefile    Thu Sep  1 01:17:27 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2022/08/11 05:09:33 gutteridge Exp $
+# $NetBSD: Makefile,v 1.57 2022/09/01 01:17:27 gutteridge Exp $
 
 DISTNAME=      vte-0.68.0
 PKGNAME=       ${DISTNAME:S/vte/vte3/}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=GNOME/}
 GITHUB_PROJECT=        vte

Index: pkgsrc/x11/vte3/distinfo
diff -u pkgsrc/x11/vte3/distinfo:1.20 pkgsrc/x11/vte3/distinfo:1.21
--- pkgsrc/x11/vte3/distinfo:1.20       Wed Aug 17 22:01:58 2022
+++ pkgsrc/x11/vte3/distinfo    Thu Sep  1 01:17:27 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2022/08/17 22:01:58 gutteridge Exp $
+$NetBSD: distinfo,v 1.21 2022/09/01 01:17:27 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) = 807a3f6134d8dd6fd602326ce02ca6e2ed1d189d
-SHA1 (patch-src_pty.cc) = 24d0f4e17fce33fc525184d4829625ca84be8b4e
+SHA1 (patch-src_pty.cc) = dc7bcb8056987c1d82f1b601f53d504f8766cafe
 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.7 pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.8
--- pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.7        Sun Apr 10 22:14:50 2022
+++ pkgsrc/x11/vte3/patches/patch-src_pty.cc    Thu Sep  1 01:17:27 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_pty.cc,v 1.7 2022/04/10 22:14:50 gutteridge Exp $
+$NetBSD: patch-src_pty.cc,v 1.8 2022/09/01 01:17:27 gutteridge Exp $
 
 Use correct includes on SunOS.
 Functional fix of posix_openpt() on NetBSD.
@@ -16,15 +16,21 @@ Functional fix of posix_openpt() on NetB
  #include <stropts.h>
  #endif
  #include <glib.h>
-@@ -426,7 +428,13 @@ _vte_pty_open_posix(void)
+@@ -426,7 +428,19 @@ _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__
++        /*
++         * NetBSD's posix_openpt() will pass along flags that don't actually get applied,
++         * so it will return an FD with only O_RDWR actually set, and we need to force the
++         * fallbacks below.
++         */
++        bool need_cloexec = true;
 +        bool need_nonblocking = true;
 +#else
++        bool need_cloexec = false;
 +        bool need_nonblocking = false;
 +#endif /* __NetBSD__ */
 +