diff options
author | jperkin <jperkin@pkgsrc.org> | 2017-10-30 11:45:13 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2017-10-30 11:45:13 +0000 |
commit | 35af446fa2b2ca6edd484ece31c36cce16cfe1a8 (patch) | |
tree | 04b7098ac8c77d9d218f229ecdc5c8804253a381 /shells | |
parent | 1e294fcfb8cbfe6dc03be1d5cb994bb253dd3a57 (diff) | |
download | pkgsrc-35af446fa2b2ca6edd484ece31c36cce16cfe1a8.tar.gz |
fish: Unbreak build on non-NetBSD.
Diffstat (limited to 'shells')
-rw-r--r-- | shells/fish/distinfo | 13 | ||||
-rw-r--r-- | shells/fish/patches/patch-configure.ac | 4 | ||||
-rw-r--r-- | shells/fish/patches/patch-src_fallback.h | 4 | ||||
-rw-r--r-- | shells/fish/patches/patch-src_output.cpp | 15 | ||||
-rw-r--r-- | shells/fish/patches/patch-src_output.h | 4 | ||||
-rw-r--r-- | shells/fish/patches/patch-src_screen.cpp | 48 |
6 files changed, 71 insertions, 17 deletions
diff --git a/shells/fish/distinfo b/shells/fish/distinfo index 0c852806e9e..dde4371efac 100644 --- a/shells/fish/distinfo +++ b/shells/fish/distinfo @@ -1,14 +1,15 @@ -$NetBSD: distinfo,v 1.10 2017/10/25 09:32:38 maya Exp $ +$NetBSD: distinfo,v 1.11 2017/10/30 11:45:13 jperkin Exp $ SHA1 (fish-2.6.0.tar.gz) = 16f6612747f8013cd04b3639fe504d4750f363ca RMD160 (fish-2.6.0.tar.gz) = f12093fef235487b7c02c245cbbd600750fff874 SHA512 (fish-2.6.0.tar.gz) = d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1 Size (fish-2.6.0.tar.gz) = 3575346 bytes SHA1 (patch-Makefile.in) = e2f5722d2e08e644e0813a662b64bbfe811a8ec6 -SHA1 (patch-configure.ac) = ba20a0182920e2dfb0851038e00875331ba94196 +SHA1 (patch-configure.ac) = 05bad922ce93d5624f8c98a210e473ad702fbe8d SHA1 (patch-src_builtin.cpp) = b48a52d45ba545a92043e58dc554305670c7fcfc -SHA1 (patch-src_fallback.h) = 9ca7e829c663d744165fc06ff50ec101ae20091d -SHA1 (patch-src_output.cpp) = 36a2cc0576aca6585090a1b5b32aa39c90ed3996 -SHA1 (patch-src_output.h) = 8e72aefbd940450fb69f4b970ce1d151f17eb48a -SHA1 (patch-src_screen.cpp) = f2d5e10dff9d09e985a8e27a8f2066dcfb58db05 +SHA1 (patch-src_fallback.cpp) = 4a35401ed0d3c3a912e448d56c9375801c919fbc +SHA1 (patch-src_fallback.h) = e58b29135404211b841232d68e76facdfecc653b +SHA1 (patch-src_output.cpp) = ce8a5043982b0f1dc28d56eaaf4ac2c1d4d1e0c6 +SHA1 (patch-src_output.h) = 971dfe5e137f46b52a56d808c32bf643750ad65a +SHA1 (patch-src_screen.cpp) = acac708ab49a66daf7de274e5d3ed77bb73ab724 SHA1 (patch-src_wutil.cpp) = dbb73cf81d850c4b73598d0c711f68b0d74cabd6 diff --git a/shells/fish/patches/patch-configure.ac b/shells/fish/patches/patch-configure.ac index fe2c704eb84..794d53190ed 100644 --- a/shells/fish/patches/patch-configure.ac +++ b/shells/fish/patches/patch-configure.ac @@ -1,4 +1,6 @@ -$NetBSD: patch-configure.ac,v 1.2 2017/10/25 09:32:38 maya Exp $ +$NetBSD: patch-configure.ac,v 1.3 2017/10/30 11:45:14 jperkin Exp $ + +Work around NetBSD curses. --- configure.ac.orig 2017-06-03 12:45:13.000000000 +0000 +++ configure.ac diff --git a/shells/fish/patches/patch-src_fallback.h b/shells/fish/patches/patch-src_fallback.h index 9f742227445..ff42e6aff0c 100644 --- a/shells/fish/patches/patch-src_fallback.h +++ b/shells/fish/patches/patch-src_fallback.h @@ -1,4 +1,6 @@ -$NetBSD: patch-src_fallback.h,v 1.2 2017/10/25 09:32:38 maya Exp $ +$NetBSD: patch-src_fallback.h,v 1.3 2017/10/30 11:45:14 jperkin Exp $ + +Work around NetBSD curses. --- src/fallback.h.orig 2017-06-03 12:45:13.000000000 +0000 +++ src/fallback.h diff --git a/shells/fish/patches/patch-src_output.cpp b/shells/fish/patches/patch-src_output.cpp index fed783c5252..ef01c369f76 100644 --- a/shells/fish/patches/patch-src_output.cpp +++ b/shells/fish/patches/patch-src_output.cpp @@ -1,8 +1,10 @@ -$NetBSD: patch-src_output.cpp,v 1.1 2017/10/24 03:51:41 maya Exp $ +$NetBSD: patch-src_output.cpp,v 1.2 2017/10/30 11:45:14 jperkin Exp $ + +Work around NetBSD curses. --- src/output.cpp.orig 2017-06-03 12:45:13.000000000 +0000 +++ src/output.cpp -@@ -63,7 +63,7 @@ unsigned char index_for_color(rgb_color_ +@@ -63,10 +63,14 @@ unsigned char index_for_color(rgb_color_ return c.to_term256_index(); } @@ -10,8 +12,15 @@ $NetBSD: patch-src_output.cpp,v 1.1 2017/10/24 03:51:41 maya Exp $ +static bool write_color_escape(const char *todo, unsigned char idx, bool is_fg) { if (term_supports_color_natively(idx)) { // Use tparm to emit color escape. ++#ifdef __NetBSD__ writembs(tparm(todo, idx)); -@@ -550,7 +550,7 @@ rgb_color_t parse_color(const wcstring & ++#else ++ writembs(tparm((char *)todo, idx)); ++#endif + return true; + } + +@@ -550,7 +554,7 @@ rgb_color_t parse_color(const wcstring & } /// Write specified multibyte string. diff --git a/shells/fish/patches/patch-src_output.h b/shells/fish/patches/patch-src_output.h index 2a6ffd0eef7..893e3392b39 100644 --- a/shells/fish/patches/patch-src_output.h +++ b/shells/fish/patches/patch-src_output.h @@ -1,4 +1,6 @@ -$NetBSD: patch-src_output.h,v 1.1 2017/10/24 03:51:41 maya Exp $ +$NetBSD: patch-src_output.h,v 1.2 2017/10/30 11:45:14 jperkin Exp $ + +Work around NetBSD curses. --- src/output.h.orig 2017-06-03 12:45:13.000000000 +0000 +++ src/output.h diff --git a/shells/fish/patches/patch-src_screen.cpp b/shells/fish/patches/patch-src_screen.cpp index 95461bf3b49..17b879ffff0 100644 --- a/shells/fish/patches/patch-src_screen.cpp +++ b/shells/fish/patches/patch-src_screen.cpp @@ -1,4 +1,6 @@ -$NetBSD: patch-src_screen.cpp,v 1.1 2017/10/24 03:51:41 maya Exp $ +$NetBSD: patch-src_screen.cpp,v 1.2 2017/10/30 11:45:14 jperkin Exp $ + +Work around NetBSD curses. --- src/screen.cpp.orig 2017-06-03 12:45:13.000000000 +0000 +++ src/screen.cpp @@ -11,7 +13,19 @@ $NetBSD: patch-src_screen.cpp,v 1.1 2017/10/24 03:51:41 maya Exp $ set_a_foreground, set_a_background, set_foreground, set_background, }; -@@ -238,7 +238,7 @@ static bool is_color_escape_seq(const wc +@@ -223,7 +223,11 @@ static bool is_color_escape_seq(const wc + if (!esc[p]) continue; + + for (int k = 0; k < max_colors; k++) { ++#ifdef __NetBSD__ + size_t esc_seq_len = try_sequence(tparm(esc[p], k), code); ++#else ++ size_t esc_seq_len = try_sequence(tparm((char *)esc[p], k), code); ++#endif + if (esc_seq_len) { + *resulting_length = esc_seq_len; + return true; +@@ -238,7 +242,7 @@ static bool is_color_escape_seq(const wc /// displayed other than the color. static bool is_visual_escape_seq(const wchar_t *code, size_t *resulting_length) { if (!cur_term) return false; @@ -20,7 +34,19 @@ $NetBSD: patch-src_screen.cpp,v 1.1 2017/10/24 03:51:41 maya Exp $ enter_bold_mode, exit_attribute_mode, enter_underline_mode, exit_underline_mode, enter_standout_mode, exit_standout_mode, flash_screen, enter_subscript_mode, exit_subscript_mode, enter_superscript_mode, exit_superscript_mode, enter_blink_mode, -@@ -506,7 +506,7 @@ static void s_move(screen_t *s, data_buf +@@ -251,7 +255,11 @@ static bool is_visual_escape_seq(const w + if (!esc2[p]) continue; + // Test both padded and unpadded version, just to be safe. Most versions of tparm don't + // actually seem to do anything these days. ++#ifdef __NetBSD__ + size_t esc_seq_len = maxi(try_sequence(tparm(esc2[p]), code), try_sequence(esc2[p], code)); ++#else ++ size_t esc_seq_len = maxi(try_sequence(tparm((char *)esc2[p]), code), try_sequence(esc2[p], code)); ++#endif + if (esc_seq_len) { + *resulting_length = esc_seq_len; + return true; +@@ -506,7 +514,7 @@ static void s_move(screen_t *s, data_buf int i; int x_steps, y_steps; @@ -29,7 +55,7 @@ $NetBSD: patch-src_screen.cpp,v 1.1 2017/10/24 03:51:41 maya Exp $ /* debug( 0, L"move from %d %d to %d %d", s->screen_cursor[0], s->screen_cursor[1], -@@ -540,7 +540,7 @@ static void s_move(screen_t *s, data_buf +@@ -540,7 +548,7 @@ static void s_move(screen_t *s, data_buf x_steps = 0; } @@ -38,7 +64,19 @@ $NetBSD: patch-src_screen.cpp,v 1.1 2017/10/24 03:51:41 maya Exp $ if (x_steps < 0) { str = cursor_left; multi_str = parm_left_cursor; -@@ -594,7 +594,7 @@ static void s_write_char(screen_t *s, da +@@ -554,7 +562,11 @@ static void s_move(screen_t *s, data_buf + bool use_multi = + multi_str != NULL && multi_str[0] != '\0' && abs(x_steps) * strlen(str) > strlen(multi_str); + if (use_multi && cur_term) { ++#ifdef __NetBSD__ + char *multi_param = tparm(multi_str, abs(x_steps)); ++#else ++ char *multi_param = tparm((char *)multi_str, abs(x_steps)); ++#endif + writembs(multi_param); + } else { + for (i = 0; i < abs(x_steps); i++) { +@@ -594,7 +606,7 @@ static void s_write_char(screen_t *s, da } /// Send the specified string through tputs and append the output to the specified buffer. |