pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/mlterm Update mlterm to 3.3.2. (leaf package updat...
details: https://anonhg.NetBSD.org/pkgsrc/rev/81889260fcc1
branches: trunk
changeset: 627965:81889260fcc1
user: tsutsui <tsutsui%pkgsrc.org@localhost>
date: Wed Dec 25 16:32:31 2013 +0000
description:
Update mlterm to 3.3.2. (leaf package update, ok'ed wiz@)
pkgsrc changes:
- remove post-3.3.1 patches
- pull post-3.3.2 fixes for mlterm-fb from upstream:
- 4d974f7: fix mlterm-fb scroll on >=8bpp framebuffers
- 0b2987a: fix palette handling on 4bpp framebuffers
Changes from doc/en/ReleaseNote:
ver 3.3.2
* Support 4bpp framebuffer on NetBSD/luna68k.
* Desynchronize ssh negotiation on cygwin or mingw.
* "inner_border" option accepts "[horizontal border],[vertical border]" format value.
* Add "leftward_double_drawing" option which embolds medium fonts by drawing doubly at
1 pixel leftward instead of rightward.
* Add vte_terminal_set_color_*_rgba() functions to libvte compatible library.
* Bug fixes:
Fix memory leak when opening pty fails on win32gdi.
Fix the bug which disabled to clear hidden input method window it if large
value is specified for --border option.
Fix the bug which disabled to paste UTF-8 string.
Bitbucket pull request #1 (Thanks to Hayaki Saito san)
Fix the bug which causes segfault in pasting text via win32 clipboard from x11
applications over ssh x11 forwarding
Fix segfault caused by zero column characters like 0x200e.
diffstat:
x11/mlterm/Makefile | 5 +-
x11/mlterm/distinfo | 16 +-
x11/mlterm/patches/patch-configure | 6 +-
x11/mlterm/patches/patch-mlterm_ml__vt100__parser.c | 34 ---
x11/mlterm/patches/patch-xwindow_fb_x__display.c | 123 ++++++++++++++
x11/mlterm/patches/patch-xwindow_fb_x__display.h | 25 ++
x11/mlterm/patches/patch-xwindow_fb_x__display__x68kgrf.c | 59 ++++++
x11/mlterm/patches/patch-xwindow_fb_x__imagelib.c | 61 ++++++
x11/mlterm/patches/patch-xwindow_x__screen.c | 27 ---
9 files changed, 282 insertions(+), 74 deletions(-)
diffs (truncated from 405 to 300 lines):
diff -r b1f7b765ced5 -r 81889260fcc1 x11/mlterm/Makefile
--- a/x11/mlterm/Makefile Wed Dec 25 14:59:10 2013 +0000
+++ b/x11/mlterm/Makefile Wed Dec 25 16:32:31 2013 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.97 2013/12/14 16:30:17 tsutsui Exp $
+# $NetBSD: Makefile,v 1.98 2013/12/25 16:32:31 tsutsui Exp $
-DISTNAME= mlterm-3.3.1
-PKGREVISION= 1
+DISTNAME= mlterm-3.3.2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/}
diff -r b1f7b765ced5 -r 81889260fcc1 x11/mlterm/distinfo
--- a/x11/mlterm/distinfo Wed Dec 25 14:59:10 2013 +0000
+++ b/x11/mlterm/distinfo Wed Dec 25 16:32:31 2013 +0000
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.38 2013/12/14 16:30:17 tsutsui Exp $
+$NetBSD: distinfo,v 1.39 2013/12/25 16:32:31 tsutsui Exp $
-SHA1 (mlterm-3.3.1.tar.gz) = 1009e5ff4ad1bfac90dd3f01d0144d76c2f12d1f
-RMD160 (mlterm-3.3.1.tar.gz) = c53d77754e1db1612e49f4cd272f1fcf8f2f7ca5
-Size (mlterm-3.3.1.tar.gz) = 3566097 bytes
-SHA1 (patch-configure) = 066d0e35d63f30ad9a892937af3a372fbea56936
+SHA1 (mlterm-3.3.2.tar.gz) = 035988a7e9440b3e44e9f0b210e4fe131d2056ee
+RMD160 (mlterm-3.3.2.tar.gz) = 32318d4482da82d893b89dc69c6893ffedb6d947
+Size (mlterm-3.3.2.tar.gz) = 3574269 bytes
+SHA1 (patch-configure) = 950194a8be2ebd7f3ed22c9ebaba545def6c7351
SHA1 (patch-etc_font-fb) = 7ded1dbee083df4d78b6ebf42964f50262feb318
-SHA1 (patch-mlterm_ml__vt100__parser.c) = c440720ab84d192dfc75369f477229e2c7774f50
-SHA1 (patch-xwindow_x__screen.c) = 13599925ab6824b3700d84197765a7c611ca211f
+SHA1 (patch-xwindow_fb_x__display.c) = 4d877709bd2493c919c7d6c8c660966ee2411936
+SHA1 (patch-xwindow_fb_x__display.h) = 07b1d0f17995862c02fe8b4c69d32fc662802eb0
+SHA1 (patch-xwindow_fb_x__display__x68kgrf.c) = 2a3f0bb7f37bab3c1ee566e6d987f3666514e2d7
+SHA1 (patch-xwindow_fb_x__imagelib.c) = ba95c47740b8c6120405043ca9df15a56fe7bb9c
diff -r b1f7b765ced5 -r 81889260fcc1 x11/mlterm/patches/patch-configure
--- a/x11/mlterm/patches/patch-configure Wed Dec 25 14:59:10 2013 +0000
+++ b/x11/mlterm/patches/patch-configure Wed Dec 25 16:32:31 2013 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.5 2013/10/28 13:26:07 tsutsui Exp $
+$NetBSD: patch-configure,v 1.6 2013/12/25 16:32:31 tsutsui Exp $
- setuid root is handled by SPECIAL_PERMS in pkgsrc
---- configure.orig 2013-10-26 16:47:13.000000000 +0000
+--- configure.orig 2013-12-21 17:11:50.000000000 +0000
+++ configure
-@@ -21343,7 +21343,7 @@ else
+@@ -21358,7 +21358,7 @@ else
fi
if test "$gui" = "fb" ; then
diff -r b1f7b765ced5 -r 81889260fcc1 x11/mlterm/patches/patch-mlterm_ml__vt100__parser.c
--- a/x11/mlterm/patches/patch-mlterm_ml__vt100__parser.c Wed Dec 25 14:59:10 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-mlterm_ml__vt100__parser.c,v 1.1 2013/12/14 16:30:18 tsutsui Exp $
-
-Pull fix from upstream ba3a5a22ae82b7c227cfd9f952881a281c53f82a:
- * ml_vt100_parser.c: U+200c-200f and U+202a-202e aren't converted
- even if -n option is specified.
-
---- mlterm/ml_vt100_parser.c.orig 2013-11-22 15:31:23.000000000 +0000
-+++ mlterm/ml_vt100_parser.c
-@@ -246,7 +246,7 @@ is_noconv_unicode(
- u_char * ch
- )
- {
-- if( unicode_noconv_areas)
-+ if( unicode_noconv_areas || ch[2] == 0x20)
- {
- u_int count ;
- u_int32_t code ;
-@@ -261,6 +261,16 @@ is_noconv_unicode(
- return 1 ;
- }
- }
-+
-+ /*
-+ * Don't convert these characters in order not to show them.
-+ * see ml_char_cols().
-+ */
-+ if( ( 0x200c <= code && code <= 0x200f) ||
-+ ( 0x202a <= code && code <= 0x202e))
-+ {
-+ return 1 ;
-+ }
- }
-
- return 0 ;
diff -r b1f7b765ced5 -r 81889260fcc1 x11/mlterm/patches/patch-xwindow_fb_x__display.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/mlterm/patches/patch-xwindow_fb_x__display.c Wed Dec 25 16:32:31 2013 +0000
@@ -0,0 +1,123 @@
+$NetBSD: patch-xwindow_fb_x__display.c,v 1.4 2013/12/25 16:32:31 tsutsui Exp $
+
+Pull post-3.3.2 fixes:
+ - 4d974f7: fix mlterm-fb scroll on >=8bpp framebuffers
+ - 0b2987a: fix palette handling on 4bpp framebuffers
+
+--- xwindow/fb/x_display.c.orig 2013-12-21 17:11:35.000000000 +0000
++++ xwindow/fb/x_display.c
+@@ -1180,6 +1180,7 @@ cmap_init(void)
+ _display.cmap->blue[color] = BYTE_COLOR_TO_WORD(b) ;
+ }
+
++ /* Same processing as x_display_set_cmap(). */
+ #ifndef USE_GRF
+ ioctl( _display.fb_fd , FBIOPUTCMAP , _display.cmap) ;
+ #else
+@@ -1553,12 +1554,45 @@ x_display_set_use_ansi_colors(
+ }
+
+ void
++x_display_enable_to_change_cmap(
++ int flag
++ )
++{
++ if( flag)
++ {
++ #ifdef USE_GRF
++ x68k_set_use_tvram_colors( 1) ;
++ #endif
++
++ if( ! use_ansi_colors)
++ {
++ use_ansi_colors = -1 ;
++ }
++ }
++ else
++ {
++ #ifdef USE_GRF
++ x68k_set_use_tvram_colors( 0) ;
++ #endif
++
++ if( use_ansi_colors == -1)
++ {
++ use_ansi_colors = 0 ;
++ }
++ }
++}
++
++void
+ x_display_set_cmap(
+ u_int32_t * pixels ,
+ u_int cmap_size
+ )
+ {
+- if( ! use_ansi_colors && cmap_size <= 16 && _disp.depth == 4)
++ if(
++ #ifdef USE_GRF
++ ! x68k_set_tvram_cmap( pixels , cmap_size) &&
++ #endif
++ use_ansi_colors == -1 && cmap_size <= 16 && _disp.depth == 4)
+ {
+ u_int count ;
+ ml_color_t color ;
+@@ -1584,7 +1618,18 @@ x_display_set_cmap(
+ _display.cmap->blue[color] = pixels[count] & 0xff ;
+ }
+
++ /* Same processing as cmap_init(). */
++ #ifndef USE_GRF
+ ioctl( _display.fb_fd , FBIOPUTCMAP , _display.cmap) ;
++ #else
++ for( count = 0 ; count < CMAP_SIZE(_display.cmap) ; count++)
++ {
++ ((fb_reg_t*)_display.fb)->gpal[count] =
++ (_display.cmap->red[count] >> 3) << 6 |
++ (_display.cmap->green[count] >> 3) << 11 |
++ (_display.cmap->blue[count] >> 3) << 1 ;
++ }
++ #endif
+ }
+ }
+
+@@ -1829,12 +1874,14 @@ x_display_fill_with(
+ fb_end += _display.line_length ;
+ }
+
++ #ifndef ENABLE_2_4_PPB
+ if( ++plane < _disp.depth)
+ {
+ fb = fb_orig + _display.plane_len * plane ;
+ fb_end = fb + (buf_end - buf) ;
+ }
+ else
++ #endif
+ {
+ break ;
+ }
+@@ -1870,6 +1917,7 @@ x_display_copy_lines(
+ u_char * dst ;
+ u_int copy_len ;
+ u_int count ;
++ int num_of_planes ;
+ int plane ;
+
+ /* XXX cheap implementation. */
+@@ -1878,7 +1926,16 @@ x_display_copy_lines(
+ /* XXX could be different from FB_WIDTH_BYTES(display, dst_x, width) */
+ copy_len = FB_WIDTH_BYTES(&_display, src_x, width) ;
+
+- for( plane = 0 ; plane < _disp.depth ; plane++)
++ if( _display.pixels_per_byte == 8)
++ {
++ num_of_planes = _disp.depth ;
++ }
++ else
++ {
++ num_of_planes = 1 ;
++ }
++
++ for( plane = 0 ; plane < num_of_planes ; plane++)
+ {
+ if( src_y <= dst_y)
+ {
diff -r b1f7b765ced5 -r 81889260fcc1 x11/mlterm/patches/patch-xwindow_fb_x__display.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/mlterm/patches/patch-xwindow_fb_x__display.h Wed Dec 25 16:32:31 2013 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-xwindow_fb_x__display.h,v 1.1 2013/12/25 16:32:31 tsutsui Exp $
+
+Pull post-3.3.2 fixes:
+ - 0b2987a: fix palette handling on 4bpp framebuffers
+
+--- xwindow/fb/x_display.h.orig 2013-12-21 17:11:36.000000000 +0000
++++ xwindow/fb/x_display.h
+@@ -43,15 +43,13 @@ int x_cmap_get_closest_color( u_long *
+ int x_cmap_get_pixel_rgb( u_int8_t * red , u_int8_t * green ,
+ u_int8_t * blue , u_long pixel) ;
+
++void x_display_enable_to_change_cmap( int flag) ;
++
+ void x_display_set_cmap( u_int32_t * cmap , u_int cmap_size) ;
+
+ #ifdef USE_GRF
+ int x68k_tvram_is_enabled(void) ;
+
+-void x68k_set_use_tvram_colors( int use) ;
+-
+-int x68k_set_tvram_cmap( u_int32_t * cmap , u_int cmap_size) ;
+-
+ int x68k_tvram_set_wall_picture( u_short * image , u_int width , u_int height) ;
+ #endif
+
diff -r b1f7b765ced5 -r 81889260fcc1 x11/mlterm/patches/patch-xwindow_fb_x__display__x68kgrf.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/mlterm/patches/patch-xwindow_fb_x__display__x68kgrf.c Wed Dec 25 16:32:31 2013 +0000
@@ -0,0 +1,59 @@
+$NetBSD: patch-xwindow_fb_x__display__x68kgrf.c,v 1.1 2013/12/25 16:32:31 tsutsui Exp $
+
+Pull post-3.3.2 fixes:
+ - 0b2987a: fix palette handling on 4bpp framebuffers
+
+--- xwindow/fb/x_display_x68kgrf.c.orig 2013-12-21 17:11:34.000000000 +0000
++++ xwindow/fb/x_display_x68kgrf.c
+@@ -563,16 +563,7 @@ gpal_init(
+ return 1 ;
+ }
+
+-
+-/* --- global functions --- */
+-
+-int
+-x68k_tvram_is_enabled(void)
+-{
+- return (grf0_fd != -1) ? 1 : 0 ;
+-}
+-
+-void
++static void
+ x68k_set_use_tvram_colors(
+ int use
+ )
+@@ -600,7 +591,7 @@ x68k_set_use_tvram_colors(
+
+ static fb_cmap_t * cmap_new( int num_of_colors) ;
+
+-int
++static int
+ x68k_set_tvram_cmap(
+ u_int32_t * pixels ,
+ u_int cmap_size
+@@ -629,6 +620,15 @@ x68k_set_tvram_cmap(
+ return 0 ;
+ }
+
++
++/* --- global functions --- */
++
++int
++x68k_tvram_is_enabled(void)
++{
++ return (grf0_fd != -1) ? 1 : 0 ;
++}
++
+ /*
+ * On success, if /dev/grf0 is opened just now, 2 is returned, while if
+ * /dev/grf0 has been already opened, 1 is returned.
Home |
Main Index |
Thread Index |
Old Index