From nobody Sat Apr 5 15:45:46 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZVKZ31BYvz5sN7f; Sat, 05 Apr 2025 15:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZVKZ30TMmz4KJJ; Sat, 05 Apr 2025 15:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743867947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2ISkfSVZ3iwmZGrpJV3yfTERPkHHFyfKy6NELNn8xA=; b=oN2+mVP7v++eo2ukTIBOF0q+KjcuhDmrHhVA99k5i7Sn66K+12tPVdD/BCOlStP1DnMWa/ L1jvMlVwOH/Y2NwaxAzZL/Wta0Aw9GyjFxV2Zy0vVVbz44IXbrDk7yJXf5Ep8gLC0Sn3FU ny9xl2uAKCFw5XxxvDf9FOGXZ+cpqI2yAYQwNzNmLap9bx/6IIHHDKZK8GPpid/f02MQMD 61Cfz0ojj0kBqQnkGlYZ4kc3x32ujOYJ0IpXz/9tusHB5HGcNfmflQmyjmegEDy/xIPuFY T9Oe0fZofdcj9ixVzmk6Zfs/7M3shy2sZgqB33LIKf0Ms0wrDtlHYtb8z3PazQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743867947; a=rsa-sha256; cv=none; b=J7kZlnMXeou8ohKZTIfx/eQXtc5O1jnXEZNHmwuL7dS/Op/xbwWXPcN6gmykBd7IV4oyCf CbS2mYypjm65lNfGFBSLh8ZqOBKR4sVB6HUZZ0LZzsaqRim81FVXOmZf+ixetLmZDHW0CI e8PsDob5A52Ci97oeAwqXW6HWno5ytIlMZxilmYd+qhf6whsAvzFRXAcFEzvmSKUB4LDx2 3pvxs+Rf4ICJaaNUPZJy8HnHFtrsnvHk/evpqQQsXMeyAOZQ8w6hFLpYcfcZO6OzEc0HTP WDkswdrWNkD8qwZuwmP784z/97FrM3lHMfTptoEqX8dPzhwz3yyXcH4012WFwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743867947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2ISkfSVZ3iwmZGrpJV3yfTERPkHHFyfKy6NELNn8xA=; b=DL380UwZbVvgjnB/LTjI00PFaAWwAyqzx7QoX4y19Jice91qI50u3ImQbrp3yymBi7OHMR Z8BzYeYdtJzVwke4tQwiybXQcV1f1b4J4TquNcVq/FQhdpVUQmMfQZC9yOqA+cLQXAiy4t v8WnzkRzEUXkmjbPvD5VxFKGa1P17seaD3ffD6y8GbSVMZswM/ZGC780iBj+eMVONdPP8T alGgGJu00jZianqkLW+vd4YDpo8fKOF0uIwNNH7Zg/sfmYwZQRchaGwUiWJkcbGAfBAlML //hvQcSznPxzSBZ4nr5+tSV6IWLnzoBixRsOClYBUkR5QhpUksr37NJPhmNnpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZVKZ2756Vz6B4; Sat, 05 Apr 2025 15:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 535FjkpY092485; Sat, 5 Apr 2025 15:45:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 535FjkEX092482; Sat, 5 Apr 2025 15:45:46 GMT (envelope-from git) Date: Sat, 5 Apr 2025 15:45:46 GMT Message-Id: <202504051545.535FjkEX092482@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: MANTANI Nobutaka Subject: git: ef324dcb1cb4 - main - x11/mlterm: Update to 3.9.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nobutaka X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef324dcb1cb448ed92efc610afc22930f563d740 Auto-Submitted: auto-generated The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef324dcb1cb448ed92efc610afc22930f563d740 commit ef324dcb1cb448ed92efc610afc22930f563d740 Author: MANTANI Nobutaka AuthorDate: 2025-04-05 15:43:18 +0000 Commit: MANTANI Nobutaka CommitDate: 2025-04-05 15:44:46 +0000 x11/mlterm: Update to 3.9.4 --- x11/mlterm/Makefile | 3 +- x11/mlterm/distinfo | 6 +-- x11/mlterm/files/patch-gtk_vte.c | 46 ---------------------- x11/mlterm/files/patch-tool_mlconfig_Makefile.in | 26 ------------ .../files/patch-tool_w3mmlconfig_mlconfig.cgi.in | 10 ----- .../patch-uitoolkit_libtype_ui__window__cairo.c | 11 ------ 6 files changed, 4 insertions(+), 98 deletions(-) diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index 55856ac7c2ef..e3f82d44f984 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,6 +1,5 @@ PORTNAME= mlterm -PORTVERSION= 3.9.3 -PORTREVISION= 2 +PORTVERSION= 3.9.4 CATEGORIES= x11 MAINTAINER= nobutaka@FreeBSD.org diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo index 3384d11e7d50..73439ed8440e 100644 --- a/x11/mlterm/distinfo +++ b/x11/mlterm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680931718 -SHA256 (arakiken-mlterm-3.9.3_GH0.tar.gz) = b5b76721391de134bd64afb7de6b4256805cf2fc883a2bf2e5d29602ac1b50d9 -SIZE (arakiken-mlterm-3.9.3_GH0.tar.gz) = 4272090 +TIMESTAMP = 1743312749 +SHA256 (arakiken-mlterm-3.9.4_GH0.tar.gz) = 171de4c4f3443bc1211cc51df5caa0e082ffcdd33ab3ce261bc0a4cfe85d9b5e +SIZE (arakiken-mlterm-3.9.4_GH0.tar.gz) = 4227568 diff --git a/x11/mlterm/files/patch-gtk_vte.c b/x11/mlterm/files/patch-gtk_vte.c deleted file mode 100644 index 1174801a8246..000000000000 --- a/x11/mlterm/files/patch-gtk_vte.c +++ /dev/null @@ -1,46 +0,0 @@ ---- gtk/vte.c.orig 2023-04-01 13:54:40 UTC -+++ gtk/vte.c -@@ -1327,8 +1327,8 @@ static void init_screen(VteTerminal *terminal, ui_font - - PVT(terminal)->screen->xterm_listener.set_window_name = set_window_name; - PVT(terminal)->screen->xterm_listener.set_icon_name = set_icon_name; -- PVT(terminal)->xterm_resize = PVT(terminal)->screen->xterm_listener.resize; -- PVT(terminal)->screen->xterm_listener.resize = xterm_resize; -+ PVT(terminal)->xterm_resize = (void (*)(void *, u_int, u_int, int))PVT(terminal)->screen->xterm_listener.resize; -+ PVT(terminal)->screen->xterm_listener.resize = (void (*)(void *, u_int, u_int, int, int))xterm_resize; - - orig_select_in_window = PVT(terminal)->screen->sel_listener.select_in_window; - PVT(terminal)->screen->sel_listener.select_in_window = select_in_window; -@@ -3369,19 +3369,19 @@ void vte_terminal_set_color_dim_rgba(VteTerminal *term - - #if GTK_CHECK_VERSION(2, 99, 0) - void vte_terminal_set_color_bold_rgba(VteTerminal *terminal, const GdkRGBA *bold) { -- set_color_bold(terminal, bold, gdk_rgba_to_string2); -+ set_color_bold(terminal, bold, (gchar *(*)(const void *))gdk_rgba_to_string2); - } - - void vte_terminal_set_color_foreground_rgba(VteTerminal *terminal, const GdkRGBA *foreground) { -- set_color_foreground(terminal, foreground, gdk_rgba_to_string2); -+ set_color_foreground(terminal, foreground, (gchar *(*)(const void *))gdk_rgba_to_string2); - } - - void vte_terminal_set_color_background_rgba(VteTerminal *terminal, const GdkRGBA *background) { -- set_color_background(terminal, background, gdk_rgba_to_string2); -+ set_color_background(terminal, background, (gchar *(*)(const void *))gdk_rgba_to_string2); - } - - void vte_terminal_set_color_cursor_rgba(VteTerminal *terminal, const GdkRGBA *cursor_background) { -- set_color_cursor(terminal, cursor_background, gdk_rgba_to_string2); -+ set_color_cursor(terminal, cursor_background, (gchar *(*)(const void *))gdk_rgba_to_string2); - } - - #if VTE_CHECK_VERSION(0, 44, 0) -@@ -3418,7 +3418,7 @@ void vte_terminal_set_color_highlight_foreground_rgba( - void vte_terminal_set_colors_rgba(VteTerminal *terminal, const GdkRGBA *foreground, - const GdkRGBA *background, const GdkRGBA *palette, - gsize palette_size) { -- if (set_colors(terminal, palette, palette_size, sizeof(GdkRGBA), gdk_rgba_to_string2) && -+ if (set_colors(terminal, palette, palette_size, sizeof(GdkRGBA), (gchar *(*)(const char *))gdk_rgba_to_string2) && - palette_size > 0) { - if (foreground == NULL) { - foreground = &palette[7]; diff --git a/x11/mlterm/files/patch-tool_mlconfig_Makefile.in b/x11/mlterm/files/patch-tool_mlconfig_Makefile.in deleted file mode 100644 index 4579a8487359..000000000000 --- a/x11/mlterm/files/patch-tool_mlconfig_Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ ---- tool/mlconfig/Makefile.in.orig 2023-04-01 13:54:40 UTC -+++ tool/mlconfig/Makefile.in -@@ -70,19 +70,19 @@ 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@) diff --git a/x11/mlterm/files/patch-tool_w3mmlconfig_mlconfig.cgi.in b/x11/mlterm/files/patch-tool_w3mmlconfig_mlconfig.cgi.in deleted file mode 100644 index 78d8e410bc81..000000000000 --- a/x11/mlterm/files/patch-tool_w3mmlconfig_mlconfig.cgi.in +++ /dev/null @@ -1,10 +0,0 @@ ---- tool/w3mmlconfig/mlconfig.cgi.in.orig 2017-01-07 22:24:38 UTC -+++ tool/w3mmlconfig/mlconfig.cgi.in -@@ -2,6 +2,7 @@ - - $DEBUG = 1; - -+use lib '@CGI_BIN@'; - require 'mlconfig-data.pl'; - - open(CHALLENGE, "$ENV{HOME}/.mlterm/challenge"); diff --git a/x11/mlterm/files/patch-uitoolkit_libtype_ui__window__cairo.c b/x11/mlterm/files/patch-uitoolkit_libtype_ui__window__cairo.c deleted file mode 100644 index cf5dc4db47d7..000000000000 --- a/x11/mlterm/files/patch-uitoolkit_libtype_ui__window__cairo.c +++ /dev/null @@ -1,11 +0,0 @@ ---- uitoolkit/libtype/ui_window_cairo.c.orig 2023-07-01 12:37:30 UTC -+++ uitoolkit/libtype/ui_window_cairo.c -@@ -54,7 +54,7 @@ static void adjust_glyphs(ui_font_t *font, cairo_glyph - - static void flush_glyphs(cairo_t *cr) { - if (num_glyph_buf > 0) { -- u_long pixel = cairo_get_user_data(cr, (cairo_user_data_key_t*)2); -+ u_long pixel = (u_long)cairo_get_user_data(cr, (cairo_user_data_key_t*)2); - - cairo_set_scaled_font(cr, cairo_get_user_data(cr, (cairo_user_data_key_t*)1)); - cairo_set_source_rgba(cr,