From 77f07b2acdd5629761ae592f2557223532b44bb4 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Tue, 4 Apr 2023 16:53:34 +0000 Subject: [PATCH] mlterm: update to 3.9.3. pkgsrc changes: * make mlconfig.po installed properly (#66) * remove local patches integrated into upstream Upstream changes (noted in doc/en/ReleaseNote): ver 3.9.3 * mlterm-wl supports xdg-decoration. * Add --disable-compact-truecolor option to ./configure script. * Add vte 0.68 API symbols to libvte compatible library. * Add libvterm 0.2 API symbols to libvterm compatible library. * Add --sdpr / simple_scrollbar_dpr option. (https://github.com/arakiken/mlterm/issues/64) * Set "COLORTERM=truecolor" environmental variable. (https://github.com/arakiken/mlterm/issues/36) * Update unicode property table (generated from UnicodeData.txt and EastAsianWidth.txt) to version 15.0.0. * Support mosh-1.4.0. * Merge patches: https://github.com/arakiken/mlterm/pull/45. https://github.com/arakiken/mlterm/pull/46. https://github.com/arakiken/mlterm/pull/48. https://github.com/arakiken/mlterm/pull/49. https://github.com/arakiken/mlterm/pull/55. (Add --role / wm_role option) https://github.com/arakiken/mlterm/pull/57. https://github.com/arakiken/mlterm/pull/61. https://github.com/arakiken/mlterm/pull/62. https://github.com/arakiken/mlterm/pull/63. * Bug fixes: Fix https://github.com/arakiken/mlterm/issues/34. Fix https://github.com/arakiken/mlterm/issues/35. Fix https://github.com/arakiken/mlterm/issues/39. Fix https://github.com/arakiken/mlterm/issues/44. Fix https://github.com/arakiken/mlterm/issues/50. Fix https://github.com/arakiken/mlterm/issues/51. Fix https://github.com/arakiken/mlterm/issues/53. Fix https://twitter.com/isaki68k/status/1555895011991883783. Fix segfault in starting mlterm with --dyncomb and --otl. --- x11/mlterm/Makefile | 6 +- x11/mlterm/distinfo | 15 ++--- x11/mlterm/patches/patch-common_c__imagelib.c | 17 ------ x11/mlterm/patches/patch-configure | 8 +-- .../patches/patch-tool_mlconfig_Makefile.in | 41 +++++++++++++ .../patch-uitoolkit_fb_ui__display__wscons.c | 58 ------------------- .../patch-uitoolkit_xlib_ui__imagelib.c | 44 -------------- x11/mlterm/patches/patch-vtemu_vt__parser.c | 21 ------- 8 files changed, 53 insertions(+), 157 deletions(-) delete mode 100644 x11/mlterm/patches/patch-common_c__imagelib.c create mode 100644 x11/mlterm/patches/patch-tool_mlconfig_Makefile.in delete mode 100644 x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c delete mode 100644 x11/mlterm/patches/patch-uitoolkit_xlib_ui__imagelib.c delete mode 100644 x11/mlterm/patches/patch-vtemu_vt__parser.c diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index 68b1373fe51a..e81be6d00c2a 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.180 2023/01/29 21:18:17 ryoon Exp $ +# $NetBSD: Makefile,v 1.181 2023/04/04 16:53:34 tsutsui Exp $ -DISTNAME= mlterm-3.9.2 -DIST_SUBDIR= ${PKGNAME_NOREV} # for re-tagged 3.9.2 -PKGREVISION= 10 +DISTNAME= mlterm-3.9.3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=arakiken/} GITHUB_PROJECT= ${PKGBASE} diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo index 8b416458f0ad..51d236b2660c 100644 --- a/x11/mlterm/distinfo +++ b/x11/mlterm/distinfo @@ -1,12 +1,9 @@ -$NetBSD: distinfo,v 1.97 2022/12/12 17:51:22 tsutsui Exp $ +$NetBSD: distinfo,v 1.98 2023/04/04 16:53:34 tsutsui Exp $ -BLAKE2s (mlterm-3.9.2/mlterm-3.9.2.tar.gz) = 3bd490eb661bc802cb05ebbb17a73956f5a62ca3838dcf5cb7baad0c01c3ebdb -SHA512 (mlterm-3.9.2/mlterm-3.9.2.tar.gz) = 3076dafbc98a01738d88acf0e0f52e15d33862b3e9b7a851a4496f1be07ee9e51103daf7842954bcae1f1ba62bd6645b0bd60af7f66ee98721bdf3786b9fcbaf -Size (mlterm-3.9.2/mlterm-3.9.2.tar.gz) = 4259208 bytes -SHA1 (patch-common_c__imagelib.c) = 249d67057ea3d6f413de3c646d0e55e04547d4b9 -SHA1 (patch-configure) = 266b3e8383c425c7ef8cd180f07e1199890521ba +BLAKE2s (mlterm-3.9.3.tar.gz) = d3730227673c203bd24c786b95a6c49751a3f554251e2b708a262994526207ec +SHA512 (mlterm-3.9.3.tar.gz) = 67c22ee8411cef499620a37e43af5609bb52cf8be6b617f0dfa6605217eb7f66227bfe073ca9b878606392fac26f94299221b5890fba1d90a3afc35a0f3132a1 +Size (mlterm-3.9.3.tar.gz) = 4272090 bytes +SHA1 (patch-configure) = 23e153937f154a2464fe6c76a3e7bfbe35a50805 SHA1 (patch-etc_font-fb) = 52c18f512c67ff530c0c326394fdf43956d71cb0 -SHA1 (patch-uitoolkit_fb_ui__display__wscons.c) = 5697668f9e294d313d2b9f9c670b047d3bcd8078 -SHA1 (patch-uitoolkit_xlib_ui__imagelib.c) = 4c8b3f520d9e1e4fa900b860767799ee16fa0026 +SHA1 (patch-tool_mlconfig_Makefile.in) = d1a8e0310d621a0b4a700d243bffbd445d28a95f SHA1 (patch-vtemu_Makefile.in) = 172f12f73408489f782d63c8b0b7915af441d368 -SHA1 (patch-vtemu_vt__parser.c) = ac8e6c8748047778daa1fc22c971e10e58918887 diff --git a/x11/mlterm/patches/patch-common_c__imagelib.c b/x11/mlterm/patches/patch-common_c__imagelib.c deleted file mode 100644 index 3678e2f28c5a..000000000000 --- a/x11/mlterm/patches/patch-common_c__imagelib.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-common_c__imagelib.c,v 1.3 2022/12/12 17:51:22 tsutsui Exp $ - -- pull upstream fix: - https://github.com/arakiken/mlterm/commit/ddc9a846a198216cc065901d8a81d8d2801bd70e - > * c_imagelib.c: Fix buffer over-read. - ---- common/c_imagelib.c.orig 2022-01-16 15:20:31.000000000 +0000 -+++ common/c_imagelib.c -@@ -43,7 +43,7 @@ static char *is_otf_emoji(const char *pa - - return p + 5; - } -- path = p + 5; -+ path = p + 1; - } - - return NULL; diff --git a/x11/mlterm/patches/patch-configure b/x11/mlterm/patches/patch-configure index 88c6da128363..495add0bbe16 100644 --- a/x11/mlterm/patches/patch-configure +++ b/x11/mlterm/patches/patch-configure @@ -1,11 +1,11 @@ -$NetBSD: patch-configure,v 1.20 2020/11/16 11:58:09 tsutsui Exp $ +$NetBSD: patch-configure,v 1.21 2023/04/04 16:53:34 tsutsui Exp $ - setuid root / setgid utmp is handled by SPECIAL_PERMS in pkgsrc ---- configure.orig 2020-11-08 12:57:32.000000000 +0000 +--- configure.orig 2023-04-01 13:54:40.000000000 +0000 +++ configure -@@ -25581,16 +25581,16 @@ if test "$INSTALL_OPT" = ""; then - if test "$utmp_suid" = "yes" -a "$utmp_none_obj" = "" -a "$gui" != "quartz"; then +@@ -28244,16 +28246,16 @@ if test "$INSTALL_OPT" = ""; then + if test "$utmp_suid" = "yes" -a "$UTMP_NAME" != "none" -a "$gui" != "quartz"; then has_utmp=`grep utmp /etc/group 2>/dev/null` if test "$has_utmp" ; then - INSTALL_OPT="-m 2755 -g utmp" diff --git a/x11/mlterm/patches/patch-tool_mlconfig_Makefile.in b/x11/mlterm/patches/patch-tool_mlconfig_Makefile.in new file mode 100644 index 000000000000..fd0ddcb6f512 --- /dev/null +++ b/x11/mlterm/patches/patch-tool_mlconfig_Makefile.in @@ -0,0 +1,41 @@ +$NetBSD: patch-tool_mlconfig_Makefile.in,v 1.1 2023/04/04 16:53:34 tsutsui Exp $ + +- make mlconfig.po installed properly + https://github.com/arakiken/mlterm/pull/66 + +--- tool/mlconfig/Makefile.in.orig 2023-04-01 13:54:40.000000000 +0000 ++++ tool/mlconfig/Makefile.in +@@ -70,27 +70,27 @@ mlconfig: $(OBJ) + $(LIBTOOL_LINK) $(OBJ) $(CFLAGS) -o mlconfig $(LIBS) + # "cd po" must be enclosed by () because it may not return + # to the $(top_builddir)/tool/mlconfig at the next line. +- if test -d po/Makefile; then (cd po ; $(MAKE) update-gmo); fi +- # if test -d po/Makefile; then cd po ; $(MAKE) update-po; fi ++ if test -f po/Makefile; then (cd po ; $(MAKE) update-gmo); fi ++ # if test -f po/Makefile; then cd po ; $(MAKE) update-po; fi + + .c.o: + $(CC) $(DEFS) $(CFLAGS) -c $< + + install: $(LIBEXECDIR@WIN32TAG@) + $(LIBTOOL_INSTALL) -m 755 mlconfig $(LIBEXECDIR@WIN32TAG@) +- if test -d po/Makefile; then (cd po ; $(MAKE) install); fi ++ if test -f po/Makefile; then (cd po ; $(MAKE) install); fi + + uninstall: + rm -f $(LIBEXECDIR@WIN32TAG@)/mlconfig +- if test -d po/Makefile; then (cd po ; $(MAKE) uninstall); fi ++ if test -f po/Makefile; then (cd po ; $(MAKE) uninstall); fi + + $(LIBEXECDIR@WIN32TAG@): + mkdir -p $(LIBEXECDIR@WIN32TAG@) + + clean: + rm -rf $(OBJ) mlconfig mlconfig.exe *.core .libs +- if test -d po/Makefile; then (cd po ; $(MAKE) clean); fi ++ if test -f po/Makefile; then (cd po ; $(MAKE) clean); fi + + distclean: clean + rm -f Makefile +- if test -d po/Makefile; then (cd po ; $(MAKE) distclean); fi ++ if test -f po/Makefile; then (cd po ; $(MAKE) distclean); fi diff --git a/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c b/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c deleted file mode 100644 index b221a04f60b6..000000000000 --- a/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-uitoolkit_fb_ui__display__wscons.c,v 1.7 2022/12/12 17:42:04 tsutsui Exp $ - -Add support for 8- and 4-bpp planar fb found on NetBSD/amiga. - -Requires amidisplaycc(4) driver from NetBSD-current. With older -drivers, automatically falls back to monochrome mode. - -XXX -Only tested for 8-bpp mode. As 4-bpp mode requires ancient -analogue monitors. - -XXX -Logic to detect planar fb is not very elegant... - -This has been merged to upstream, and will be in the next release. - ---- uitoolkit/fb/ui_display_wscons.c.orig 2022-01-16 15:20:31.000000000 +0000 -+++ uitoolkit/fb/ui_display_wscons.c -@@ -380,8 +380,17 @@ static int open_display(u_int depth /* u - _display.height = _disp.height = vinfo.height; - _disp.depth = vinfo.depth; - --#ifdef WSDISPLAY_TYPE_LUNA -- if (wstype == WSDISPLAY_TYPE_LUNA) { -+#if defined(WSDISPLAY_TYPE_LUNA) && defined(WSDISPLAY_TYPE_AMIGACC) -+#define WSTYPE_PLANAR(wstype) \ -+ ((wstype) == WSDISPLAY_TYPE_LUNA || (wstype) == WSDISPLAY_TYPE_AMIGACC) -+#elif defined(WSDISPLAY_TYPE_LUNA) -+#define WSTYPE_PLANAR(wstype) ((wstype) == WSDISPLAY_TYPE_LUNA) -+#elif defined(WSDISPLAY_TYPE_AMIGACC) -+#define WSTYPE_PLANAR(wstype) ((wstype) == WSDISPLAY_TYPE_AMIGACC) -+#endif -+ -+#ifdef WSTYPE_PLANAR -+ if (WSTYPE_PLANAR(wstype)) { - /* always 8 or less bpp */ - - if (_disp.depth > 8) { -@@ -444,6 +453,19 @@ static int open_display(u_int depth /* u - } - } else - #endif -+#ifdef WSDISPLAY_TYPE_AMIGACC -+ if (wstype == WSDISPLAY_TYPE_AMIGACC && -+ (_disp.depth == 4 || _disp.depth == 8)) { -+ u_int len_per_plane, plane; -+ -+ len_per_plane = _display.line_length * _display.height; -+ _display.smem_len = fboffset + len_per_plane * _disp.depth; -+ -+ for (plane = 0; plane < _disp.depth; plane++) { -+ _display.plane_offset[plane] = len_per_plane * plane; -+ } -+ } else -+#endif - { - _display.smem_len = fboffset + _display.line_length * _display.height; - } diff --git a/x11/mlterm/patches/patch-uitoolkit_xlib_ui__imagelib.c b/x11/mlterm/patches/patch-uitoolkit_xlib_ui__imagelib.c deleted file mode 100644 index a45ce433e11b..000000000000 --- a/x11/mlterm/patches/patch-uitoolkit_xlib_ui__imagelib.c +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-uitoolkit_xlib_ui__imagelib.c,v 1.4 2022/07/07 00:08:29 rin Exp $ - -Fix color of sixel image on X server whose byte-order is opposite to client. - -This patch has been merged to upstream, and will be in the next release. - ---- uitoolkit/xlib/ui_imagelib.c.orig 2022-07-02 10:56:15.200011767 +0900 -+++ uitoolkit/xlib/ui_imagelib.c 2022-07-02 10:58:10.298442685 +0900 -@@ -580,6 +580,11 @@ static int load_sixel(ui_display_t *disp - image = XCreateImage(disp->display, disp->visual, disp->depth, ZPixmap, 0, data, w, h, - /* in case depth isn't multiple of 8 */ - bytes_per_pixel * 8, w * bytes_per_pixel); -+#ifdef WORDS_BIGENDIAN -+ image->byte_order = MSBFirst; -+#else -+ image->byte_order = LSBFirst; -+#endif - - *pixmap = XCreatePixmap(disp->display, ui_display_get_group_leader(disp), w, h, disp->depth); - -@@ -944,6 +949,11 @@ static XImage *pixbuf_to_ximage_truecolo - - return NULL; - } -+#ifdef WORDS_BIGENDIAN -+ image->byte_order = MSBFirst; -+#else -+ image->byte_order = LSBFirst; -+#endif - - /* set num of bytes per pixel of pixbuf */ - bytes_per_pixel = (gdk_pixbuf_get_has_alpha(pixbuf)) ? 4 : 3; -@@ -1617,6 +1627,11 @@ Pixmap ui_imagelib_get_transparent_backg - - return None; - } -+#ifdef WORDS_BIGENDIAN -+ image->byte_order = MSBFirst; -+#else -+ image->byte_order = LSBFirst; -+#endif - - vinfo_template.visualid = - XVisualIDFromVisual(DefaultVisual(win->disp->display, DefaultScreen(win->disp->display))); diff --git a/x11/mlterm/patches/patch-vtemu_vt__parser.c b/x11/mlterm/patches/patch-vtemu_vt__parser.c deleted file mode 100644 index 996d5087d356..000000000000 --- a/x11/mlterm/patches/patch-vtemu_vt__parser.c +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-vtemu_vt__parser.c,v 1.1 2022/07/24 08:56:54 rin Exp $ - -Fix TTIMEST without Ps argument; IM should be turned off in this case. - -Cherry-picked from upstream commit 2c3d00d: -https://github.com/arakiken/mlterm/commit/2c3d00d530930c262322d4b1d431352cf68e2245 - ---- vtemu/vt_parser.c.orig -+++ vtemu/vt_parser.c -@@ -4900,8 +4900,10 @@ inline static int parse_vt100_escape_sequence( - - vt_parser->im_is_active = im_is_active(vt_parser); - } else if (*str_p == 't') { -- /* ps[0] = 0 (Close), ps[0] = 1 (Open) */ -+ /* ps[0] = 0, -1 (Close), ps[0] = 1 (Open) */ - -+ if (ps[0] == -1) -+ ps[0] = 0; - if (ps[0] != im_is_active(vt_parser)) { - switch_im_mode(vt_parser); - }