vte3: Portability fixes.

4 files changed, 80 insertions, 1 deletions

diff --git a/x11/vte3/distinfo b/x11/vte3/distinfo
index 9234f86b975..881a89d6827 100644
--- a/x11/vte3/distinfo
+++ b/x11/vte3/distinfo
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.12 2020/06/20 16:00:07 nia Exp $
+$NetBSD: distinfo,v 1.13 2020/09/25 08:51:41 jperkin Exp $
 
 SHA1 (vte-0.60.3.tar.xz) = ba1e2f241326a2e146336832c21c41b61e0e55af
 RMD160 (vte-0.60.3.tar.xz) = 2615d28eaaf9293038f305d26e62e049f503064a
 SHA512 (vte-0.60.3.tar.xz) = 3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18
 Size (vte-0.60.3.tar.xz) = 535504 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-src_dumpkeys.c) = 102f24d7404d46b13194f3431d0a864d480e5da7
+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
diff --git a/x11/vte3/patches/patch-meson.build b/x11/vte3/patches/patch-meson.build
new file mode 100644
index 00000000000..a8603b85c8e
--- /dev/null
+++ b/x11/vte3/patches/patch-meson.build
@@ -0,0 +1,32 @@
+$NetBSD: patch-meson.build,v 1.1 2020/09/25 08:51:41 jperkin Exp $
+
+Remove silly asserts that do nothing except break portability.
+
+--- meson.build.orig	2020-05-13 09:51:07.000000000 +0000
++++ meson.build
+@@ -170,10 +170,6 @@ 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 = [
+ foreach flag: linker_flags
+   if cc.has_link_argument(flag[0])
+     add_project_link_arguments(flag[0], language: 'c')
+-  elif flag[1]
+-    assert(false, flag[0] + ' is required but not supported')
+   endif
+ 
+   if cxx.has_link_argument(flag[0])
+     add_project_link_arguments(flag[0], language: 'cpp')
+-  elif flag[1]
+-    assert(false, flag[0] + ' is required but not supported')
+   endif
+ endforeach
+ 
diff --git a/x11/vte3/patches/patch-src_dumpkeys.c b/x11/vte3/patches/patch-src_dumpkeys.c
new file mode 100644
index 00000000000..38444ee6183
--- /dev/null
+++ b/x11/vte3/patches/patch-src_dumpkeys.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_dumpkeys.c,v 1.1 2020/09/25 08:51:41 jperkin Exp $
+
+Add SunOS compat for cfmakeraw().
+
+--- src/dumpkeys.c.orig	2020-05-13 09:51:07.000000000 +0000
++++ src/dumpkeys.c
+@@ -167,7 +167,15 @@ main(int argc, char **argv)
+ 	}
+ 	original = tcattr;
+ 	signal(SIGINT, sigint_handler);
++#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) {
+ 		perror("tcsetattr");
+ 		return 1;
diff --git a/x11/vte3/patches/patch-src_mev.c b/x11/vte3/patches/patch-src_mev.c
new file mode 100644
index 00000000000..f1f8134b8cc
--- /dev/null
+++ b/x11/vte3/patches/patch-src_mev.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_mev.c,v 1.1 2020/09/25 08:51:41 jperkin Exp $
+
+Add SunOS compat for cfmakeraw().
+
+--- src/mev.c.orig	2020-05-13 09:51:07.000000000 +0000
++++ src/mev.c
+@@ -364,7 +364,15 @@ main(int argc, char **argv)
+ 
+ 	original = tcattr;
+ 	signal(SIGINT, sigint_handler);
++#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) {
+ 		perror("tcsetattr");
+ 		return 1;