Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1580223645184790"
MIME-Version: 1.0
Date: Tue, 28 Jan 2020 15:00:45 +0000
From: "Izumi Tsutsui" <tsutsui@netbsd.org>
Subject: CVS commit: pkgsrc/net/sayaka
To: pkgsrc-changes@NetBSD.org
Reply-To: tsutsui@netbsd.org
Message-Id: <20200128150045.9D1E5FBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1580223645184790
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tsutsui
Date:		Tue Jan 28 15:00:45 UTC 2020

Modified Files:
	pkgsrc/net/sayaka: Makefile distinfo
Added Files:
	pkgsrc/net/sayaka/patches: patch-vala_sayaka.vala

Log Message:
sayaka: pull an upstream fix for monochrome screen support.

Bump PKGREVISION.
Twitter filterstream timeline on Sun3/60 running NetBSD/sun3 9.0_RC1 by
sayaka was demonstrated on NetBSD booth at Open Source Conference 2020 Osaka.
 https://mail-index.netbsd.org/netbsd-advocacy/2020/01/28/msg000823.html


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/sayaka/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/sayaka/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/net/sayaka/patches/patch-vala_sayaka.vala

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1580223645184790
Content-Disposition: inline
Content-Length: 2329
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=utf-8

Modified files:

Index: pkgsrc/net/sayaka/Makefile
diff -u pkgsrc/net/sayaka/Makefile:1.19 pkgsrc/net/sayaka/Makefile:1.20
--- pkgsrc/net/sayaka/Makefile:1.19	Sun Jan 12 13:47:17 2020
+++ pkgsrc/net/sayaka/Makefile	Tue Jan 28 15:00:45 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2020/01/12 13:47:17 tsutsui Exp $
+# $NetBSD: Makefile,v 1.20 2020/01/28 15:00:45 tsutsui Exp $
 
 DISTNAME=	sayaka-3.4.1
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=isaki68k/}
 GITHUB_PROJECT=	${DISTNAME:S/-${PKGVERSION_NOREV}//}

Index: pkgsrc/net/sayaka/distinfo
diff -u pkgsrc/net/sayaka/distinfo:1.9 pkgsrc/net/sayaka/distinfo:1.10
--- pkgsrc/net/sayaka/distinfo:1.9	Sun Jan 12 13:47:17 2020
+++ pkgsrc/net/sayaka/distinfo	Tue Jan 28 15:00:45 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2020/01/12 13:47:17 tsutsui Exp $
+$NetBSD: distinfo,v 1.10 2020/01/28 15:00:45 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

Added files:

Index: pkgsrc/net/sayaka/patches/patch-vala_sayaka.vala
diff -u /dev/null pkgsrc/net/sayaka/patches/patch-vala_sayaka.vala:1.4
--- /dev/null	Tue Jan 28 15:00:45 2020
+++ pkgsrc/net/sayaka/patches/patch-vala_sayaka.vala	Tue Jan 28 15:00:45 2020
@@ -0,0 +1,21 @@
+$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;


--_----------=_1580223645184790--