pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/mlterm mlterm: update to 3.8.8.
details: https://anonhg.NetBSD.org/pkgsrc/rev/b66b84ae4f9a
branches: trunk
changeset: 321959:b66b84ae4f9a
user: tsutsui <tsutsui%pkgsrc.org@localhost>
date: Fri Apr 05 12:14:58 2019 +0000
description:
mlterm: update to 3.8.8.
pkgsrc changes:
- handle utmp option properly
- remove a patch applied in the upstream
Upstream changes noted in doc/en/ReleaseNote:
ver 3.8.8
* Support Haiku OS. (Experimental)
(Execute ./configure with --with-gui=beos option.) (See doc/en/README.beos)
* Support "[font family]:style=..." format in aafont or font-fb config file.
* Support mosh. (Experimental) (See doc/en/README.mosh)
(Don't distribute libptymosh in binary format.)
* Clear a window and scroll out all lines if the size of a window decreases
and some characters in it disappear.
* Support "%s" (replaced by selected strings) in "exesel:..." in ~/.mlterm/key.
* Add local_echo_wait / --lew option.
* Remove libind_tamil.so because it is very buggy.
* Change the default shortcut key of INSERT_SELECTION from Shift+Insert to
Command+v on MacOSX and iOS.
* Skip \r in configuration files.
* Start scp by Shift+Drag&Drop on not only xlib and win32 but also wayland, sdl2
and cocoa. (Command+Drag&Drop on cocoa.)
* Change the default value of "font_size_range" option from 6-30 to 1-100.
* Add vte 0.56.0 API symbols to libvte compatible library.
* Bug fixes:
Fix https://sourceforge.net/p/mlterm/mailman/message/36472061/
Fix https://sourceforge.net/p/mlterm/mailman/message/36513313/
Fix https://sourceforge.net/p/mlterm/bugs/79/
Fix segfault in processing illegal sixel sequence.
Fix invalidation of DECDWL on cairo. (Enbugged at 3.8.6)
Fix handling ISCII fonts on cairo and xft. (Improve showing bengali characters.)
Fix screen corruption (http://twitter.com/Cj_bc_sd/status/1088111309223161857)
on MacOSX 10.14. (Thanks to @Cj_bc_sd)
Fix segfault in showing an input method window. (Thanks to @isaki68k)
diffstat:
x11/mlterm/Makefile | 7 +--
x11/mlterm/PLIST | 5 +-
x11/mlterm/distinfo | 13 +++---
x11/mlterm/options.mk | 13 +++++-
x11/mlterm/patches/patch-configure | 29 ++++++++++-----
x11/mlterm/patches/patch-uitoolkit_xlib_ui__window.c | 37 --------------------
6 files changed, 39 insertions(+), 65 deletions(-)
diffs (172 lines):
diff -r 2b5e5a875998 -r b66b84ae4f9a x11/mlterm/Makefile
--- a/x11/mlterm/Makefile Fri Apr 05 10:55:26 2019 +0000
+++ b/x11/mlterm/Makefile Fri Apr 05 12:14:58 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.146 2019/02/17 16:57:59 tsutsui Exp $
+# $NetBSD: Makefile,v 1.147 2019/04/05 12:14:58 tsutsui Exp $
-DISTNAME= mlterm-3.8.7
-PKGREVISION= 3
+DISTNAME= mlterm-3.8.8
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/}
@@ -28,8 +27,6 @@
CONFIGURE_ARGS+= --without-libiconv-prefix
CONFIGURE_ARGS+= --without-libintl-prefix
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
-# XXX not yet
-CONFIGURE_ARGS+= --disable-utmp
INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
diff -r 2b5e5a875998 -r b66b84ae4f9a x11/mlterm/PLIST
--- a/x11/mlterm/PLIST Fri Apr 05 10:55:26 2019 +0000
+++ b/x11/mlterm/PLIST Fri Apr 05 12:14:58 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.41 2018/11/01 15:11:07 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.42 2019/04/05 12:14:58 tsutsui Exp $
bin/mlcc
bin/mlclient
bin/mlclientx
@@ -42,12 +42,11 @@
${PLIST.ind}lib/mlterm/libind_malayalam.la
${PLIST.ind}lib/mlterm/libind_oriya.la
${PLIST.ind}lib/mlterm/libind_punjabi.la
-${PLIST.ind}lib/mlterm/libind_tamil.la
${PLIST.ind}lib/mlterm/libind_telugu.la
lib/mlterm/libmotif.la
lib/mlterm/libmozmodern.la
+lib/mlterm/libnext.la
${PLIST.otl}lib/mlterm/libotl.la
-lib/mlterm/libnext.la
lib/mlterm/libpixmap_engine.la
lib/mlterm/libsample.la
${PLIST.cairo}lib/mlterm/libtype_cairo.la
diff -r 2b5e5a875998 -r b66b84ae4f9a x11/mlterm/distinfo
--- a/x11/mlterm/distinfo Fri Apr 05 10:55:26 2019 +0000
+++ b/x11/mlterm/distinfo Fri Apr 05 12:14:58 2019 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.75 2019/02/17 16:57:59 tsutsui Exp $
+$NetBSD: distinfo,v 1.76 2019/04/05 12:14:58 tsutsui Exp $
-SHA1 (mlterm-3.8.7.tar.gz) = 040363ea4428fbdbeaa49cf402f71f41b8dbaea7
-RMD160 (mlterm-3.8.7.tar.gz) = 4a9a4a053a6ae4c431564c84051a7ed95acaa311
-SHA512 (mlterm-3.8.7.tar.gz) = 6d2087d1433918f476e35dbde8d79940170fa6f133b9122e1db19006afc5081dbad7ed487bfa939b3d92ea29f3843a2b7c5540dc05e54b3c568bbe76ceb66ad2
-Size (mlterm-3.8.7.tar.gz) = 3994292 bytes
-SHA1 (patch-configure) = b29ee553686061f8fd0f93b8c1d68954c060338d
+SHA1 (mlterm-3.8.8.tar.gz) = 54f40fa50214656ab70f592d5d58805b1dfdc1c6
+RMD160 (mlterm-3.8.8.tar.gz) = 9a7675a86999541b57742099a5e9eac8a539b580
+SHA512 (mlterm-3.8.8.tar.gz) = 4db7de441300d30eadc85d1c780bb10c81d2555225fe163280508180ccc2114eeacf0e5772f9d69c1b59ef6f3ffb3444b75fe3e5ea508dd9e18e5850e78f78a5
+Size (mlterm-3.8.8.tar.gz) = 4035215 bytes
+SHA1 (patch-configure) = e95b426f028c9bcb9895e69bb85ce8450f78a8c8
SHA1 (patch-etc_font-fb) = 03f0b2ecee20ef3201c8e4ce17f03ac90f657b00
-SHA1 (patch-uitoolkit_xlib_ui__window.c) = 6424d2cd55564bd2a3a5e61582d8bc156b0eb703
diff -r 2b5e5a875998 -r b66b84ae4f9a x11/mlterm/options.mk
--- a/x11/mlterm/options.mk Fri Apr 05 10:55:26 2019 +0000
+++ b/x11/mlterm/options.mk Fri Apr 05 12:14:58 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.15 2018/08/18 01:32:23 ryoon Exp $
+# $NetBSD: options.mk,v 1.16 2019/04/05 12:14:58 tsutsui Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mlterm
-PKG_SUPPORTED_OPTIONS= cairo canna fcitx fribidi gdk_pixbuf2 ibus libind m17nlib mlterm-fb otl scim skk uim wnn4 xft2
-PKG_SUGGESTED_OPTIONS= cairo fribidi gdk_pixbuf2 m17nlib otl xft2
+PKG_SUPPORTED_OPTIONS= cairo canna fcitx fribidi gdk_pixbuf2 ibus libind m17nlib mlterm-fb otl scim skk uim utmp wnn4 xft2
+PKG_SUGGESTED_OPTIONS= cairo fribidi gdk_pixbuf2 m17nlib otl utmp xft2
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
PKG_SUGGESTED_OPTIONS+= mlterm-fb
.endif
@@ -113,6 +113,13 @@
CONFIGURE_ARGS+= --disable-uim
.endif
+.if !empty(PKG_OPTIONS:Mutmp)
+CONFIGURE_ARGS+= --enable-utmp
+SPECIAL_PERMS+= bin/mlterm ${REAL_ROOT_USER} utmp 2755
+.else
+CONFIGURE_ARGS+= --disable-utmp
+.endif
+
.if !empty(PKG_OPTIONS:Mwnn4)
.include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
CONFIGURE_ARGS+= --enable-wnn
diff -r 2b5e5a875998 -r b66b84ae4f9a x11/mlterm/patches/patch-configure
--- a/x11/mlterm/patches/patch-configure Fri Apr 05 10:55:26 2019 +0000
+++ b/x11/mlterm/patches/patch-configure Fri Apr 05 12:14:58 2019 +0000
@@ -1,15 +1,24 @@
-$NetBSD: patch-configure,v 1.17 2018/06/22 14:17:15 tsutsui Exp $
+$NetBSD: patch-configure,v 1.18 2019/04/05 12:14:58 tsutsui Exp $
-- setuid root is handled by SPECIAL_PERMS in pkgsrc
+- setuid root / setgid utmp is handled by SPECIAL_PERMS in pkgsrc
---- configure.orig 2018-03-07 13:17:24.000000000 +0000
+--- configure.orig 2019-03-31 13:10:47.000000000 +0000
+++ configure
-@@ -22185,7 +22185,7 @@ else
+@@ -25536,7 +25536,7 @@ if test "$INSTALL_OPT" = ""; then
+ if test "$utmp_none_obj" = ""; then
+ has_utmp=`grep utmp /etc/group 2>/dev/null`
+ if test "$has_utmp" ; then
+- INSTALL_OPT="-m 2755 -g utmp"
++ INSTALL_OPT=""
+ else
+ INSTALL_OPT="-m 4755 -o root"
+ fi
+@@ -25545,7 +25545,7 @@ if test "$INSTALL_OPT" = ""; then
+ fi
+
+ if test "$gui" = "fb" ; then
+- INSTALL_OPT="-m 4755 -o root"
++ INSTALL_OPT=""
+ fi
fi
- if test "$gui" = "fb" ; then
-- INSTALL_OPT="-m 4755 -o root"
-+ INSTALL_OPT=""
- fi
-
-
diff -r 2b5e5a875998 -r b66b84ae4f9a x11/mlterm/patches/patch-uitoolkit_xlib_ui__window.c
--- a/x11/mlterm/patches/patch-uitoolkit_xlib_ui__window.c Fri Apr 05 10:55:26 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-$NetBSD: patch-uitoolkit_xlib_ui__window.c,v 1.1 2019/02/17 16:57:59 tsutsui Exp $
-
-- pull upstream fix:
- http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.8.7/mlterm-3.8.7-fixes.patch/download
- https://bitbucket.org/arakiken/mlterm/commits/f41d3a433fcfc573fe7d09fb67a54cfae7d247c5
-
---- uitoolkit/xlib/ui_window.c.orig 2018-10-27 14:29:17.000000000 +0000
-+++ uitoolkit/xlib/ui_window.c
-@@ -1337,9 +1337,11 @@ int ui_window_show(ui_window_t *win, int
- size_hints.height_inc = total_height_inc(win);
- size_hints.min_width = total_min_width(win);
- size_hints.min_height = total_min_height(win);
-- size_hints.base_width = size_hints.min_width > size_hints.width_inc ?
-+ size_hints.base_width = (size_hints.width_inc > 0 &&
-+ size_hints.min_width > size_hints.width_inc) ?
- size_hints.min_width % size_hints.width_inc : 0;
-- size_hints.base_height = size_hints.min_height > size_hints.height_inc ?
-+ size_hints.base_height = (size_hints.height_inc > 0 &&
-+ size_hints.min_height > size_hints.height_inc) ?
- size_hints.min_height % size_hints.height_inc : 0;
-
- #ifdef DEBUG
-@@ -1586,9 +1588,11 @@ void ui_window_set_normal_hints(ui_windo
- size_hints.height_inc = total_height_inc(root);
- size_hints.min_width = total_min_width(root);
- size_hints.min_height = total_min_height(root);
-- size_hints.base_width =
-- size_hints.min_width > size_hints.width_inc ? size_hints.min_width % size_hints.width_inc : 0;
-- size_hints.base_height = size_hints.min_height > size_hints.height_inc ?
-+ size_hints.base_width = (size_hints.width_inc > 0 &&
-+ size_hints.min_width > size_hints.width_inc) ?
-+ size_hints.min_width % size_hints.width_inc : 0;
-+ size_hints.base_height = (size_hints.height_inc > 0 &&
-+ size_hints.min_height > size_hints.height_inc) ?
- size_hints.min_height % size_hints.height_inc : 0;
- size_hints.flags = PMinSize | PResizeInc | PBaseSize;
-
Home |
Main Index |
Thread Index |
Old Index