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

7 files changed, 36 insertions, 23 deletions

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,