CVS commit: pkgsrc/x11/mlterm

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Tue Apr  4 16:53:34 UTC 2023

Modified Files:
        pkgsrc/x11/mlterm: Makefile distinfo
        pkgsrc/x11/mlterm/patches: patch-configure
Added Files:
        pkgsrc/x11/mlterm/patches: patch-tool_mlconfig_Makefile.in
Removed Files:
        pkgsrc/x11/mlterm/patches: patch-common_c__imagelib.c
            patch-uitoolkit_fb_ui__display__wscons.c
            patch-uitoolkit_xlib_ui__imagelib.c patch-vtemu_vt__parser.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 pkgsrc/x11/mlterm/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/x11/mlterm/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/mlterm/patches/patch-common_c__imagelib.c
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/mlterm/patches/patch-configure
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/mlterm/patches/patch-tool_mlconfig_Makefile.in
cvs rdiff -u -r1.7 -r0 \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_xlib_ui__imagelib.c
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/mlterm/patches/patch-vtemu_vt__parser.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/mlterm/Makefile
diff -u pkgsrc/x11/mlterm/Makefile:1.180 pkgsrc/x11/mlterm/Makefile:1.181
--- pkgsrc/x11/mlterm/Makefile:1.180    Sun Jan 29 21:18:17 2023
+++ pkgsrc/x11/mlterm/Makefile  Tue Apr  4 16:53:34 2023
@@ -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}

Index: pkgsrc/x11/mlterm/distinfo
diff -u pkgsrc/x11/mlterm/distinfo:1.97 pkgsrc/x11/mlterm/distinfo:1.98
--- pkgsrc/x11/mlterm/distinfo:1.97     Mon Dec 12 17:51:22 2022
+++ pkgsrc/x11/mlterm/distinfo  Tue Apr  4 16:53:34 2023
@@ -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

Index: pkgsrc/x11/mlterm/patches/patch-configure
diff -u pkgsrc/x11/mlterm/patches/patch-configure:1.20 pkgsrc/x11/mlterm/patches/patch-configure:1.21
--- pkgsrc/x11/mlterm/patches/patch-configure:1.20      Mon Nov 16 11:58:09 2020
+++ pkgsrc/x11/mlterm/patches/patch-configure   Tue Apr  4 16:53:34 2023
@@ -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"

Added files:

Index: pkgsrc/x11/mlterm/patches/patch-tool_mlconfig_Makefile.in
diff -u /dev/null pkgsrc/x11/mlterm/patches/patch-tool_mlconfig_Makefile.in:1.1
--- /dev/null   Tue Apr  4 16:53:34 2023
+++ pkgsrc/x11/mlterm/patches/patch-tool_mlconfig_Makefile.in   Tue Apr  4 16:53:34 2023
@@ -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