From f77e7a29479c24d8a47b27e10abeb5c61226a662 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Sun, 30 Aug 2015 16:06:12 +0000 Subject: Update mlterm to 3.5.1. pkgsrc changes: - remove post-3.5.0 patch Changes noted in doc/en/ReleaseNote: ver 3.5.1 * Support font fallback on cairo. * Improve romaji-kana conversion in using wnn as an input method. (Merge https://gist.github.com/tsutsui/1d4f9af3b4a53c906eb4) * KBD_INPUT_NUM or MOUSE_INPUT_NUM environmental variables enable to specify N of /dev/input/eventN on Linux/framebuffer. * Update unicode properties to 8.0.0. * Add "layout_inner_border" / --lborder option. * Add "use_extended_scroll_shortcut" to OSC 5379 and 5380. * Add "Scroll by Shift+Up or Shift+Down" to "Others" tab of mlconfig. * Add "Font width" (Narrow/Widen/Default) entry to "Font" tab of mlconfig. * Bug fixes: Change the version of libvte 2.91 compatible library from 9.0.0 to 0.0.0 Clean up utmp entry in exiting on NetBSD. --- x11/mlterm/Makefile | 5 +- x11/mlterm/distinfo | 9 +- x11/mlterm/patches/patch-inputmethod_wnn_im__wnn.c | 234 --------------------- 3 files changed, 6 insertions(+), 242 deletions(-) delete mode 100644 x11/mlterm/patches/patch-inputmethod_wnn_im__wnn.c diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index 17fbe6b0169..963f367ccb0 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.120 2015/06/30 09:57:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.121 2015/08/30 16:06:12 tsutsui Exp $ -DISTNAME= mlterm-3.5.0 -PKGREVISION= 1 +DISTNAME= mlterm-3.5.1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/} diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo index 855c24258e8..07f31e49b68 100644 --- a/x11/mlterm/distinfo +++ b/x11/mlterm/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.58 2015/06/13 21:25:45 tsutsui Exp $ +$NetBSD: distinfo,v 1.59 2015/08/30 16:06:12 tsutsui Exp $ -SHA1 (mlterm-3.5.0.tar.gz) = 3660caec5be87a83279146209415324e42e84bf9 -RMD160 (mlterm-3.5.0.tar.gz) = 5e4d59692388ba3dd9e771c1c1bc5a5831d10249 -Size (mlterm-3.5.0.tar.gz) = 3707639 bytes +SHA1 (mlterm-3.5.1.tar.gz) = 03ce3058ae85d3e6e59ba7e9d7fe3a43cf7bf942 +RMD160 (mlterm-3.5.1.tar.gz) = 02b27500158c52fe53c6d2121ade7323ba864be0 +Size (mlterm-3.5.1.tar.gz) = 3714159 bytes SHA1 (patch-configure) = 686754205102c2ffeb2456b4fad77f72b1a992a6 SHA1 (patch-etc_font-fb) = e8d7b3171bfe7c3c26b50c0dacdafeca4fa4dfd7 -SHA1 (patch-inputmethod_wnn_im__wnn.c) = 926ac666bc528013e5190245f0e30955125291dc diff --git a/x11/mlterm/patches/patch-inputmethod_wnn_im__wnn.c b/x11/mlterm/patches/patch-inputmethod_wnn_im__wnn.c deleted file mode 100644 index 41b94b784c4..00000000000 --- a/x11/mlterm/patches/patch-inputmethod_wnn_im__wnn.c +++ /dev/null @@ -1,234 +0,0 @@ -$NetBSD: patch-inputmethod_wnn_im__wnn.c,v 1.1 2015/06/13 21:25:45 tsutsui Exp $ - -- Pull the following Romanized Japanese conversion updates for wnn: - https://bitbucket.org/arakiken/mlterm/commits/8de212cf5b3ec7f77ce1f9f6aa66770cb28b935e - ---- inputmethod/wnn/im_wnn.c.orig 2015-06-07 01:36:25.000000000 +0000 -+++ inputmethod/wnn/im_wnn.c -@@ -407,12 +407,12 @@ insert_char( - { 0xa4d0 , 0xa4d3 , 0xa4d6 , 0xa4d9 , 0xa4dc } , /* b */ - { 0xa4ab , 0xa4ad , 0xa4af , 0xa4b1 , 0xa4b3 } , /* c */ - { 0xa4c0 , 0xa4c2 , 0xa4c5 , 0xa4c7 , 0xa4c9 } , /* d */ -- { 0xa4e3 , 0 , 0xa4e5 , 0 , 0xa4e7 } , /* xy */ -- { 0 , 0 , 0 , 0 , 0 , } , -+ { 0xa4e3 , 0xa4a3 , 0xa4e5 , 0xa4a7 , 0xa4e7 } , /* xy */ -+ { 0 , 0 , 0xa4d5 , 0 , 0 , } , /* f */ - { 0xa4ac , 0xa4ae , 0xa4b0 , 0xa4b2 , 0xa4b4 } , /* g */ - { 0xa4cf , 0xa4d2 , 0xa4d5 , 0xa4d8 , 0xa4db } , /* h */ -- { 0 , 0 , 0 , 0 , 0 , } , -- { 0 , 0 , 0 , 0 , 0 , } , -+ { 0xa4e3 , 0 , 0xa4e5 , 0xa4a7 , 0xa4e7 } , /* ch/sh */ -+ { 0 , 0xa4b8 , 0 , 0 , 0 , } , /* j */ - { 0xa4ab , 0xa4ad , 0xa4af , 0xa4b1 , 0xa4b3 } , /* k */ - { 0xa4a1 , 0xa4a3 , 0xa4a5 , 0xa4a7 , 0xa4a9 } , /* l */ - { 0xa4de , 0xa4df , 0xa4e0 , 0xa4e1 , 0xa4e2 } , /* m */ -@@ -433,7 +433,7 @@ insert_char( - static wchar sign_table1[] = - { - 0xa1aa , 0xa1c9 , 0xa1f4 , 0xa1f0 , 0xa1f3 , 0xa1f5 , 0xa1c7 , -- 0xa1ca , 0xa1cb , 0xa1f6 , 0xa1dc , 0xa1a4 , 0xa1bd , 0xa1a3 , 0xa1bf , -+ 0xa1ca , 0xa1cb , 0xa1f6 , 0xa1dc , 0xa1a4 , 0xa1bc , 0xa1a3 , 0xa1bf , - 0xa3b0 , 0xa3b1 , 0xa3b2 , 0xa3b3 , 0xa3b4 , 0xa3b5 , 0xa3b6 , 0xa3b7 , - 0xa3b8 , 0xa3b9 , 0xa1a7 , 0xa1a8 , 0xa1e3 , 0xa1e1 , 0xa1e4 , 0xa1a9 , - 0xa1f7 , -@@ -453,30 +453,83 @@ insert_char( - jcDeleteChar( wnn->convbuf , 1) ; - } - -- if( key_char == 'a') -- { -- wch = kana_table[wnn->dan].a ; -- wnn->dan = 0 ; -- } -- else if( key_char == 'i') -- { -- wch = kana_table[wnn->dan].i ; -- wnn->dan = 0 ; -- } -- else if( key_char == 'u') -+ if( key_char == 'a' || key_char == 'i' || key_char == 'u' || -+ key_char == 'e' || key_char == 'o') - { -- wch = kana_table[wnn->dan].u ; -- wnn->dan = 0 ; -- } -- else if( key_char == 'e') -- { -- wch = kana_table[wnn->dan].e ; -- wnn->dan = 0 ; -- } -- else if( key_char == 'o') -- { -- wch = kana_table[wnn->dan].o ; -- wnn->dan = 0 ; -+ if( wnn->dan == 'f' - 'a') -+ { -+ if( key_char != 'u') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4d5) ; /* hu */ -+ wnn->dan = 'x' - 'a' ; -+ } -+ } -+ else if( wnn->dan == 'j' - 'a') -+ { -+ if( key_char != 'i') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4b8) ; /* zi */ -+ wnn->dan = 'e' - 'a' ; -+ } -+ } -+ -+ if( key_char == 'a') -+ { -+ wch = kana_table[wnn->dan].a ; -+ wnn->dan = 0 ; -+ } -+ else if( key_char == 'i') -+ { -+ if( wnn->dan == 'i' - 'a') -+ { -+ wnn->dan = 0 ; -+ -+ return 0 ; /* shi/chi */ -+ } -+ -+ wch = kana_table[wnn->dan].i ; -+ wnn->dan = 0 ; -+ } -+ else if( key_char == 'u') -+ { -+ if( wnn->dan == 'j' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4b8) ; /* zi */ -+ wnn->dan = 'e' - 'a' ; -+ } -+ wch = kana_table[wnn->dan].u ; -+ wnn->dan = 0 ; -+ } -+ else if( key_char == 'e') -+ { -+ if( wnn->dan == 'f' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4d5) ; /* hu */ -+ wnn->dan = 'x' - 'a' ; -+ } -+ else if( wnn->dan == 'j' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4b8) ; /* zi */ -+ wnn->dan = 'x' - 'a' ; -+ } -+ wch = kana_table[wnn->dan].e ; -+ wnn->dan = 0 ; -+ } -+ else /* if( key_char == 'o') */ -+ { -+ if( wnn->dan == 'f' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4d5) ; /* hu */ -+ wnn->dan = 'x' - 'a' ; -+ } -+ else if( wnn->dan == 'j' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4b8) ; /* zi */ -+ wnn->dan = 'e' - 'a' ; -+ } -+ wch = kana_table[wnn->dan].o ; -+ wnn->dan = 0 ; -+ } - } - else if( ( '!' <= key_char && key_char <= '@') || - ( '[' <= key_char && key_char <= '_') || -@@ -508,6 +561,11 @@ insert_char( - wch = 0xa4f3 ; /* n */ - wnn->dan = 0 ; - } -+ else if( key_char == wnn->dan + 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4c3) ; -+ wch = key_char ; -+ } - else if( key_char == 'y') - { - if( wnn->dan == 'k' - 'a') -@@ -520,6 +578,56 @@ insert_char( - jcInsertChar( wnn->convbuf , 0xa4ae) ; /* gi */ - wnn->dan = 'x' - 'a' ; - } -+ else if( wnn->dan == 's' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4b7) ; /* si */ -+ wnn->dan = 'x' - 'a' ; -+ } -+ else if( wnn->dan == 'z' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4b8) ; /* zi */ -+ wnn->dan = 'x' - 'a' ; -+ } -+ else if( wnn->dan == 't' - 'a' || wnn->dan == 'c' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4c1) ; /* ti */ -+ wnn->dan = 'x' - 'a' ; -+ } -+ else if( wnn->dan == 'd' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4c2) ; /* di */ -+ wnn->dan = 'x' - 'a' ; -+ } -+ else if( wnn->dan == 'n' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4cb) ; /* ni */ -+ wnn->dan = 'x' - 'a' ; -+ } -+ else if( wnn->dan == 'h' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4d2) ; /* hi */ -+ wnn->dan = 'x' - 'a' ; -+ } -+ else if( wnn->dan == 'b' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4d3) ; /* bi */ -+ wnn->dan = 'x' - 'a' ; -+ } -+ else if( wnn->dan == 'p' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4d4) ; /* pi */ -+ wnn->dan = 'x' - 'a' ; -+ } -+ else if( wnn->dan == 'm' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4df) ; /* mi */ -+ wnn->dan = 'x' - 'a' ; -+ } -+ else if( wnn->dan == 'r' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4ea) ; /* ri */ -+ wnn->dan = 'x' - 'a' ; -+ } - - if( wnn->dan == 'x' - 'a') - { -@@ -546,6 +654,24 @@ insert_char( - goto normal ; - } - } -+ else if( key_char == 'h') -+ { -+ if( wnn->dan == 'c' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4c1) ; /* ti */ -+ } -+ else if( wnn->dan == 's' - 'a') -+ { -+ jcInsertChar( wnn->convbuf , 0xa4b7) ; /* si */ -+ } -+ else -+ { -+ goto normal ; -+ } -+ -+ wnn->dan = 'i' - 'a' ; -+ wch = 'h' ; -+ } - else - { - normal: -- cgit v1.2.3