[pkgsrc/trunk]: pkgsrc/x11/mlterm mlterm: update to 3.9.2.

[tsutsui <tsutsui%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/905d967de820
branches:  trunk
changeset: 372012:905d967de820
user:      tsutsui <tsutsui%pkgsrc.org@localhost>
date:      Mon Jan 17 14:44:46 2022 +0000

description:
mlterm: update to 3.9.2.

pkgsrc changes:
* switch MASTER_SITES to GitHub
* use GTK3 instead of GTK2
* remove local patches integreated into upstream (#5)

Upstream changes (noted in doc/en/ReleaseNote):

ver 3.9.2
* Support Fcitx5.
* Support GTK4 for mlconfig. (./configure --with-gtk=4.0)
* Support CSI > Ps q (XTVERSION). (Response: DCS>|mlterm(3.9.2)ST)
* Add "MOSH_UDP_PORT" environmental variable to specify UDP port or port-range
  to communicate with a mosh server.
* Add INSERT_CLIPBOARD shortcut key.
  (https://github.com/arakiken/mlterm/issues/19)
* Add --fk / format_other_keys option (equivalent to "formatOtherKeys" of xterm), and
  change the default format of the escape sequence with modifyOtherKeys from
  CSI Ps; Ps u to CSI 27; Ps; Ps ~.
* Add --with-iconv, --disable-daemon, --disable-split and --disable-zmodem
  options to ./configure script.
* Add vte 0.66 API symbols to libvte compatible library.
* Show server list dialog at startup on Android.
* It is deprecated to use "mlterm" as the value of termtype / -y option.
* 'termcap' config file stops to accept multiple terminal types concated by '|'
  (e.g. xterm|xterm-256) as key.
* Arabic ligatures (U+644-U+622, U+644-U+622, U+644-U+625, U+644-U+627) occupy
  two logical columns instead of one even if --dyncomb option isn't specified.
* KBD_INPUT_NUM and MOUSE_INPUT_NUM environmental variables (for mlterm-fb)
  accept multiple device numbers by "<num>,<num>".
* Show "Config: key=value" only if shortcut keys whose format is
  "proto:(echo)key=value" is pressed.
* Merge patches:
  https://github.com/arakiken/mlterm/pull/5.
  https://github.com/arakiken/mlterm/pull/9.
  https://github.com/arakiken/mlterm/pull/12.
  https://github.com/arakiken/mlterm/pull/22.
* Bug fixes:
  Fix https://github.com/arakiken/mlterm/issues/15.
  Fix https://github.com/arakiken/mlterm/issues/18.
  Fix https://github.com/arakiken/mlterm/issues/24.
  Fix https://github.com/arakiken/mlterm/issues/28.
  Fix failure of restarting mlterm on Android. (Enbugged at 3.9.1)
  Fix segfault if mlterm screen with -t option goes outside of the display.
  Fix emoji glyphs becoming too large with cairo.
  Fix corrupt value of "word_separator" option which mlconfig outputs.
  Fix incompatibility with xterm in pressing Shift + a-z keys etc if modifyOtherKeys is 1.
  (https://github.com/arakiken/mlterm/issues/21)
  Fix segfault in opening a new roxterm tab with libvte compatible library on wayland.

diffstat:

 x11/mlterm/Makefile                                          |  12 +-
 x11/mlterm/distinfo                                          |   9 +-
 x11/mlterm/patches/patch-uitoolkit_fb_ui__display__x68kgrf.c |  41 ------------
 3 files changed, 10 insertions(+), 52 deletions(-)

diffs (90 lines):

diff -r ffe24e50a4c1 -r 905d967de820 x11/mlterm/Makefile
--- a/x11/mlterm/Makefile       Mon Jan 17 13:48:39 2022 +0000
+++ b/x11/mlterm/Makefile       Mon Jan 17 14:44:46 2022 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.166 2021/12/08 16:07:10 adam Exp $
+# $NetBSD: Makefile,v 1.167 2022/01/17 14:44:46 tsutsui Exp $
 
-DISTNAME=      mlterm-3.9.1
-#PKGREVISION=  0
-PKGREVISION=   2
+DISTNAME=      mlterm-3.9.2
 CATEGORIES=    x11
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mlterm/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=arakiken/}
+GITHUB_PROJECT= ${DISTNAME:S/-${PKGVERSION_NOREV}//}
+GITHUB_TAG=    rel-${PKGVERSION_NOREV:S/./_/g}
 
 MAINTAINER=    tsutsui%NetBSD.org@localhost
 HOMEPAGE=      http://mlterm.sourceforge.net/
@@ -82,7 +82,7 @@
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff -r ffe24e50a4c1 -r 905d967de820 x11/mlterm/distinfo
--- a/x11/mlterm/distinfo       Mon Jan 17 13:48:39 2022 +0000
+++ b/x11/mlterm/distinfo       Mon Jan 17 14:44:46 2022 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.88 2021/10/26 11:34:15 nia Exp $
+$NetBSD: distinfo,v 1.89 2022/01/17 14:44:46 tsutsui Exp $
 
-BLAKE2s (mlterm-3.9.1.tar.gz) = 8e813c28a0e2a11f1b6fa35eba04796c34063f36b927840e94d11369bff02b72
-SHA512 (mlterm-3.9.1.tar.gz) = 1337b884971b2c4c2c3140388f07927101a947b0268f547611f4f4ece49c8d0954c068789ee7c92c82db114021c77c08416db30233149c8964e827ab901cc870
-Size (mlterm-3.9.1.tar.gz) = 4175186 bytes
+BLAKE2s (mlterm-3.9.2.tar.gz) = 81a6206b6458b6348fdec1b82d44a9d751a7849a525728c8b51ab8c975a5874b
+SHA512 (mlterm-3.9.2.tar.gz) = baa4d3b3bdd3ee61f1355b007a37402b52613de6e656a2aefecd07bf3824ffe420d5bcc744ad5ca9d16be1acf409f132ad74eb0c646708e1eb9427ecbd341b29
+Size (mlterm-3.9.2.tar.gz) = 4259709 bytes
 SHA1 (patch-configure) = 266b3e8383c425c7ef8cd180f07e1199890521ba
 SHA1 (patch-etc_font-fb) = 52c18f512c67ff530c0c326394fdf43956d71cb0
-SHA1 (patch-uitoolkit_fb_ui__display__x68kgrf.c) = f532c5ed1011c7752437786217c1cfccf419c926
 SHA1 (patch-vtemu_Makefile.in) = 172f12f73408489f782d63c8b0b7915af441d368
diff -r ffe24e50a4c1 -r 905d967de820 x11/mlterm/patches/patch-uitoolkit_fb_ui__display__x68kgrf.c
--- a/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__x68kgrf.c      Mon Jan 17 13:48:39 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-$NetBSD: patch-uitoolkit_fb_ui__display__x68kgrf.c,v 1.4 2020/11/16 11:58:09 tsutsui Exp $
-
-- Add support of X68030 CRT Mode 19 (640x480x4) for mlterm-x68kgrf.
- https://github.com/arakiken/mlterm/commit/0d3a3b0bdc36ee2d702167fd234dcfc3c500ac09
-
---- uitoolkit/fb/ui_display_x68kgrf.c.orig     2020-11-08 12:57:31.000000000 +0000
-+++ uitoolkit/fb/ui_display_x68kgrf.c
-@@ -153,6 +153,8 @@ static int open_display(u_int depth) {
-                                   {4, 0x24e4 /* Graphic vram is prior to text one. */, 0x0010}};
-   fb_reg_conf_t conf_1024_768_4 = {{169, 14, 28, 156, 439, 5, 40, 424, 27, 1050},
-                                    {4, 0x24e4 /* Graphic vram is prior to text one. */, 0x0010}};
-+  fb_reg_conf_t conf_640_480_4 = {{99, 11, 13, 93, 524, 1, 33, 513, 27, 1047},
-+                                   {4, 0x24e4 /* Graphic vram is prior to text one. */, 0x0010}};
-   struct rgb_info rgb_info_15bpp = {3, 3, 3, 6, 11, 1};
-   struct termios tm;
- 
-@@ -214,7 +216,11 @@ static int open_display(u_int depth) {
-                   orig_reg.crtc.r08, orig_reg.crtc.r20, orig_reg.videoc.r0, orig_reg.videoc.r1,
-                   orig_reg.videoc.r2);
- #else
--  orig_reg = conf_768_512_4;
-+  if (vinfo.gd_dwidth == 640) {
-+    orig_reg = conf_640_480_4;
-+  } else {
-+    orig_reg = conf_768_512_4;
-+  }
-   orig_reg.videoc.r2 = 0x20;
- #endif
- 
-@@ -240,6 +246,11 @@ static int open_display(u_int depth) {
- 
-         _display.width = _disp.width = 1024;
-         _display.height = _disp.height = 768;
-+      } else if (fb_width == 640 && fb_height == 480) {
-+        conf = &conf_640_480_4;
-+
-+        _display.width = _disp.width = 640;
-+        _display.height = _disp.height = 480;
-       } else {
-         conf = &conf_768_512_4;
-