diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index 55856ac7c2ef..e3f82d44f984 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,95 +1,94 @@ PORTNAME= mlterm -PORTVERSION= 3.9.3 -PORTREVISION= 2 +PORTVERSION= 3.9.4 CATEGORIES= x11 MAINTAINER= nobutaka@FreeBSD.org COMMENT= Multilingual X11 terminal emulator WWW= https://mlterm.sourceforge.net/ LICENSE= BSD3CLAUSE LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz USES= cpe desktop-file-utils gettext gnome libtool perl5 pkgconfig xorg USE_GITHUB= yes USE_GNOME= cairo gdkpixbuf gtk30 vte3 USE_LDCONFIG= yes USE_PERL5= build USE_XORG= sm x11 xft GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --with-gui=x11 --with-imagelib=gdk-pixbuf2 --enable-utmp \ --enable-optimize-redrawing --disable-iiimf --with-gtk=3.0 \ --disable-ssh2 EXTERNAL_TOOLS= mlclient,mlconfig,mlterm-menu,mlcc,w3mmlconfig,mlimgloader CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl -Wl,--undefined-version MAKE_JOBS_UNSAFE= yes GH_ACCOUNT= arakiken OPTIONS_DEFINE= CAIRO DOCS FCITX FRIBIDI IBUS M17NLIB REGIS SCIM SIXEL UIM OPTIONS_SUB= yes CAIRO_DESC= Use Cairo for type engine FCITX_DESC= Fcitx support FRIBIDI_DESC= Use Fribidi for BiDi rendering IBUS_DESC= IBUS support M17NLIB_DESC= m17n library support REGIS_DESC= ReGIS graphics support SCIM_DESC= SCIM support SIXEL_DESC= Sixel graphics support UIM_DESC= uim support FCITX_CONFIGURE_ENABLE= fcitx FCITX_LIB_DEPENDS= libfcitx-gclient.so:chinese/fcitx FRIBIDI_CONFIGURE_ENABLE= fribidi FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi UIM_CONFIGURE_ENABLE= uim UIM_LIB_DEPENDS= libuim.so:textproc/uim M17NLIB_CONFIGURE_ENABLE= m17nlib M17NLIB_LIB_DEPENDS= libm17n.so:devel/m17n-lib SCIM_CONFIGURE_ENABLE= scim SCIM_LIB_DEPENDS= libscim-1.0.so:textproc/scim IBUS_CONFIGURE_ENABLE= ibus IBUS_LIB_DEPENDS= libibus-1.0.so:textproc/ibus CAIRO_LIB_DEPENDS= libcairo.so:graphics/cairo CAIRO_CONFIGURE_ON= --with-type-engines="xcore,xft,cairo" CAIRO_CONFIGURE_OFF= --with-type-engines="xcore,xft" SIXEL_CONFIGURE_ENABLE= sixel REGIS_USES= sdl REGIS_USE= SDL=ttf .include .if ${PORT_OPTIONS:MREGIS} EXTERNAL_TOOLS+=,registobmp .endif CONFIGURE_ARGS+=--with-tools="${EXTERNAL_TOOLS}" post-configure: @${REINPLACE_CMD} -e "s,@CGI_BIN@,${PREFIX}/libexec/w3mmlconfig," \ -e "s,@PERL @,${PERL}," \ ${WRKSRC}/tool/w3mmlconfig/mlconfig.cgi post-install: (cd ${WRKSRC}/tool/w3mmlconfig && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/ja/README.ja ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${FILESDIR}/mlterm.desktop ${STAGEDIR}${DESKTOPDIR} .include 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,