Update mlterm to 3.3.4. (leaf package update) pkgsrc changes: - remove post-3.3.3 fix patches - pull a post-3.3.4 bug fix patch for NetBSD and OpenBSD Changes from doc/en/ReleaseNote: ver 3.3.4 * Support not only sixel graphics but also other major image formats on Android. * Support ReGIS partially. (depends on SDL(SDL2), SDL_ttf(SDL2_ttf) and fontconfig) * Output strerror(errno) on error. * Support "key=value #comment" style in the same line in ~/.mlterm/main. * Draw all ambiguous width characters one by one to fit the column width unless -V option is specified. * Merge patches: https://gist.github.com/tsutsui/9285759. (Thanks to @tsutsuii) * Bug fixes: Change the default resolution on NetBSD/x68k from 512x512x8 to 768x512x4. Fix the bug which output help message to stdout where mlterm waits for image data and which made mlterm allocate too large memory. (enbugged at 3.3.3) Fix the bug which disabled to start mlconfig. (enbugged at 3.3.3) Fix the bug which caused segfault if x11 forwarding failed. Fix the bug which caused segfault in resuming on Android. Show candidate strings of uim-mozc correctly. Fix the bug which disabled normal users from opening screen on NetBSD/x68k framebuffer. Fix segfault in connecting unknown hosts on java.diff -r1.101 -r1.102 pkgsrc/x11/mlterm/Makefile
(tsutsui)
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.101 2014/03/14 17:42:17 tsutsui Exp $ | 1 | # $NetBSD: Makefile,v 1.102 2014/03/23 07:04:00 tsutsui Exp $ | |
2 | 2 | |||
3 | DISTNAME= mlterm-3.3.3 | 3 | DISTNAME= mlterm-3.3.4 | |
4 | PKGREVISION= 2 | |||
5 | CATEGORIES= x11 | 4 | CATEGORIES= x11 | |
6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/} | 5 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/} | |
7 | 6 | |||
8 | MAINTAINER= uebayasi@NetBSD.org | 7 | MAINTAINER= uebayasi@NetBSD.org | |
9 | HOMEPAGE= http://mlterm.sourceforge.net/ | 8 | HOMEPAGE= http://mlterm.sourceforge.net/ | |
10 | COMMENT= Multilingual terminal emulator | 9 | COMMENT= Multilingual terminal emulator | |
11 | LICENSE= modified-bsd | 10 | LICENSE= modified-bsd | |
12 | 11 | |||
13 | # CODESET is only supported on NetBSD in 1.5T and later - see <langinfo.h> | 12 | # CODESET is only supported on NetBSD in 1.5T and later - see <langinfo.h> | |
14 | NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-* NetBSD-1.5[A-S]-* | 13 | NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-* NetBSD-1.5[A-S]-* | |
15 | 14 | |||
16 | USE_TOOLS+= pkg-config msgfmt | 15 | USE_TOOLS+= pkg-config msgfmt | |
17 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes |
@@ -1,11 +1,8 @@ | @@ -1,11 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.42 2014/03/14 17:42:17 tsutsui Exp $ | 1 | $NetBSD: distinfo,v 1.43 2014/03/23 07:04:00 tsutsui Exp $ | |
2 | 2 | |||
3 | SHA1 (mlterm-3.3.3.tar.gz) = 9d5befee155e5e514874b45c46b1b7fe2fdf3dbd | 3 | SHA1 (mlterm-3.3.4.tar.gz) = eb065d2048ab1b7a0bcb7d1bddf253eb02ceacca | |
4 | RMD160 (mlterm-3.3.3.tar.gz) = 9c669c523aa2e8b7e48420a58ab74b851cea3dfe | 4 | RMD160 (mlterm-3.3.4.tar.gz) = 5c63c78a5e602dc473eaf0c6f50546cb9c944819 | |
5 | Size (mlterm-3.3.3.tar.gz) = 3578266 bytes | 5 | Size (mlterm-3.3.4.tar.gz) = 3589264 bytes | |
6 | SHA1 (patch-configure) = 950194a8be2ebd7f3ed22c9ebaba545def6c7351 | 6 | SHA1 (patch-common_c__imagelib.c) = baf6de1fa4d6b55f7dd1ba77e42b0c91921fc872 | |
7 | SHA1 (patch-etc_font-fb) = 7ded1dbee083df4d78b6ebf42964f50262feb318 | 7 | SHA1 (patch-configure) = 5e3b0c709d447c49b0d26c40bde8ded4ade013c3 | |
8 | SHA1 (patch-inputmethod_uim_im__uim.c) = c61931c6d6ca5295e16a68c2b4fa89641817ee58 | 8 | SHA1 (patch-etc_font-fb) = 7e5c1ced916fdb2b6da1dc86dd37d7bad5a7ede7 | |
9 | SHA1 (patch-xwindow_fb_x__display__x68kgrf.c) = b4e106db5530c57010b811f0c15a4dd4bdc233a6 | |||
10 | SHA1 (patch-xwindow_x__main__config.c) = 501dbde1484e93066fdaa652853679468a6ce78a | |||
11 | SHA1 (patch-xwindow_x__screen.c) = 4b09a17ad85c47d30f03b742994f09131994dc36 |
$NetBSD: patch-common_c__imagelib.c,v 1.1 2014/03/23 07:04:00 tsutsui Exp $
Pull post-3.3.4 bug fixes patch:
http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.4/mlterm-3.3.4-fixes.patch/download
- fix build error on NetBSD and OpenBSD with framebuffer support.
--- common/c_imagelib.c.orig 2014-03-22 22:06:31.000000000 +0000
+++ common/c_imagelib.c
@@ -795,6 +795,9 @@ end:
return pixels ;
}
+
+#ifndef __CONVERT_REGIS_TO_BMP__
+#define __CONVERT_REGIS_TO_BMP__
#ifdef USE_WIN32API
static int
@@ -905,6 +908,7 @@ convert_regis_to_bmp(
}
#endif
+#endif /* CONVERT_REGIS_TO_BMP */
#ifndef SIXEL_1BPP
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | $NetBSD: patch-configure,v 1.6 2013/12/25 16:32:31 tsutsui Exp $ | 1 | $NetBSD: patch-configure,v 1.7 2014/03/23 07:04:00 tsutsui Exp $ | |
2 | 2 | |||
3 | - setuid root is handled by SPECIAL_PERMS in pkgsrc | 3 | - setuid root is handled by SPECIAL_PERMS in pkgsrc | |
4 | 4 | |||
5 | --- configure.orig 2013-12-21 17:11:50.000000000 +0000 | 5 | --- configure.orig 2014-03-22 22:06:40.000000000 +0000 | |
6 | +++ configure | 6 | +++ configure | |
7 | @@ -21358,7 +21358,7 @@ else | 7 | @@ -21377,7 +21377,7 @@ else | |
8 | fi | 8 | fi | |
9 | 9 | |||
10 | if test "$gui" = "fb" ; then | 10 | if test "$gui" = "fb" ; then | |
11 | - INSTALL_OPT="-m 4755 -o root" | 11 | - INSTALL_OPT="-m 4755 -o root" | |
12 | + INSTALL_OPT="" | 12 | + INSTALL_OPT="" | |
13 | fi | 13 | fi | |
14 | 14 | |||
15 | 15 |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | $NetBSD: patch-etc_font-fb,v 1.5 2013/10/28 13:26:07 tsutsui Exp $ | 1 | $NetBSD: patch-etc_font-fb,v 1.6 2014/03/23 07:04:00 tsutsui Exp $ | |
2 | 2 | |||
3 | add more examples for typical NetBSD and pkgsrc installation | 3 | add more examples for typical NetBSD and pkgsrc installation | |
4 | 4 | |||
5 | --- etc/font-fb.orig 2013-10-26 16:47:13.000000000 +0000 | 5 | --- etc/font-fb.orig 2014-03-22 22:06:39.000000000 +0000 | |
6 | +++ etc/font-fb | 6 | +++ etc/font-fb | |
7 | @@ -1,10 +1,17 @@ | 7 | @@ -1,10 +1,17 @@ | |
8 | #DEFAULT = /usr/share/fonts/X11/misc/unifont.pcf.gz:100 | 8 | #DEFAULT = /usr/share/fonts/X11/misc/unifont.pcf.gz:100 | |
9 | +#DEFAULT = /usr/pkg/lib/X11/fonts/efont/b16.pcf.gz | 9 | +#DEFAULT = /usr/pkg/lib/X11/fonts/efont/b16.pcf.gz | |
10 | 10 | |||
11 | #ISO8859_1 = /usr/share/fonts/X11/misc/mplus_f12r.pcf.gz | 11 | #ISO8859_1 = /usr/share/fonts/X11/misc/mplus_f12r.pcf.gz | |
12 | +#ISO8859_1 = /usr/X11R7/lib/X11/fonts/misc/8x16.pcf.gz | 12 | +#ISO8859_1 = /usr/X11R7/lib/X11/fonts/misc/8x16.pcf.gz | |
13 | +#JISX0201_KATA = /usr/X11R7/lib/X11/fonts/misc/8x16rk.pcf.gz | 13 | +#JISX0201_KATA = /usr/X11R7/lib/X11/fonts/misc/8x16rk.pcf.gz | |
14 | #JISX0208_1983 = /usr/share/fonts/X11/misc/mplus_j12r.pcf.gz | 14 | #JISX0208_1983 = /usr/share/fonts/X11/misc/mplus_j12r.pcf.gz | |
15 | +#JISX0208_1983 = /usr/X11R7/lib/X11/fonts/misc/jiskan16.pcf.gz | 15 | +#JISX0208_1983 = /usr/X11R7/lib/X11/fonts/misc/jiskan16.pcf.gz | |
16 | JISC6226_1978 = &JISX0208_1983 | 16 | JISC6226_1978 = &JISX0208_1983 | |
17 | JISX0208_1990 = &JISX0208_1983 | 17 | JISX0208_1990 = &JISX0208_1983 | |
18 | JISX0213_2000_1 = &JISX0208_1983 | 18 | JISX0213_2000_1 = &JISX0208_1983 |