From 9f31b925295586d924dd20c4c420f26bf34d7952 Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Wed, 8 May 2013 18:03:44 +0000
Subject: Fix tmux's character width calculation for Korean.

Patch from upstream (http://sourceforge.net/p/tmux/tickets/41/).
---
 misc/tmux/Makefile             |  3 ++-
 misc/tmux/distinfo             |  3 ++-
 misc/tmux/patches/patch-utf8.c | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 misc/tmux/patches/patch-utf8.c

(limited to 'misc/tmux')

diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile
index 2a4d2d85fad..0a0ef7c5256 100644
--- a/misc/tmux/Makefile
+++ b/misc/tmux/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2013/04/02 10:59:50 fhajny Exp $
+# $NetBSD: Makefile,v 1.23 2013/05/08 18:03:44 minskim Exp $
 
 DISTNAME=	tmux-1.8
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tmux/}
 
diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo
index 46db378be80..7e3484dff6f 100644
--- a/misc/tmux/distinfo
+++ b/misc/tmux/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2013/04/07 04:00:39 schmonz Exp $
+$NetBSD: distinfo,v 1.22 2013/05/08 18:03:44 minskim Exp $
 
 SHA1 (tmux-1.8.tar.gz) = 08677ea914e1973ce605b0008919717184cbd033
 RMD160 (tmux-1.8.tar.gz) = b267ab54f6f55292fa1fa9cd0e892bfd5fd27cfb
@@ -6,3 +6,4 @@ Size (tmux-1.8.tar.gz) = 417537 bytes
 SHA1 (patch-client.c) = e37053d721bd26d31783af883a7d1f6870095325
 SHA1 (patch-osdep-darwin.c) = 259230c4437364fc3c956f2ab1429316e697d228
 SHA1 (patch-server-client.c) = 6c8dd82e2dc1965b8c8f9a8808a262366c80d6b4
+SHA1 (patch-utf8.c) = d1703d90131f32eef8688f6255e84a315fccfa1d
diff --git a/misc/tmux/patches/patch-utf8.c b/misc/tmux/patches/patch-utf8.c
new file mode 100644
index 00000000000..3c8c64fcfda
--- /dev/null
+++ b/misc/tmux/patches/patch-utf8.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-utf8.c,v 1.1 2013/05/08 18:03:44 minskim Exp $
+
+Remove some Korean characters from the zero-width list.
+(http://sourceforge.net/p/tmux/tickets/41/)
+
+--- utf8.c.orig	2013-02-10 16:20:15.000000000 +0000
++++ utf8.c
+@@ -173,7 +173,7 @@ struct utf8_width_entry utf8_width_table
+ 	{ 0x30000, 0x3fffd, 2, NULL, NULL },
+ 	{ 0x00711, 0x00711, 0, NULL, NULL },
+ 	{ 0x0fe00, 0x0fe0f, 0, NULL, NULL },
+-	{ 0x01160, 0x011ff, 0, NULL, NULL },
++	{ 0x01160, 0x011ff, 1, NULL, NULL },
+ 	{ 0x0180b, 0x0180d, 0, NULL, NULL },
+ 	{ 0x10a3f, 0x10a3f, 0, NULL, NULL },
+ 	{ 0x00981, 0x00981, 0, NULL, NULL },
-- 
cgit v1.2.3