git: 77267e8a33ff - main - textproc/uim: Update to the snapshot on 2022-03-18

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: MANTANI Nobutaka <nobutaka_at_FreeBSD.org>
Date: Sun, 08 May 2022 07:41:16 UTC
The branch main has been updated by nobutaka:

URL: https://cgit.FreeBSD.org/ports/commit/?id=77267e8a33ff905e2973eb9f75831a80bc7cddc9

commit 77267e8a33ff905e2973eb9f75831a80bc7cddc9
Author:     MANTANI Nobutaka <nobutaka@FreeBSD.org>
AuthorDate: 2022-05-08 07:24:16 +0000
Commit:     MANTANI Nobutaka <nobutaka@FreeBSD.org>
CommitDate: 2022-05-08 07:40:24 +0000

    textproc/uim: Update to the snapshot on 2022-03-18
    
    - Update slave ports of textproc/uim
    - Bump PORTREVISION for the ports that depend on textproc/uim
---
 japanese/scim-uim/Makefile                        |  2 +-
 japanese/uim-anthy/Makefile                       |  9 +++++----
 japanese/uim-mozc/Makefile                        |  2 +-
 japanese/uim-tomoe-gtk/Makefile                   |  2 +-
 textproc/uim-el/Makefile                          |  8 ++++----
 textproc/uim-el/distinfo                          |  6 +++---
 textproc/uim-gtk/Makefile                         |  5 +++--
 textproc/uim-gtk3/Makefile                        | 13 +++++++------
 textproc/uim-m17nlib/Makefile                     |  2 +-
 textproc/uim-qt5/Makefile                         |  7 +------
 textproc/uim-qt5/pkg-plist                        |  1 +
 textproc/uim/Makefile                             | 22 +++++++++++-----------
 textproc/uim/distinfo                             |  6 +++---
 textproc/uim/files/patch-configure.ac             |  6 +++---
 textproc/uim/files/patch-gtk2_toolbar_Makefile.am |  6 +++---
 textproc/uim/files/patch-gtk3_toolbar_Makefile.am |  6 +++---
 textproc/uim/files/patch-qt4_common.pro.in        | 10 ++++++++++
 textproc/uim/files/patch-qt5_applet_Makefile.am   | 12 ++++++++++++
 textproc/uim/files/patch-scm_Makefile.am          |  9 ---------
 textproc/uim/files/patch-xim_convdisp.cpp         | 10 +++++-----
 20 files changed, 78 insertions(+), 66 deletions(-)

diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 81f07bc585d6..8af48d2501df 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	scim-uim
 PORTVERSION=	0.2.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	japanese
 MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION} \
 		http://freedesktop.org/~suzhe/sources/
diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile
index 46aceff818d4..5a709e3ca8cf 100644
--- a/japanese/uim-anthy/Makefile
+++ b/japanese/uim-anthy/Makefile
@@ -16,7 +16,8 @@ USE_GNOME=	cairo gdkpixbuf2 gtk30
 LIB_DEPENDS=	libanthy.so:japanese/anthy \
 		libfreetype.so:print/freetype2 \
 		libuim.so:textproc/uim \
