diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2013-01-20 06:18:25 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2013-01-20 06:18:25 +0000 |
| commit | b6648dc2fbef14967456ccbd00bc76cafd6723a7 (patch) | |
| tree | 0ba4d719a92c288df6b6ae37b777efea16358d34 /japanese/kterm | |
| parent | 81c0c7136605524fd0fe8fa0eca050d46f09cd97 (diff) | |
| download | ports-b6648dc2fbef14967456ccbd00bc76cafd6723a7.tar.gz ports-b6648dc2fbef14967456ccbd00bc76cafd6723a7.zip | |
Fix SIGSEGV when pasting multibyte characters.
Submitted by: nyan
Notes
Notes:
svn path=/head/; revision=310673
Diffstat (limited to 'japanese/kterm')
| -rw-r--r-- | japanese/kterm/Makefile | 2 | ||||
| -rw-r--r-- | japanese/kterm/files/patch-main.c | 33 | ||||
| -rw-r--r-- | japanese/kterm/files/patch-menu.c | 26 |
3 files changed, 50 insertions, 11 deletions
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile index 38845af9ac96..9e82e1e4baaa 100644 --- a/japanese/kterm/Makefile +++ b/japanese/kterm/Makefile @@ -2,7 +2,7 @@ PORTNAME= kterm PORTVERSION= 6.2.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= japanese x11 MASTER_SITES= ${MASTER_SITE_PORTS_JP:S/$/:wp_jp/} \ ${MASTER_SITE_XCONTRIB} \ diff --git a/japanese/kterm/files/patch-main.c b/japanese/kterm/files/patch-main.c index 90216ef760d3..a3c35487efcb 100644 --- a/japanese/kterm/files/patch-main.c +++ b/japanese/kterm/files/patch-main.c @@ -1,6 +1,6 @@ ---- main.c.orig 2010-01-25 01:02:47.051647000 +0900 -+++ main.c 2010-01-25 01:03:35.081557857 +0900 -@@ -210,7 +210,9 @@ +--- main.c.orig 2013-01-20 15:06:09.000000000 +0900 ++++ main.c 2013-01-20 15:06:31.000000000 +0900 +@@ -211,7 +211,9 @@ #undef FIOCLEX #undef FIONCLEX #define setpgrp2 setpgrp @@ -10,7 +10,7 @@ #include <sys/resource.h> #endif #ifdef sco -@@ -236,7 +238,7 @@ +@@ -237,7 +239,7 @@ #define HAS_UTMP_UT_HOST #endif #else /* } !SYSV { */ /* BSD systems */ @@ -19,7 +19,7 @@ #include <sgtty.h> #endif #include <sys/resource.h> -@@ -293,7 +295,7 @@ +@@ -294,7 +296,7 @@ #define ttyslot() 1 #endif /* apollo */ @@ -28,7 +28,7 @@ #include <utmpx.h> #define setutent setutxent #define getutent getutxent -@@ -319,6 +321,10 @@ +@@ -320,6 +322,10 @@ int Ptyfd; #endif /* PUCC_PTYD */ @@ -39,7 +39,7 @@ #ifdef sequent #define USE_GET_PSEUDOTTY #endif -@@ -1355,6 +1361,8 @@ +@@ -1360,6 +1366,8 @@ d_tio.c_cc[VDISCARD] = CFLUSH; d_tio.c_cc[VWERASE] = CWERASE; d_tio.c_cc[VLNEXT] = CLNEXT; @@ -48,7 +48,7 @@ #endif /* } */ #ifdef TIOCSLTC /* { */ d_ltc.t_suspc = CSUSP; /* t_suspc */ -@@ -1403,6 +1411,8 @@ +@@ -1408,6 +1416,8 @@ d_tio.c_cc[VQUIT] = CQUIT; /* '^\' */ d_tio.c_cc[VEOF] = CEOF; /* '^D' */ d_tio.c_cc[VEOL] = CEOL; /* '^@' */ @@ -57,7 +57,20 @@ #ifdef VSWTCH d_tio.c_cc[VSWTCH] = CSWTCH; /* usually '^Z' */ #endif -@@ -1963,6 +1973,10 @@ +@@ -1722,11 +1732,11 @@ + case 'u': case 'U': + term->flags |= UTF8_KANJI; + update_utf8mode(); +- make_unicode_map(); + break; + default: + break; + } ++ make_unicode_map(); + } + #endif /* KTERM_KANJIMODE */ + +@@ -1973,6 +1983,10 @@ get_pty (pty) int *pty; { @@ -68,7 +81,7 @@ #ifdef __osf__ int tty; return (openpty(pty, &tty, ttydev, NULL, NULL)); -@@ -2066,6 +2080,7 @@ +@@ -2076,6 +2090,7 @@ #endif /* __sgi or umips else */ #endif /* USE_GET_PSEUDOTTY else */ #endif /* ATT else */ diff --git a/japanese/kterm/files/patch-menu.c b/japanese/kterm/files/patch-menu.c new file mode 100644 index 000000000000..9890bc129e5c --- /dev/null +++ b/japanese/kterm/files/patch-menu.c @@ -0,0 +1,26 @@ +--- menu.c.orig 2013-01-20 15:02:29.000000000 +0900 ++++ menu.c 2013-01-20 15:02:56.000000000 +0900 +@@ -843,6 +843,7 @@ + update_eucmode(); + update_sjismode(); + update_utf8mode(); ++ make_unicode_map(); + } + + +@@ -867,6 +868,7 @@ + update_eucmode(); + update_sjismode(); + update_utf8mode(); ++ make_unicode_map(); + } + } + +@@ -891,6 +893,7 @@ + update_eucmode(); + update_sjismode(); + update_utf8mode(); ++ make_unicode_map(); + } + } + |