diff options
| -rw-r--r-- | x11/mlterm/Makefile | 4 | ||||
| -rw-r--r-- | x11/mlterm/distinfo | 14 | ||||
| -rw-r--r-- | x11/mlterm/patches/patch-configure | 39 | ||||
| -rw-r--r-- | x11/mlterm/patches/patch-configure.in | 38 | ||||
| -rw-r--r-- | x11/mlterm/patches/patch-etc_font-fb | 4 | ||||
| -rw-r--r-- | x11/mlterm/patches/patch-xwindow_fb_x__window.c | 38 |
6 files changed, 52 insertions, 85 deletions
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index a4759d04a14..19fb19a7359 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.90 2013/06/29 20:29:46 tsutsui Exp $ +# $NetBSD: Makefile,v 1.91 2013/08/11 13:23:34 tsutsui Exp $ -DISTNAME= mlterm-3.2.1 +DISTNAME= mlterm-3.2.2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/} diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo index ba3be5b4c67..f195c6a2acb 100644 --- a/x11/mlterm/distinfo +++ b/x11/mlterm/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.34 2013/06/29 20:29:46 tsutsui Exp $ +$NetBSD: distinfo,v 1.35 2013/08/11 13:23:34 tsutsui Exp $ -SHA1 (mlterm-3.2.1.tar.gz) = 67c2036ab3e280b4da5e3935ca56f0166d160eab -RMD160 (mlterm-3.2.1.tar.gz) = ca550a1efe99b903303308db6bd49649b9a10d71 -Size (mlterm-3.2.1.tar.gz) = 3529721 bytes -SHA1 (patch-configure) = e912c9ee89cd338bc4f0b40bccf38dd2587cda6d -SHA1 (patch-configure.in) = 2f175e1ac4f933940197d8dff1f429ffb6e7538f -SHA1 (patch-etc_font-fb) = 019d92cafbbae85629ae2914adcfca9d01f347d0 +SHA1 (mlterm-3.2.2.tar.gz) = c0ecd83991171d1b1563e828a1430cb6c01ba358 +RMD160 (mlterm-3.2.2.tar.gz) = 9d43352e1f7492af6d7dba370616b2cd585eb602 +Size (mlterm-3.2.2.tar.gz) = 3535155 bytes +SHA1 (patch-configure) = 00c7e3b3e28538c3dd67ba6fe795675294deb719 +SHA1 (patch-etc_font-fb) = ea7a769248570646c5cab35c38f48082f1b17685 +SHA1 (patch-xwindow_fb_x__window.c) = afa10530191329fb949718e40cc70dd7875d2dcd diff --git a/x11/mlterm/patches/patch-configure b/x11/mlterm/patches/patch-configure index 60bf6ac9a8d..9d60f7f9865 100644 --- a/x11/mlterm/patches/patch-configure +++ b/x11/mlterm/patches/patch-configure @@ -1,32 +1,10 @@ -$NetBSD: patch-configure,v 1.3 2013/06/29 20:29:47 tsutsui Exp $ +$NetBSD: patch-configure,v 1.4 2013/08/11 13:23:34 tsutsui Exp $ - setuid root is handled by SPECIAL_PERMS in pkgsrc -- pull post-3.2.1 fixes: - http://mlterm.sf.net/mlterm-3.2.1-fixes.patch - > Fix configure error which --with-gui=xlib,fb option causes. - > (enbugged at 3.2.1) ---- configure.orig 2013-06-29 12:45:20.000000000 +0000 +--- configure.orig 2013-08-05 12:48:56.000000000 +0000 +++ configure -@@ -19758,11 +19758,16 @@ if test "$gui" = "fb,xlib" -o "$gui" = " - fi - mkdir -p ${top_srcdir-$srcdir}/fb - for file in ChangeLog Makefile.in common configure etc gtk inputmethod java \ -- main man mlterm script scrollbar xwindow ; do -+ main man mlterm script scrollbar xwindow doc ; do - cp -R ${top_srcdir-$srcdir}/$file ${top_srcdir-$srcdir}/fb/ - done - fi - -+if test "$gui" = "fb" ; then -+ MAKE_DIRS="doc/kbd ${MAKE_DIRS}" -+ OUTPUT_FILES="doc/kbd/Makefile ${OUTPUT_FILES}" -+fi -+ - ml_cv_is_posix="yes" - - case "${host_os}" in -@@ -21332,7 +21337,7 @@ else +@@ -21337,7 +21337,7 @@ else fi if test "$gui" = "fb" ; then @@ -35,14 +13,3 @@ $NetBSD: patch-configure,v 1.3 2013/06/29 20:29:47 tsutsui Exp $ fi -@@ -25229,8 +25234,8 @@ subdirs="$subdirs ${SUBDIRS}" - - fi - --MAKE_DIRS="mlterm mlterm/libctl xwindow/libtype xwindow main man etc doc/kbd ${MAKE_DIRS}" --OUTPUT_FILES="Makefile mlterm/Makefile mlterm/libctl/Makefile xwindow/libtype/Makefile xwindow/Makefile main/Makefile man/Makefile etc/Makefile java/Makefile doc/kbd/Makefile ${OUTPUT_FILES}" -+MAKE_DIRS="mlterm mlterm/libctl xwindow/libtype xwindow main man etc ${MAKE_DIRS}" -+OUTPUT_FILES="Makefile mlterm/Makefile mlterm/libctl/Makefile xwindow/libtype/Makefile xwindow/Makefile main/Makefile man/Makefile etc/Makefile java/Makefile ${OUTPUT_FILES}" - - # Check whether --enable-ind was given. - if test "${enable_ind+set}" = set; then : diff --git a/x11/mlterm/patches/patch-configure.in b/x11/mlterm/patches/patch-configure.in deleted file mode 100644 index c35b35effde..00000000000 --- a/x11/mlterm/patches/patch-configure.in +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-configure.in,v 1.1 2013/06/29 20:29:47 tsutsui Exp $ - -- pull post-3.2.1 fixes: - http://mlterm.sf.net/mlterm-3.2.1-fixes.patch - > Fix configure error which --with-gui=xlib,fb option causes. - > (enbugged at 3.2.1) - ---- configure.in.orig 2013-06-29 12:45:20.000000000 +0000 -+++ configure.in -@@ -82,11 +82,16 @@ if test "$gui" = "fb,xlib" -o "$gui" = " - fi - mkdir -p ${top_srcdir-$srcdir}/fb - for file in ChangeLog Makefile.in common configure etc gtk inputmethod java \ -- main man mlterm script scrollbar xwindow ; do -+ main man mlterm script scrollbar xwindow doc ; do - cp -R ${top_srcdir-$srcdir}/$file ${top_srcdir-$srcdir}/fb/ - done - fi - -+if test "$gui" = "fb" ; then -+ MAKE_DIRS="doc/kbd ${MAKE_DIRS}" -+ OUTPUT_FILES="doc/kbd/Makefile ${OUTPUT_FILES}" -+fi -+ - ml_cv_is_posix="yes" - - case "${host_os}" in -@@ -1094,8 +1099,8 @@ if test "${SUBDIRS}" != "" ; then - AC_CONFIG_SUBDIRS(${SUBDIRS}) - fi - --MAKE_DIRS="mlterm mlterm/libctl xwindow/libtype xwindow main man etc doc/kbd ${MAKE_DIRS}" --OUTPUT_FILES="Makefile mlterm/Makefile mlterm/libctl/Makefile xwindow/libtype/Makefile xwindow/Makefile main/Makefile man/Makefile etc/Makefile java/Makefile doc/kbd/Makefile ${OUTPUT_FILES}" -+MAKE_DIRS="mlterm mlterm/libctl xwindow/libtype xwindow main man etc ${MAKE_DIRS}" -+OUTPUT_FILES="Makefile mlterm/Makefile mlterm/libctl/Makefile xwindow/libtype/Makefile xwindow/Makefile main/Makefile man/Makefile etc/Makefile java/Makefile ${OUTPUT_FILES}" - - AC_ARG_ENABLE(ind, - [ --enable-ind libind @<:@default=disabled@:>@], diff --git a/x11/mlterm/patches/patch-etc_font-fb b/x11/mlterm/patches/patch-etc_font-fb index 5937c3c88f7..07817b8affd 100644 --- a/x11/mlterm/patches/patch-etc_font-fb +++ b/x11/mlterm/patches/patch-etc_font-fb @@ -1,8 +1,8 @@ -$NetBSD: patch-etc_font-fb,v 1.3 2013/06/29 20:29:47 tsutsui Exp $ +$NetBSD: patch-etc_font-fb,v 1.4 2013/08/11 13:23:34 tsutsui Exp $ add more examples for typical NetBSD and pkgsrc installation ---- etc/font-fb.orig 2013-06-29 12:45:19.000000000 +0000 +--- etc/font-fb.orig 2013-08-05 12:48:53.000000000 +0000 +++ etc/font-fb @@ -1,10 +1,17 @@ #DEFAULT = /usr/share/fonts/X11/misc/unifont.pcf.gz:100 diff --git a/x11/mlterm/patches/patch-xwindow_fb_x__window.c b/x11/mlterm/patches/patch-xwindow_fb_x__window.c new file mode 100644 index 00000000000..7273812a2b3 --- /dev/null +++ b/x11/mlterm/patches/patch-xwindow_fb_x__window.c @@ -0,0 +1,38 @@ +$NetBSD: patch-xwindow_fb_x__window.c,v 1.3 2013/08/11 13:23:34 tsutsui Exp $ + +- pull a fix from upstream ed13793007b80c8fbd0997c4d74dc23f43dd6b36: +>> fb/x_window.c: The bug of copy_area() which disabled redrawing +>> the margin area is fixed. + +--- xwindow/fb/x_window.c.orig 2013-08-05 12:48:52.000000000 +0000 ++++ xwindow/fb/x_window.c +@@ -492,7 +492,7 @@ copy_area( + u_int height , + int dst_x , /* can be minus */ + int dst_y , /* can be minus */ +- int accept_margin /* x/y can be minus or not */ ++ int accept_margin /* x/y can be minus and over width/height */ + ) + { + int margin ; +@@ -503,7 +503,7 @@ copy_area( + u_char * picture ; + size_t src_width_size ; + +- if( ! win->is_mapped || dst_x >= (int)win->width || dst_y >= (int)win->height) ++ if( ! win->is_mapped) + { + return 0 ; + } +@@ -520,6 +520,11 @@ copy_area( + bottom_margin = BOTTOM_MARGIN(win) ; + } + ++ if( dst_x >= (int)win->width + margin || dst_y >= (int)win->height + margin) ++ { ++ return 0 ; ++ } ++ + if( dst_x + width > win->width + margin - right_margin) + { + width = win->width + margin - right_margin - dst_x ; |