[pkgsrc/trunk]: pkgsrc/net/sayaka sayaka: update to 3.4.2.

[tsutsui <tsutsui%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/68554266ba50
branches:  trunk
changeset: 422967:68554266ba50
user:      tsutsui <tsutsui%pkgsrc.org@localhost>
date:      Fri Feb 07 12:39:08 2020 +0000

description:
sayaka: update to 3.4.2.

pkgsrc changes:
- remove a patch applied to upstream
- pull a post 3.4.2 fix for detection of sixel support

Upstream changes:

* 3.4.2 (2020/02/01)
  Support monochrome terminal.
  Implement --no-color option.
  Add --no-image option (past --noimg is still valid)
  Show an icon mark on non-sixel-capable terminal.
  Autodetect if terminal supports sixel or not.

diffstat:

 net/sayaka/Makefile                              |   5 ++---
 net/sayaka/distinfo                              |  12 ++++++------
 net/sayaka/patches/patch-vala_System.OS.native.c |  23 +++++++++++++++++++++++
 net/sayaka/patches/patch-vala_sayaka.vala        |  21 ---------------------
 4 files changed, 31 insertions(+), 30 deletions(-)

diffs (82 lines):

diff -r e364f4913393 -r 68554266ba50 net/sayaka/Makefile
--- a/net/sayaka/Makefile       Fri Feb 07 12:32:22 2020 +0000
+++ b/net/sayaka/Makefile       Fri Feb 07 12:39:08 2020 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2020/01/28 15:00:45 tsutsui Exp $
+# $NetBSD: Makefile,v 1.21 2020/02/07 12:39:08 tsutsui Exp $
 
-DISTNAME=      sayaka-3.4.1
-PKGREVISION=   1
+DISTNAME=      sayaka-3.4.2
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=isaki68k/}
 GITHUB_PROJECT=        ${DISTNAME:S/-${PKGVERSION_NOREV}//}
diff -r e364f4913393 -r 68554266ba50 net/sayaka/distinfo
--- a/net/sayaka/distinfo       Fri Feb 07 12:32:22 2020 +0000
+++ b/net/sayaka/distinfo       Fri Feb 07 12:39:08 2020 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2020/01/28 15:00:45 tsutsui Exp $
+$NetBSD: distinfo,v 1.11 2020/02/07 12:39:08 tsutsui Exp $
 
-SHA1 (sayaka-3.4.1.tar.gz) = 03e7ed7251d79cef957a0c976185c659a24c9779
-RMD160 (sayaka-3.4.1.tar.gz) = 350ee7f192d757e1d0f2e5e6ce40ca159995bc76
-SHA512 (sayaka-3.4.1.tar.gz) = cb2709b7a7dd4285b2c615235da692bf31c6390df40689e1da3c1b5bae46eb25c1c1c29667e9cfbb1ee0d09cc28da95a09d5b155949cfbb206f78e21438164b0
-Size (sayaka-3.4.1.tar.gz) = 1967534 bytes
-SHA1 (patch-vala_sayaka.vala) = 6cccbdbaaf1f79cfc09317a8e80c634e1eb99df9
+SHA1 (sayaka-3.4.2.tar.gz) = 3f028cf82774340ea52a731ccc040d6b75846ace
+RMD160 (sayaka-3.4.2.tar.gz) = 514ed5a6320b88b4fa775dac41965436599a55fb
+SHA512 (sayaka-3.4.2.tar.gz) = fe54bd71bd84f05311179af03b928eea4e53913a038cf5af2725b8707a372ade2444b1de6afd18538702f216ac570072ae9dfe376094757534d9f91a312f46c2
+Size (sayaka-3.4.2.tar.gz) = 1968548 bytes
+SHA1 (patch-vala_System.OS.native.c) = a19ac855f867e1e11d953f5d9175e6738a026704
diff -r e364f4913393 -r 68554266ba50 net/sayaka/patches/patch-vala_System.OS.native.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/sayaka/patches/patch-vala_System.OS.native.c  Fri Feb 07 12:39:08 2020 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-vala_System.OS.native.c,v 1.1 2020/02/07 12:39:08 tsutsui Exp $
+
+- pull post 3.4.2 upstream fix
+  "Fix native_term_support_sixel to parse "\x1b[?63;4c" correctly."
+  https://github.com/isaki68k/sayaka/commit/5e5ea0f8911f3b52fbe9231e8f547316675919ec
+
+--- vala/System.OS.native.c.orig       2020-02-01 06:29:17.000000000 +0000
++++ vala/System.OS.native.c
+@@ -102,7 +102,14 @@ native_term_support_sixel()
+               e = strchr(p, ';');
+               if (e) {
+                       *e++ = '\0';
++              } else {
++                      e = strrchr(p, 'c');
++                      if (e) {
++                              *e = '\0';
++                              e = NULL;
++                      }
+               }
++
+               if (strcmp(p, "4") == 0) {
+                       return 1;
+               }
diff -r e364f4913393 -r 68554266ba50 net/sayaka/patches/patch-vala_sayaka.vala
--- a/net/sayaka/patches/patch-vala_sayaka.vala Fri Feb 07 12:32:22 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-vala_sayaka.vala,v 1.4 2020/01/28 15:00:45 tsutsui Exp $
-
-- pull upstream change for monochrome terminal settings:
- https://github.com/isaki68k/sayaka/commit/7746eed85599a72f03ff464e21b5cbeae46ab7c2
---- vala/sayaka.vala.orig      2020-01-12 07:03:03.000000000 +0000
-+++ vala/sayaka.vala
-@@ -1811,6 +1811,14 @@ public class SayakaMain
-               string fav;
-               string gray;
- 
-+              // 2è?²ã?ªã??ã??ã?­ã?¹ã??ã?«è?²(ã??ä½?ã?®å±?æ?§ã??)ã?¤ã??ã?ªã??
-+              if (color_mode != ColorFixedX68k && color_mode <= 2) {
-+                      for (var i = 0; i < Color.Max; i++) {
-+                              color2esc[i] = "";
-+                      }
-+                      return;
-+              }
-+
-               // é»?è??æ?¯ã??ç?½è??æ?¯ã??ã?§è?²å??ã??ã??å¤?ã??ã??ã?»ã??ã??読ã?¿ã??ã??ã??
-               if (bg_white) {
-                       blue = BLUE;