CVS commit: pkgsrc/x11/vte3

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Jun  1 21:51:27 UTC 2023

Modified Files:
        pkgsrc/x11/vte3: Makefile PLIST distinfo
        pkgsrc/x11/vte3/patches: patch-meson.build patch-src_pty.cc
Removed Files:
        pkgsrc/x11/vte3/patches: patch-bindings_vala_app.vala
            patch-src_missing.cc

Log Message:
vte3: update to 0.72.1

No concise upstream change log is available, but this release includes
several fixes for NetBSD. (It also no longer bundles a Vala test app
that caused troubles in the past, etc.)


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/x11/vte3/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/vte3/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/vte3/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/vte3/patches/patch-bindings_vala_app.vala
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/vte3/patches/patch-meson.build
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/vte3/patches/patch-src_missing.cc
cvs rdiff -u -r1.10 -r1.11 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.63 pkgsrc/x11/vte3/Makefile:1.64
--- pkgsrc/x11/vte3/Makefile:1.63       Tue May 30 23:04:53 2023
+++ pkgsrc/x11/vte3/Makefile    Thu Jun  1 21:51:27 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2023/05/30 23:04:53 gutteridge Exp $
+# $NetBSD: Makefile,v 1.64 2023/06/01 21:51:27 gutteridge Exp $
 
-DISTNAME=      vte-0.68.0
+DISTNAME=      vte-0.72.1
 PKGNAME=       ${DISTNAME:S/vte/vte3/}
-PKGREVISION=   13
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=GNOME/}
 GITHUB_PROJECT=        vte

Index: pkgsrc/x11/vte3/PLIST
diff -u pkgsrc/x11/vte3/PLIST:1.7 pkgsrc/x11/vte3/PLIST:1.8
--- pkgsrc/x11/vte3/PLIST:1.7   Tue Apr  5 15:51:57 2022
+++ pkgsrc/x11/vte3/PLIST       Thu Jun  1 21:51:27 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2022/04/05 15:51:57 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.8 2023/06/01 21:51:27 gutteridge Exp $
 bin/vte-2.91
 include/vte-2.91/vte/vte.h
 include/vte-2.91/vte/vtedeprecated.h
@@ -14,7 +14,7 @@ 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.6800.0
+lib/libvte-2.91.so.0.7200.1
 lib/pkgconfig/vte-2.91.pc
 libexec/vte-urlencode-cwd
 share/examples/profile.d/vte.csh

Index: pkgsrc/x11/vte3/distinfo
diff -u pkgsrc/x11/vte3/distinfo:1.23 pkgsrc/x11/vte3/distinfo:1.24
--- pkgsrc/x11/vte3/distinfo:1.23       Tue May 30 23:04:53 2023
+++ pkgsrc/x11/vte3/distinfo    Thu Jun  1 21:51:27 2023
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.23 2023/05/30 23:04:53 gutteridge Exp $
+$NetBSD: distinfo,v 1.24 2023/06/01 21:51:27 gutteridge Exp $
 
-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) = 82125d3c18d848afffcb7a063c9e53ad8fd4ac62
+BLAKE2s (vte-0.72.1.tar.gz) = dc4a3d2da14279e9bff1f82598f7ba057b409003d961daba08d6d9462fd31cbb
+SHA512 (vte-0.72.1.tar.gz) = 54b3f5f10845f3202410040910051ed97aaf574df77dc336250dc93a5b612cc83ff59d4eec99e190b0bebccbf04ea693319a28309e67f60adb0a424b8fa43c44
+Size (vte-0.72.1.tar.gz) = 630922 bytes
+SHA1 (patch-meson.build) = 4f914f5f79c566464d91c64953e00d55676019c4
 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_missing.cc) = 807a3f6134d8dd6fd602326ce02ca6e2ed1d189d
-SHA1 (patch-src_pty.cc) = a46b10e9921e6d6ea8fbf0939a73a7b4b83d3455
+SHA1 (patch-src_pty.cc) = fafec9f2b60b1b1e90d56e032edcb597a13608e9
 SHA1 (patch-src_widget.cc) = cbc8b715b21248996bfb7c6abe355c5f4e510539

