diff options
| author | gutteridge <gutteridge@pkgsrc.org> | 2022-04-10 22:14:50 +0000 |
|---|---|---|
| committer | gutteridge <gutteridge@pkgsrc.org> | 2022-04-10 22:14:50 +0000 |
| commit | fde09962cd005af2030538e2a5d9ed90671aa438 (patch) | |
| tree | 78cec838f007f87ca86205e3ffbef92b0d762151 /x11 | |
| parent | 5f98a8ae4ca8897022d5ec6a93dfd65e6c2475f1 (diff) | |
| download | pkgsrc-fde09962cd005af2030538e2a5d9ed90671aa438.tar.gz | |
vte3: fix basic terminal operation on NetBSD
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/vte3/Makefile | 4 | ||||
| -rw-r--r-- | x11/vte3/distinfo | 4 | ||||
| -rw-r--r-- | x11/vte3/patches/patch-src_pty.cc | 18 |
3 files changed, 21 insertions, 5 deletions
diff --git a/x11/vte3/Makefile b/x11/vte3/Makefile index 75fabcdc475..eff5ed1e514 100644 --- a/x11/vte3/Makefile +++ b/x11/vte3/Makefile @@ -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 diff --git a/x11/vte3/distinfo b/x11/vte3/distinfo index 58fd870aa4b..a30609a2e14 100644 --- a/x11/vte3/distinfo +++ b/x11/vte3/distinfo @@ -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) = 102f24d7404d46b13194f3431d0a864d480e5da7 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 diff --git a/x11/vte3/patches/patch-src_pty.cc b/x11/vte3/patches/patch-src_pty.cc index 19b76fb68f9..2e383bb91ab 100644 --- a/x11/vte3/patches/patch-src_pty.cc +++ b/x11/vte3/patches/patch-src_pty.cc @@ -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; |