Skip to content

Commit

Permalink
mlterm: update to 3.9.3.
Browse files Browse the repository at this point in the history
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.
  (arakiken/mlterm#64)
* Set "COLORTERM=truecolor" environmental variable.
  (arakiken/mlterm#36)
* Update unicode property table (generated from UnicodeData.txt and
  EastAsianWidth.txt) to version 15.0.0.
* Support mosh-1.4.0.
* Merge patches:
  arakiken/mlterm#45.
  arakiken/mlterm#46.
  arakiken/mlterm#48.
  arakiken/mlterm#49.
  arakiken/mlterm#55. (Add --role / wm_role option)
  arakiken/mlterm#57.
  arakiken/mlterm#61.
  arakiken/mlterm#62.
  arakiken/mlterm#63.
* Bug fixes:
  Fix arakiken/mlterm#34.
  Fix arakiken/mlterm#35.
  Fix arakiken/mlterm#39.
  Fix arakiken/mlterm#44.
  Fix arakiken/mlterm#50.
  Fix arakiken/mlterm#51.
  Fix arakiken/mlterm#53.
  Fix https://twitter.com/isaki68k/status/1555895011991883783.
  Fix segfault in starting mlterm with --dyncomb and --otl.
  • Loading branch information
tsutsui committed Apr 4, 2023
1 parent bd56345 commit 77f07b2
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 157 deletions.
6 changes: 2 additions & 4 deletions x11/mlterm/Makefile
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
15 changes: 6 additions & 9 deletions x11/mlterm/distinfo
Original file line number Diff line number Diff line change
@@ -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
17 changes: 0 additions & 17 deletions x11/mlterm/patches/patch-common_c__imagelib.c

This file was deleted.

8 changes: 4 additions & 4 deletions x11/mlterm/patches/patch-configure
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
41 changes: 41 additions & 0 deletions x11/mlterm/patches/patch-tool_mlconfig_Makefile.in
Original file line number Diff line number Diff line change
@@ -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
58 changes: 0 additions & 58 deletions x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c

This file was deleted.

44 changes: 0 additions & 44 deletions x11/mlterm/patches/patch-uitoolkit_xlib_ui__imagelib.c

This file was deleted.

21 changes: 0 additions & 21 deletions x11/mlterm/patches/patch-vtemu_vt__parser.c

This file was deleted.

0 comments on commit 77f07b2

Please sign in to comment.