Date: Sat, 8 Apr 2023 12:31:16 GMT From: MANTANI Nobutaka <nobutaka@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3fdd24d3194a - main - x11/mlterm: Update to 3.9.3 Message-ID: <202304081231.338CVGGR004466@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=3fdd24d3194ace5de3a134c9b97f6647dbed1a98 commit 3fdd24d3194ace5de3a134c9b97f6647dbed1a98 Author: MANTANI Nobutaka <nobutaka@FreeBSD.org> AuthorDate: 2023-04-08 12:30:20 +0000 Commit: MANTANI Nobutaka <nobutaka@FreeBSD.org> CommitDate: 2023-04-08 12:30:20 +0000 x11/mlterm: Update to 3.9.3 --- x11/mlterm/Makefile | 19 ++++++++-------- x11/mlterm/distinfo | 6 ++--- x11/mlterm/files/patch-configure | 15 +++---------- x11/mlterm/files/patch-gtk_Makefile.in | 12 ++++++---- x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c | 4 ++-- x11/mlterm/files/patch-tool_mlconfig_Makefile.in | 26 ++++++++++++++++++++++ x11/mlterm/pkg-plist | 4 ++-- 7 files changed, 53 insertions(+), 33 deletions(-) diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index 34d9d5be654a..bc263f229b5b 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,6 +1,5 @@ PORTNAME= mlterm -PORTVERSION= 3.9.2 -PORTREVISION= 2 +PORTVERSION= 3.9.3 CATEGORIES= x11 MAINTAINER= nobutaka@FreeBSD.org @@ -15,13 +14,13 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ USES= cpe desktop-file-utils gettext gnome libtool perl5 pkgconfig xorg USE_GITHUB= yes -USE_GNOME= cairo gdkpixbuf2 gtk20 vte +USE_GNOME= cairo gdkpixbuf2 gtk30 vte3 USE_LDCONFIG= yes USE_PERL5= build USE_XORG= sm x11 xft GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gui=x11 --with-imagelib=gdk-pixbuf2 --enable-utmp \ - --enable-optimize-redrawing --disable-iiimf --with-gtk=2.0 \ + --enable-optimize-redrawing --disable-iiimf --with-gtk=3.0 \ --disable-ssh2 EXTERNAL_TOOLS= mlclient,mlconfig,mlterm-menu,mlcc,w3mmlconfig,mlimgloader CPPFLAGS+= -I${LOCALBASE}/include @@ -32,15 +31,15 @@ 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 (experimental) -FCITX_DESC= Fcitx support (experimental) +CAIRO_DESC= Use Cairo for type engine +FCITX_DESC= Fcitx support FRIBIDI_DESC= Use Fribidi for BiDi rendering -IBUS_DESC= IBUS support (experimental) -M17NLIB_DESC= m17n library support (experimental) +IBUS_DESC= IBUS support +M17NLIB_DESC= m17n library support REGIS_DESC= ReGIS graphics support -SCIM_DESC= SCIM support (experimental) +SCIM_DESC= SCIM support SIXEL_DESC= Sixel graphics support -UIM_DESC= uim support (experimental) +UIM_DESC= uim support FCITX_CONFIGURE_ENABLE= fcitx FCITX_LIB_DEPENDS= libfcitx-gclient.so:chinese/fcitx diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo index 9269e6fa50b0..3384d11e7d50 100644 --- a/x11/mlterm/distinfo +++ b/x11/mlterm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642853775 -SHA256 (arakiken-mlterm-3.9.2_GH0.tar.gz) = b940007f02ce1ca884208595c65396f4c55bd192782c12d0c6270fde6fd3212f -SIZE (arakiken-mlterm-3.9.2_GH0.tar.gz) = 4259208 +TIMESTAMP = 1680931718 +SHA256 (arakiken-mlterm-3.9.3_GH0.tar.gz) = b5b76721391de134bd64afb7de6b4256805cf2fc883a2bf2e5d29602ac1b50d9 +SIZE (arakiken-mlterm-3.9.3_GH0.tar.gz) = 4272090 diff --git a/x11/mlterm/files/patch-configure b/x11/mlterm/files/patch-configure index 0f91f574fba0..4a479e4b14f6 100644 --- a/x11/mlterm/files/patch-configure +++ b/x11/mlterm/files/patch-configure @@ -1,19 +1,10 @@ ---- configure.orig 2019-03-31 13:10:47 UTC +--- configure.orig 2023-04-08 11:30:26 UTC +++ configure -@@ -19448,6 +19448,7 @@ $as_echo "yes" >&6; } +@@ -19974,6 +19974,7 @@ $as_echo "yes" >&6; } fi fi if test "$have_vte" = "yes" ; then -+ MAKE_DIRS="gtk ${MAKE_DIRS}" ++ MAKE_DIRS2="gtk ${MAKE_DIRS2}" OUTPUT_FILES="gtk/Makefile ${OUTPUT_FILES}" fi -@@ -25538,7 +25539,7 @@ if test "$INSTALL_OPT" = ""; then - if test "$has_utmp" ; then - INSTALL_OPT="-m 2755 -g utmp" - else -- INSTALL_OPT="-m 4755 -o root" -+ INSTALL_OPT="-m 4755" - fi - else - INSTALL_OPT="-m 755" diff --git a/x11/mlterm/files/patch-gtk_Makefile.in b/x11/mlterm/files/patch-gtk_Makefile.in index 8b9fd00b08f5..b533fefbb0fe 100644 --- a/x11/mlterm/files/patch-gtk_Makefile.in +++ b/x11/mlterm/files/patch-gtk_Makefile.in @@ -1,11 +1,15 @@ ---- gtk/Makefile.in.orig 2017-01-07 22:24:38 UTC +--- gtk/Makefile.in.orig 2023-04-01 13:54:40 UTC +++ gtk/Makefile.in -@@ -30,7 +30,7 @@ LIB_VERSION_2.90 = 9:0:0 +@@ -30,9 +30,9 @@ LIB_VERSION_2.90 = 9:0:0 LIB_VERSION_2.91 = 0:0:0 TARGET = $(TARGET_$(VTE_ABI)) -TARGET_ = libvte +-TARGET_2.90 = libvte2_90 +-TARGET_2.91 = libvte-2.91 +TARGET_ = libvte-mlterm - TARGET_2.90 = libvte2_90 - TARGET_2.91 = libvte-2.91 ++TARGET_2.90 = libvte-mlterm ++TARGET_2.91 = libvte-mlterm + LPOBL = @LPOBL@ + LMEF = @LMEF@ diff --git a/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c b/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c index e54b4ea6caf7..49841299c30c 100644 --- a/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c +++ b/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c @@ -1,6 +1,6 @@ ---- inputmethod/ibus/im_ibus.c.orig 2017-12-02 16:03:23 UTC +--- inputmethod/ibus/im_ibus.c.orig 2023-04-01 13:54:40 UTC +++ inputmethod/ibus/im_ibus.c -@@ -1033,7 +1033,7 @@ im_info_t *im_ibus_get_info(char *locale +@@ -1024,7 +1024,7 @@ im_info_t *im_ibus_get_info(char *locale, char *encodi } result->id = strdup("ibus"); diff --git a/x11/mlterm/files/patch-tool_mlconfig_Makefile.in b/x11/mlterm/files/patch-tool_mlconfig_Makefile.in new file mode 100644 index 000000000000..4579a8487359 --- /dev/null +++ b/x11/mlterm/files/patch-tool_mlconfig_Makefile.in @@ -0,0 +1,26 @@ +--- 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/pkg-plist b/x11/mlterm/pkg-plist index e28de9d648e9..38f27c1a0b57 100644 --- a/x11/mlterm/pkg-plist +++ b/x11/mlterm/pkg-plist @@ -28,8 +28,8 @@ lib/libpobl.so.2 lib/libpobl.so.2.0.1 lib/libvte-mlterm.a lib/libvte-mlterm.so -lib/libvte-mlterm.so.9 -lib/libvte-mlterm.so.9.0.0 +lib/libvte-mlterm.so.0 +lib/libvte-mlterm.so.0.0.0 lib/mef/libmef_8bits.a lib/mef/libmef_8bits.so lib/mef/libmef_jajp.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304081231.338CVGGR004466>