From nobody Sat Jul 1 14:46:28 2023 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 4QtZkr75dsz4k0C4; Sat, 1 Jul 2023 14:46:28 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QtZkr5Frhz3skT; Sat, 1 Jul 2023 14:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688222788; 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=T9M1lumKvJeRKVA32akRWNZE9m3+WQ8daOs/PUuF5cA=; b=XehFxRdAstVjrsfsIinUpGj0QvbgEkEzS8l6g4qbZomh7WbR/0z6OxE1NvNewIu3eoKf5K Plg7ZCLXCgyTSWdEpAL4zb/yEAibcZq/NgxZfeq+VpZXv2Ca+S2FafO6A6vLNRpUlDkE2u EGudFLrOuf6laAmHJO4Z8R6ObLYWU/+L6VEHPwQlMByGWKmz8b7Dol/CKQhhLRFHAzREjs SBPxyJf/WlKEGL7onXhFz02qOP4p0asHM9ngJvkL5pFsn6++XY6uF8Q7RN0CrB7ydNuG+R jqKP5IM1H9UAhG4jvo5sv3quJo/oTVSZmiD7rdyl4H6LVOfxjcCPEyjxgGRlqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688222788; 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=T9M1lumKvJeRKVA32akRWNZE9m3+WQ8daOs/PUuF5cA=; b=wlZztQOP2g6bI6vlpHIHzccUqfZrMsu2oqDvOWKXUEn/xlyWpCWSHsj62TxC0awYvgAf5E GeqhMFZXg0+fj2PMu5/ZwDMyqU0aqBu0InsG/Gyd6EvtMbIjkWMM7HLjvVaahE7XdhCORW WZKGWU+Qw8m7HL8XrZZaUV2xA8z6JC4/PO01tfP3ouZaQhzmGeCG7rdTzb7Zz2u2s+zsyR BB4/tGKoMXsmCICQPBm6ck/uW//YyvCbfjgtu4ro/raOaMvP6DK+dJgn3/JSQBJQ2Bb3al RhuH9PhyEYT7jQ53EhKB9CdL+0siqeQ3xTnCZZprXKJa6+slXFP4YS9kvJlLpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688222788; a=rsa-sha256; cv=none; b=AQ55jRYW8hT8s+UJImFo0Li48lihPqVMhcGJIFlM3+6MgdhHCBoJI8RHUIgMu9MpnBkLVW fWAGs9bhLWGOH7rb1Ffc+R0MmfozxqFeThdINJVrhYeDddO3WiBhOO0dxjreFL428mqhW8 v6tWHyqkY2xM/89h9XDYb/nsPCAzmG/XiJzDr48ILm1dUozyeM1rNMrvdjGcT1v6QuLdAS U1SVlfszVGC6Vwar4lwUF57PvV0vMOuYmJRxMJY1KdIhuU+dxe+/akfsJpLJntd5+puRSg 7TDOpJtcaFUr1eoVrJNdg4RWv2OOaiR+3PURbqhTWtvUhsE9vD+4wWRFCjqbTg== 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 4QtZkr4MdGzVJD; Sat, 1 Jul 2023 14:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 361EkSta004780; Sat, 1 Jul 2023 14:46:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 361EkS9b004779; Sat, 1 Jul 2023 14:46:28 GMT (envelope-from git) Date: Sat, 1 Jul 2023 14:46:28 GMT Message-Id: <202307011446.361EkS9b004779@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: 1a1b4f35d7ae - main - x11/mlterm: Fix build on current 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 1a1b4f35d7ae4f90a462298be95102110b121b81 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a1b4f35d7ae4f90a462298be95102110b121b81 commit 1a1b4f35d7ae4f90a462298be95102110b121b81 Author: MANTANI Nobutaka AuthorDate: 2023-07-01 14:45:20 +0000 Commit: MANTANI Nobutaka CommitDate: 2023-07-01 14:45:53 +0000 x11/mlterm: Fix build on current --- x11/mlterm/files/patch-gtk_vte.c | 46 ++++++++++++++++++++++ .../patch-uitoolkit_libtype_ui__window__cairo.c | 11 ++++++ 2 files changed, 57 insertions(+) diff --git a/x11/mlterm/files/patch-gtk_vte.c b/x11/mlterm/files/patch-gtk_vte.c new file mode 100644 index 000000000000..1174801a8246 --- /dev/null +++ b/x11/mlterm/files/patch-gtk_vte.c @@ -0,0 +1,46 @@ +--- 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-uitoolkit_libtype_ui__window__cairo.c b/x11/mlterm/files/patch-uitoolkit_libtype_ui__window__cairo.c new file mode 100644 index 000000000000..cf5dc4db47d7 --- /dev/null +++ b/x11/mlterm/files/patch-uitoolkit_libtype_ui__window__cairo.c @@ -0,0 +1,11 @@ +--- 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,