-		libfontconfig.so:x11-fonts/fontconfig
+		libfontconfig.so:x11-fonts/fontconfig \
+		libharfbuzz.so:print/harfbuzz
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
@@ -37,10 +38,10 @@ do-build:
 
 do-install:
 	(cd ${WRKSRC}/uim && \
-	${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES && \
-	${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la install-uim_pluginLTLIBRARIES)
+	${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy.la INSTALL_STRIP_FLAG=-s install-uim_pluginLTLIBRARIES && \
+	${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la INSTALL_STRIP_FLAG=-s install-uim_pluginLTLIBRARIES)
 .if !defined(WITHOUT_X11)
-	(cd ${WRKSRC}/gtk3/dict && ${MAKE_CMD} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk3 install-binPROGRAMS install-uim_dict_uiDATA)
+	(cd ${WRKSRC}/gtk3/dict && ${MAKE_CMD} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk3 INSTALL_STRIP_FLAG=-s install-binPROGRAMS install-uim_dict_uiDATA)
 .endif
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/uim-mozc/Makefile b/japanese/uim-mozc/Makefile
index b22d0302ecea..f524a403a17f 100644
--- a/japanese/uim-mozc/Makefile
+++ b/japanese/uim-mozc/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koichiro IWAO <meta+ports@vmeta.jp>
 
-PORTREVISION=	4
+PORTREVISION=	5
 PKGNAMEPREFIX=	ja-uim-
 
 COMMENT=	Mozc engine for uim
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index 75f279f3bb47..f5268e9727ad 100644
--- a/japanese/uim-tomoe-gtk/Makefile
+++ b/japanese/uim-tomoe-gtk/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	uim-tomoe-gtk
 PORTVERSION=	0.6.0
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	japanese
 MASTER_SITES=	SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 76299f899ed5..1722836fcc8c 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -1,11 +1,9 @@
 # Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
 
 PORTNAME=	uim-el
-PORTVERSION=	1.8.9.b.20210104
-PORTREVISION=	3
+PORTVERSION=	1.8.9.b.${SNAPDATE}
 CATEGORIES=	textproc
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
-#DISTNAME=	uim-${PORTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	Emacs lisp for uim input method library
@@ -23,7 +21,9 @@ USE_PERL5=	build
 USE_GITHUB=	yes
 GH_ACCOUNT=	uim
 GH_PROJECT=	uim
-GH_TAGNAME=	d1ac9d9
+GH_TAGNAME=	6d8fcc8
+
+SNAPDATE=	20220318
 
 GNU_CONFIGURE=	yes
 
diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo
index 51504dd1929c..6d1a392557f9 100644
--- a/textproc/uim-el/distinfo
+++ b/textproc/uim-el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619703401
-SHA256 (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = e187667560eb920201c93a6af104868c7c86b0d61364f6f7a20b33416c15a935
-SIZE (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = 4052581
+TIMESTAMP = 1651686460
+SHA256 (uim-uim-1.8.9.b.20220318-6d8fcc8_GH0.tar.gz) = 5fc53cca4e8505d71ea8e54cf5a0ad6398c7435be7fbbd7016623f36c5b2a565
+SIZE (uim-uim-1.8.9.b.20220318-6d8fcc8_GH0.tar.gz) = 4052477
diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile
index 1e4b8c10dc1a..6fbe5900df87 100644
--- a/textproc/uim-gtk/Makefile
+++ b/textproc/uim-gtk/Makefile
@@ -7,7 +7,8 @@ COMMENT=	GTK+ modules of uim input method
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 LIB_DEPENDS=	libuim.so:textproc/uim \
 		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2
+		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
@@ -24,6 +25,6 @@ do-build:
 	(cd ${WRKSRC}/gtk2 && ${MAKE_CMD})
 
 do-install:
-	(cd ${WRKSRC}/gtk2 && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+	(cd ${WRKSRC}/gtk2 && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim-gtk3/Makefile b/textproc/uim-gtk3/Makefile
index 80bbb0cab30f..60571873bd48 100644
--- a/textproc/uim-gtk3/Makefile
+++ b/textproc/uim-gtk3/Makefile
@@ -5,7 +5,8 @@ PKGNAMESUFFIX=	-gtk3
 COMMENT=	GTK+ 3.x modules of uim input method
 
 USE_GNOME=	cairo gdkpixbuf2 gtk30
-LIB_DEPENDS=	libuim.so:textproc/uim
+LIB_DEPENDS=	libuim.so:textproc/uim \
+		libharfbuzz.so:print/harfbuzz
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
@@ -26,10 +27,10 @@ do-build:
 	(cd ${WRKSRC}/gtk3/toolbar && ${MAKE_CMD})
 
 do-install:
-	(cd ${WRKSRC}/gtk3/immodule && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
-	(cd ${WRKSRC}/gtk3/pad && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
-	(cd ${WRKSRC}/gtk3/pref && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
-	(cd ${WRKSRC}/gtk3/switcher && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
-	(cd ${WRKSRC}/gtk3/toolbar && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+	(cd ${WRKSRC}/gtk3/immodule && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
+	(cd ${WRKSRC}/gtk3/pad && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
+	(cd ${WRKSRC}/gtk3/pref && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
+	(cd ${WRKSRC}/gtk3/switcher && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
+	(cd ${WRKSRC}/gtk3/toolbar && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile
index 6be918defd9f..e15c633b02a5 100644
--- a/textproc/uim-m17nlib/Makefile
+++ b/textproc/uim-m17nlib/Makefile
@@ -28,7 +28,7 @@ do-build:
 
 do-install:
 	(cd ${WRKSRC}/uim && \
-	${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-m17nlib.la install-uim_pluginLTLIBRARIES && \
+	${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-m17nlib.la INSTALL_STRIP_FLAG=-s install-uim_pluginLTLIBRARIES && \
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/uim/pixmaps && \
 	DESTDIR="${STAGEDIR}" ${SH} ../pixmaps/uim-m17nlib-relink-icons)
 
diff --git a/textproc/uim-qt5/Makefile b/textproc/uim-qt5/Makefile
index 166008838a7e..f6c9ef2145d6 100644
--- a/textproc/uim-qt5/Makefile
+++ b/textproc/uim-qt5/Makefile
@@ -1,12 +1,7 @@
-PORTREVISION=	1
 PKGNAMESUFFIX=	-qt5
 
 COMMENT=	Qt5 modules of uim input method
 
-LICENSE=	BSD3CLAUSE GPLv2+ GPLv3+ LGPL21+ PD
-LICENSE_COMB=	multi
-LICENSE_FILE=	${WRKSRC}/COPYING
-
 BUILD_DEPENDS=	cmake:devel/cmake
 LIB_DEPENDS=	libuim.so:textproc/uim
 
@@ -35,6 +30,6 @@ do-build:
 	(cd ${WRKSRC}/qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD})
 
 do-install:
-	(cd ${WRKSRC}/qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+	(cd ${WRKSRC}/qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim-qt5/pkg-plist b/textproc/uim-qt5/pkg-plist
index dfc89becb0f1..a3630246057c 100644
--- a/textproc/uim-qt5/pkg-plist
+++ b/textproc/uim-qt5/pkg-plist
@@ -6,6 +6,7 @@ bin/uim-toolbar-qt5
 %%QT_QMLDIR%%/com/github/uim/qmldir
 %%QT_PLUGINDIR%%/platforminputcontexts/libuimplatforminputcontextplugin.so
 libexec/uim-candwin-qt5
+share/kservices5/plasma-applet-com.github.uim.status.desktop
 share/metainfo/com.github.uim.status.appdata.xml
 share/plasma/plasmoids/com.github.uim.status/contents/ui/main.qml
 share/plasma/plasmoids/com.github.uim.status/contents/ui/messageProcessor.js
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 065ff68da1ce..4d219955df42 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -1,8 +1,7 @@
 # Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
 
 PORTNAME=	uim
-PORTVERSION=	1.8.9.b.20210104
-PORTREVISION=	1
+PORTVERSION=	1.8.9.b.${SNAPDATE}
 CATEGORIES?=	textproc
 .if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
@@ -22,10 +21,12 @@ USE_LDCONFIG=	yes
 USE_GNOME+=	glib20 intltool
 
 USE_GITHUB=	yes
-GH_TAGNAME=	d1ac9d9
+GH_TAGNAME=	6d8fcc8
 GH_TUPLE=	uim:sigscheme:beb8fbd:sigscheme \
 		uim:libgcroots:d362356:libgcroots
 
+SNAPDATE=	20220318
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-maintainer-mode
 
@@ -50,8 +51,9 @@ RUBY_NO_RUN_DEPENDS=	yes
 .if ${PORT_OPTIONS:MX11}
 USE_GNOME+=	cairo gdkpixbuf2 gtk30
 LIB_DEPENDS+=	libfreetype.so:print/freetype2 \
-		libfontconfig.so:x11-fonts/fontconfig
-CONFIGURE_ARGS+=	--with-gtk3
+		libfontconfig.so:x11-fonts/fontconfig \
+		libharfbuzz.so:print/harfbuzz
+CONFIGURE_ARGS+=	--with-gtk3 --enable-default-toolkit=gtk3
 .endif
 CONFIGURE_ARGS+=	--enable-emacs --with-sj3 --with-canna --with-prime
 .endif
@@ -95,9 +97,6 @@ post-extract:
 	${MKDIR} ${WRKSRC}/sigscheme/libgcroots
 	${CP} -R ${WRKSRC_libgcroots}/* ${WRKSRC}/sigscheme/libgcroots
 
-post-patch:
-	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/scm/skk-custom.scm
-
 pre-configure:
 	cd ${WRKSRC} && ./autogen.sh
 
@@ -114,11 +113,12 @@ do-build:
 do-install:
 .if !defined(UIM_SLAVE)
 	cd ${WRKSRC} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-data-am
-.for d in sigscheme uim scm xim po fep emacs pixmaps tables
-	cd ${WRKSRC}/${d} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install
+.for d in sigscheme uim scm xim fep emacs pixmaps tables
+	cd ${WRKSRC}/${d} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip
 .endfor
+	cd ${WRKSRC}/po && ${MAKE_CMD} DESTDIR=${STAGEDIR} install
 .if ${PORT_OPTIONS:MX11}
-	cd ${WRKSRC}/gtk3/candwin && ${MAKE_CMD} DESTDIR=${STAGEDIR} install
+	cd ${WRKSRC}/gtk3/candwin && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip
 .endif
 .endif
 
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index eb5a5de6cce3..731658897e60 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1619679684
-SHA256 (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = e187667560eb920201c93a6af104868c7c86b0d61364f6f7a20b33416c15a935
-SIZE (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = 4052581
+TIMESTAMP = 1651684893
+SHA256 (uim-uim-1.8.9.b.20220318-6d8fcc8_GH0.tar.gz) = 5fc53cca4e8505d71ea8e54cf5a0ad6398c7435be7fbbd7016623f36c5b2a565
+SIZE (uim-uim-1.8.9.b.20220318-6d8fcc8_GH0.tar.gz) = 4052477
 SHA256 (uim-sigscheme-beb8fbd_GH0.tar.gz) = c3ad5cbec2ff32bb97aed4273e7a61ee74b2a0da301490349798e475c894a25c
 SIZE (uim-sigscheme-beb8fbd_GH0.tar.gz) = 570745
 SHA256 (uim-libgcroots-d362356_GH0.tar.gz) = ae01589f5a7b49cf78418aca8679a7cd46a177a37d7776a4353b517d88cef451
diff --git a/textproc/uim/files/patch-configure.ac b/textproc/uim/files/patch-configure.ac
index 5bc71c1d0b02..54ea5d240826 100644
--- a/textproc/uim/files/patch-configure.ac
+++ b/textproc/uim/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2021-01-03 20:53:29 UTC
+--- configure.ac.orig	2022-03-18 00:54:17 UTC
 +++ configure.ac
-@@ -124,7 +124,7 @@ fi
+@@ -123,7 +123,7 @@ fi
  if test "x$with_anthy" = xyes; then
    ANTHY_LIBS="-lanthy -lanthydic"
    ANTHY_CFLAGS=""
@@ -9,7 +9,7 @@
                     [AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1,
                      "libanthy can handle UTF-8")])
  fi
-@@ -142,7 +142,7 @@ AC_ARG_WITH(anthy-utf8,
+@@ -141,7 +141,7 @@ AC_ARG_WITH(anthy-utf8,
    [with_anthy_utf8=no])
  
  if test "x$with_anthy_utf8" != xno; then
diff --git a/textproc/uim/files/patch-gtk2_toolbar_Makefile.am b/textproc/uim/files/patch-gtk2_toolbar_Makefile.am
index a633ad34dd85..639b1596ee6e 100644
--- a/textproc/uim/files/patch-gtk2_toolbar_Makefile.am
+++ b/textproc/uim/files/patch-gtk2_toolbar_Makefile.am
@@ -1,4 +1,4 @@
---- gtk2/toolbar/Makefile.am.orig	2021-04-29 16:11:47 UTC
+--- gtk2/toolbar/Makefile.am.orig	2022-05-04 18:55:24 UTC
 +++ gtk2/toolbar/Makefile.am
 @@ -6,9 +6,7 @@ if GNOME_APPLET
  libexec_PROGRAMS =  uim-toolbar-applet
@@ -11,7 +11,7 @@
  uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
  uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @GNOME_APPLET_CFLAGS@
  if GCC
-@@ -41,9 +39,7 @@ bin_PROGRAMS = uim-toolbar-gtk uim-toolbar-gtk-systray
+@@ -45,9 +43,7 @@ bin_PROGRAMS = uim-toolbar-gtk uim-toolbar-gtk-systray
  endif
  
  uim_toolbar_gtk_SOURCES  = standalone-gtk.c common-gtk.c
@@ -22,7 +22,7 @@
  uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
  uim_toolbar_gtk_CFLAGS   = @GTK2_CFLAGS@
  
-@@ -51,8 +47,6 @@ uim_toolbar_gtk_systray_SOURCES  = systray-gtk.c commo
+@@ -55,8 +51,6 @@ uim_toolbar_gtk_systray_SOURCES  = systray-gtk.c commo
  				   eggtrayicon.c eggtrayicon.h
  uim_toolbar_gtk_systray_LDADD    = @GTK2_LIBS@ \
  				   @X11_LIBS@ \
diff --git a/textproc/uim/files/patch-gtk3_toolbar_Makefile.am b/textproc/uim/files/patch-gtk3_toolbar_Makefile.am
index 895afd6eb302..a946771304b2 100644
--- a/textproc/uim/files/patch-gtk3_toolbar_Makefile.am
+++ b/textproc/uim/files/patch-gtk3_toolbar_Makefile.am
@@ -1,4 +1,4 @@
---- gtk3/toolbar/Makefile.am.orig	2021-04-30 15:03:44 UTC
+--- gtk3/toolbar/Makefile.am.orig	2022-05-04 18:55:24 UTC
 +++ gtk3/toolbar/Makefile.am
 @@ -11,9 +11,7 @@ xmluidir = $(pkgdatadir)/ui
  xmlui_DATA = uim-applet-menu.xml
@@ -11,7 +11,7 @@
  libuim_toolbar_applet_gnome3_la_CPPFLAGS = \
  			   -DUIM_UIDATADIR="\"${xmluidir}\"" \
  			   $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
-@@ -48,9 +46,7 @@ if GTK3
+@@ -52,9 +50,7 @@ if GTK3
  bin_PROGRAMS = uim-toolbar-gtk3 uim-toolbar-gtk3-systray
  uim_toolbar_gtk3_SOURCES  = ../../gtk2/toolbar/standalone-gtk.c \
  			       ../../gtk2/toolbar/common-gtk.c
@@ -22,7 +22,7 @@
  uim_toolbar_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
  uim_toolbar_gtk3_CFLAGS   = @GTK3_CFLAGS@
  
-@@ -60,9 +56,7 @@ uim_toolbar_gtk3_systray_SOURCES  = ../../gtk2/toolbar
+@@ -64,9 +60,7 @@ uim_toolbar_gtk3_systray_SOURCES  = ../../gtk2/toolbar
  				   ../../gtk2/toolbar/eggtrayicon.h
  uim_toolbar_gtk3_systray_LDADD    = @GTK3_LIBS@ \
  				   @X11_LIBS@ \
diff --git a/textproc/uim/files/patch-qt4_common.pro.in b/textproc/uim/files/patch-qt4_common.pro.in
new file mode 100644
index 000000000000..79a10c87a73a
--- /dev/null
+++ b/textproc/uim/files/patch-qt4_common.pro.in
@@ -0,0 +1,10 @@
+--- qt4/common.pro.in.orig	2022-05-04 19:05:55 UTC
++++ qt4/common.pro.in
+@@ -26,6 +26,6 @@ QMAKE_CXXFLAGS_DEBUG    = $$replace(QMAKE_CXXFLAGS_DEB
+ QMAKE_CXXFLAGS_RELEASE  = $$replace(QMAKE_CXXFLAGS_RELEASE, "-Wconversion", "")
+ QMAKE_LINK              = @CXX@
+ QMAKE_LFLAGS            = @LDFLAGS@
+-QMAKE_STRIP             =
++QMAKE_STRIP             = @STRIP@
+  
+ INSTALLS    += target
diff --git a/textproc/uim/files/patch-qt5_applet_Makefile.am b/textproc/uim/files/patch-qt5_applet_Makefile.am
new file mode 100644
index 000000000000..99667e926f6f
--- /dev/null
+++ b/textproc/uim/files/patch-qt5_applet_Makefile.am
@@ -0,0 +1,12 @@
+--- qt5/applet/Makefile.am.orig	2022-05-04 19:18:08 UTC
++++ qt5/applet/Makefile.am
+@@ -6,6 +6,8 @@ EXTRA_DIST =					\
+ 	plasmoid
+ 
+ if QT5
+-all clean install uninstall:
++all clean uninstall:
+ 	$(MAKE) $(AM_MAKEFLAGS) -C ../applet.cmake $@
++install:
++	$(MAKE) $(AM_MAKEFLAGS) -C ../applet.cmake install/strip
+ endif
diff --git a/textproc/uim/files/patch-scm_Makefile.am b/textproc/uim/files/patch-scm_Makefile.am
deleted file mode 100644
index 04e3b642c2b2..000000000000
--- a/textproc/uim/files/patch-scm_Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
---- scm/Makefile.am.orig	2021-04-29 07:47:29 UTC
-+++ scm/Makefile.am
-@@ -130,6 +130,3 @@ installed-modules.scm: $(SCM_FILES)
- 	    --path $(top_builddir)/scm --register $(module_names)
- 
- json-parser-expanded.scm: macro-expander.scm json-parser-expander.scm packrat.scm.in
--	if test -n "$(CSI)"; then \
--	    $(CSI) -R syntax-case -q json-parser-expander.scm > json-parser-expanded.scm; \
--	fi
diff --git a/textproc/uim/files/patch-xim_convdisp.cpp b/textproc/uim/files/patch-xim_convdisp.cpp
index d063027340da..6510c2ca4310 100644
--- a/textproc/uim/files/patch-xim_convdisp.cpp
+++ b/textproc/uim/files/patch-xim_convdisp.cpp
@@ -1,6 +1,6 @@
---- xim/convdisp.cpp.orig	2013-06-30 04:26:09 UTC
+--- xim/convdisp.cpp.orig	2022-03-18 00:54:17 UTC
 +++ xim/convdisp.cpp
-@@ -87,14 +87,14 @@ init_default_xftfont() {
+@@ -81,14 +81,14 @@ init_default_xftfont() {
      gXftFont = XftFontOpen(XimServer::gDpy, DefaultScreen(XimServer::gDpy),
  		    XFT_FAMILY, XftTypeString, fontname,
  		    XFT_PIXEL_SIZE, XftTypeDouble, (double)DEFAULT_FONT_SIZE,
@@ -17,7 +17,7 @@
      }
  }
  
-@@ -112,7 +112,7 @@ update_default_xftfont() {
+@@ -106,7 +106,7 @@ update_default_xftfont() {
  			DefaultScreen(XimServer::gDpy),
  			XFT_FAMILY, XftTypeString, fontname,
  			XFT_PIXEL_SIZE, XftTypeDouble, (double)DEFAULT_FONT_SIZE,
@@ -26,7 +26,7 @@
  	if (xftfont) {
  	    if (gXftFont)
  		XftFontClose(XimServer::gDpy, gXftFont);
-@@ -387,7 +387,7 @@ PeWin::PeWin(Window pw, const char *im_l
+@@ -385,7 +385,7 @@ PeWin::PeWin(Window pw, const char *im_lang, const cha
  			    DefaultScreen(XimServer::gDpy),
  			    XFT_FAMILY, XftTypeString, gXftFontName,
  			    XFT_PIXEL_SIZE, XftTypeDouble, (double)mXftFontSize,
@@ -35,7 +35,7 @@
  	}
  	mXftDraw = XftDrawCreate(XimServer::gDpy, mPixmap,
  			DefaultVisual(XimServer::gDpy, scr_num),
-@@ -557,7 +557,7 @@ void PeWin::set_xftfont(const char *xfld
+@@ -555,7 +555,7 @@ void PeWin::set_xftfont(const char *xfld)
  			    DefaultScreen(XimServer::gDpy),
  			    XFT_FAMILY, XftTypeString, gXftFontName,
  			    XFT_PIXEL_SIZE, XftTypeDouble, (double)size,