Index: pkgsrc/x11/vte3/patches/patch-meson.build
diff -u pkgsrc/x11/vte3/patches/patch-meson.build:1.2 pkgsrc/x11/vte3/patches/patch-meson.build:1.3
--- pkgsrc/x11/vte3/patches/patch-meson.build:1.2       Tue Apr  5 15:51:58 2022
+++ pkgsrc/x11/vte3/patches/patch-meson.build   Thu Jun  1 21:51:27 2023
@@ -1,7 +1,6 @@
-$NetBSD: patch-meson.build,v 1.2 2022/04/05 15:51:58 jperkin Exp $
+$NetBSD: patch-meson.build,v 1.3 2023/06/01 21:51:27 gutteridge Exp $
 
 Remove silly asserts that do nothing except break portability.
-NetBSD requires -D_NETBSD_SOURCE for grantpt().
 
 --- meson.build.orig   2022-03-27 17:52:19.000000000 +0000
 +++ meson.build
@@ -19,14 +18,6 @@ NetBSD requires -D_NETBSD_SOURCE for gra
  
  # Check for functions
  
-@@ -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])

Index: pkgsrc/x11/vte3/patches/patch-src_pty.cc
diff -u pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.10 pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.11
--- pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.10       Tue May 30 23:04:53 2023
+++ pkgsrc/x11/vte3/patches/patch-src_pty.cc    Thu Jun  1 21:51:27 2023
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_pty.cc,v 1.10 2023/05/30 23:04:53 gutteridge Exp $
+$NetBSD: patch-src_pty.cc,v 1.11 2023/06/01 21:51:27 gutteridge Exp $
 
 Use correct includes on SunOS.
 Functional fix of posix_openpt() on NetBSD.
 https://gitlab.gnome.org/GNOME/vte/-/issues/2575
 
---- src/pty.cc.orig    2022-03-27 17:52:19.000000000 +0000
+--- src/pty.cc.orig    2023-04-13 09:57:27.000000000 +0000
 +++ src/pty.cc
-@@ -62,9 +62,15 @@
+@@ -57,9 +57,15 @@
  #ifdef HAVE_PTY_H
  #include <pty.h>
  #endif
@@ -23,16 +23,18 @@ https://gitlab.gnome.org/GNOME/vte/-/iss
  #include <glib.h>
  #include <gio/gio.h>
  #include "debug.h"
-@@ -427,6 +433,27 @@ _vte_pty_open_posix(void)
- #ifndef __linux__
-         /* Other kernels may not support CLOEXEC or NONBLOCK above, so try to fall back */
+@@ -415,11 +421,23 @@ _vte_pty_open_posix(void)
          bool need_cloexec = false, need_nonblocking = false;
-+
-+#ifdef __NetBSD__
-+         // NetBSD is a special case: prior to 9.99.101, posix_openpt() will not return
-+         // EINVAL for unknown/unsupported flags but instead silently ignore these flags
-+         // and just return a valid PTY but without the NONBLOCK | CLOEXEC flags set.
-+         // So we need to manually apply these flags there. See issue #2575.
+ 
+ #ifdef __NetBSD__
+-        // NetBSD is a special case: posix_openpt() will not return EINVAL
+-        // for unknown/unsupported flags but instead silently ignore these flags
++        // NetBSD is a special case: prior to 9.99.101, posix_openpt() will not return
++        // EINVAL for unknown/unsupported flags but instead silently ignore these flags
+         // and just return a valid PTY but without the NONBLOCK | CLOEXEC flags set.
+-        // So we always need to manually apply these flags there. See issue #2575.
+-        need_cloexec = need_nonblocking = true;
++        // So we need to manually apply these flags there. See issue #2575.
 +        int mib[2], osrev;
 +        size_t len;
 +
@@ -46,16 +48,6 @@ https://gitlab.gnome.org/GNOME/vte/-/iss
 +                                 "NetBSD < 9.99.101, forcing fallback "
 +                                 "for NONBLOCK and CLOEXEC.\n");
 +        }
-+#else
-+
-         if (!fd && errno == EINVAL) {
-                 /* Try without NONBLOCK and apply the flag afterward */
-                 need_nonblocking = true;
-@@ -437,6 +464,7 @@ _vte_pty_open_posix(void)
-                         fd = posix_openpt(O_RDWR | O_NOCTTY);
-                 }
-         }
-+#endif /* __NetBSD__ */
- #endif /* !linux */
+ #else
  
-         if (!fd) {
+         if (!fd && errno == EINVAL) {