CVS commit: pkgsrc/inputmethod/uim

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Nov 15 12:25:04 UTC 2025

Modified Files:
        pkgsrc/inputmethod/uim: Makefile Makefile.common PLIST distinfo
            options.mk
        pkgsrc/inputmethod/uim/patches: patch-uim_Makefile.am
Added Files:
        pkgsrc/inputmethod/uim: PLIST.gtk4 PLIST.qt6
Removed Files:
        pkgsrc/inputmethod/uim/patches: patch-uim_skk.c

Log Message:
inputmethod/uim: Update to 1.9.7pre20251027

Changelog:
* Support GTK4 and Qt6 immodules.
* Many bugfixes.


To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 pkgsrc/inputmethod/uim/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/inputmethod/uim/Makefile.common
cvs rdiff -u -r1.28 -r1.29 pkgsrc/inputmethod/uim/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/inputmethod/uim/PLIST.gtk4 \
    pkgsrc/inputmethod/uim/PLIST.qt6
cvs rdiff -u -r1.39 -r1.40 pkgsrc/inputmethod/uim/distinfo
cvs rdiff -u -r1.37 -r1.38 pkgsrc/inputmethod/uim/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/inputmethod/uim/patches/patch-uim_Makefile.am
cvs rdiff -u -r1.1 -r0 pkgsrc/inputmethod/uim/patches/patch-uim_skk.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/uim/Makefile
diff -u pkgsrc/inputmethod/uim/Makefile:1.198 pkgsrc/inputmethod/uim/Makefile:1.199
--- pkgsrc/inputmethod/uim/Makefile:1.198       Thu Oct 23 20:38:03 2025
+++ pkgsrc/inputmethod/uim/Makefile     Sat Nov 15 12:25:03 2025
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.198 2025/10/23 20:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.199 2025/11/15 12:25:03 ryoon Exp $
 
-PKGREVISION= 21
 .include "../../inputmethod/uim/Makefile.common"
 
 COMMENT=       Multilingual input method library
@@ -23,7 +22,6 @@ USE_LANGUAGES=        c c++
 
 # alloca
 FORCE_C_STD=   gnu99
-FORCE_CXX_STD= gnu++11
 
 # Avoid finding mono tool and breaking.
 MAKE_FLAGS+=   CSI=

Index: pkgsrc/inputmethod/uim/Makefile.common
diff -u pkgsrc/inputmethod/uim/Makefile.common:1.19 pkgsrc/inputmethod/uim/Makefile.common:1.20
--- pkgsrc/inputmethod/uim/Makefile.common:1.19 Sat Feb 25 17:20:16 2023
+++ pkgsrc/inputmethod/uim/Makefile.common      Sat Nov 15 12:25:03 2025
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile.common,v 1.19 2023/02/25 17:20:16 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.20 2025/11/15 12:25:03 ryoon Exp $
 #
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
 
-DISTNAME=      uim-1.8.9
+DISTNAME=      uim-1.9.7pre20251027
 CATEGORIES=    inputmethod
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=uim/}
 GITHUB_PROJECT=        uim
-GITHUB_RELEASE=        ${PKGVERSION_NOREV}
+GITHUB_TAG=    0dd88f748b7b11e81768ab13b424f995331a5bd6
 
 MAINTAINER=    VEG03617%nifty.com@localhost
 HOMEPAGE=      https://github.com/uim/uim/wiki
 
-GITHUB_SUBMODULES+=    uim sigscheme beb8fbdc69b523d14fc202a4d17375555a74c772 sigscheme
+GITHUB_SUBMODULES+=    uim sigscheme 5a05b7b3242bcc4e16b966acf4200985cd67ba88 sigscheme
 GITHUB_SUBMODULES+=    uim libgcroots d362356cc4c5f591695d2fbda7746918250c9e99 sigscheme/libgcroots
 EXTRACT_USING=         bsdtar
 
@@ -22,4 +22,5 @@ PATCHDIR=     ${.CURDIR}/../../inputmethod/u
 USE_TOOLS+=    autoreconf autoconf automake
 
 pre-configure:
+       echo CFLAGS=${CFLAGS}
        cd ${WRKSRC} && ${SH} autogen.sh

Index: pkgsrc/inputmethod/uim/PLIST
diff -u pkgsrc/inputmethod/uim/PLIST:1.28 pkgsrc/inputmethod/uim/PLIST:1.29
--- pkgsrc/inputmethod/uim/PLIST:1.28   Tue Mar 30 17:01:49 2021
+++ pkgsrc/inputmethod/uim/PLIST        Sat Nov 15 12:25:03 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2021/03/30 17:01:49 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.29 2025/11/15 12:25:03 ryoon Exp $
 bin/uim-fep
 bin/uim-fep-tick
 bin/uim-help
@@ -52,7 +52,6 @@ libexec/uim-candwin-tbl-gtk
 libexec/uim-candwin-tbl-gtk3
 libexec/uim-helper-server
 man/man1/uim-xim.1
-qt5/plugins/platforminputcontexts/libuimplatforminputcontextplugin.${RUBY_DLEXT}
 share/applications/uim.desktop
 share/doc/uim/COMPATIBILITY
 share/doc/uim/CUSTOM

Index: pkgsrc/inputmethod/uim/distinfo
diff -u pkgsrc/inputmethod/uim/distinfo:1.39 pkgsrc/inputmethod/uim/distinfo:1.40
--- pkgsrc/inputmethod/uim/distinfo:1.39        Sun Apr  7 04:24:23 2024
+++ pkgsrc/inputmethod/uim/distinfo     Sat Nov 15 12:25:03 2025
@@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.39 2024/04/07 04:24:23 pho Exp $
+$NetBSD: distinfo,v 1.40 2025/11/15 12:25:03 ryoon Exp $
 
-BLAKE2s (uim-1.8.9.tar.gz) = 21175907f7ff2bbfb508e32b98d72fa63767a10591b067c809828aec25312845
-SHA512 (uim-1.8.9.tar.gz) = ef731d255259b00e41a96e325cfa001579f14b98329d1882508190b8f2a9552ba4165572a7faf865b58bf392b69de2933e6ff13174941b5313ad690fbc36e337
-Size (uim-1.8.9.tar.gz) = 7885942 bytes
+BLAKE2s (uim-1.9.7pre20251027-0dd88f748b7b11e81768ab13b424f995331a5bd6.tar.gz) = 966b500828d18c8f5f5f21d32fc61faa0f7de7b024dcc9cb965a98196bc2e0d1
+SHA512 (uim-1.9.7pre20251027-0dd88f748b7b11e81768ab13b424f995331a5bd6.tar.gz) = 
1f73e229b7efb111a9e8eef62be494bd5fdeac7c65d0f6b813e1248da84af95c70b1243b90eb2822060488422dc43cbd225bfc955b78d7897a298bc8c0881263
+Size (uim-1.9.7pre20251027-0dd88f748b7b11e81768ab13b424f995331a5bd6.tar.gz) = 4233316 bytes
 BLAKE2s (uim-libgcroots-d362356cc4c5f591695d2fbda7746918250c9e99.tar.gz) = bd83288550b627b018a6f5018810f5e57b5870ba6f13b31f18cb650d3bfa4a87
 SHA512 (uim-libgcroots-d362356cc4c5f591695d2fbda7746918250c9e99.tar.gz) = 
b47e94b2aae208fe568a75d2f2d75043939b3c865ec90f9f1219c77ecd9c8649572eb609745886c1a018a1c6c6bdc3c235a8247e7240b2713f2320c57051b6c6
 Size (uim-libgcroots-d362356cc4c5f591695d2fbda7746918250c9e99.tar.gz) = 88827 bytes
-BLAKE2s (uim-sigscheme-beb8fbdc69b523d14fc202a4d17375555a74c772.tar.gz) = b771627165da03b87ce76348290d5bdfd90acf088bf57a0712b2359572649e64
-SHA512 (uim-sigscheme-beb8fbdc69b523d14fc202a4d17375555a74c772.tar.gz) = 
3151d849c6a56f8438a8676b646dabe5abac317b77e834c6ab29b0282e83d21e4e72171f1353f15b19a5d7b51b5ab4f287cf01b9a11e4785d18e4fa0cce2966c
-Size (uim-sigscheme-beb8fbdc69b523d14fc202a4d17375555a74c772.tar.gz) = 571469 bytes
+BLAKE2s (uim-sigscheme-5a05b7b3242bcc4e16b966acf4200985cd67ba88.tar.gz) = cb6c771a5c8cf1eac4087f21ac2bc32ebc2b7443695a90c1a3ac27b9c02d071b
+SHA512 (uim-sigscheme-5a05b7b3242bcc4e16b966acf4200985cd67ba88.tar.gz) = 
4139e03b522db84cff775c9ff467cc2c4763466648c9faf421d101a3154e6d2c6141d9e1bb95d9e6763b8f0d926ea875d657f596cfc04d0332bc043432b3bf2c
+Size (uim-sigscheme-5a05b7b3242bcc4e16b966acf4200985cd67ba88.tar.gz) = 562800 bytes
 SHA1 (patch-scm_Makefile.am) = b4a23a7d507d8d7fe6122f3d2f50fed40589947f
 SHA1 (patch-sigscheme_configure.ac) = 836d034e2eb1a60619eaac70f22387a1805dda5c
 SHA1 (patch-sigscheme_doc_Makefile.am) = e21e33d7eb078819ab34f9d7fdc10d7f4401a2c4
 SHA1 (patch-sigscheme_include_sigscheme_Makefile.am) = d54b38982c199b321c6ac0d8700bfe9c29084eee
-SHA1 (patch-uim_Makefile.am) = e3a9e4dc99965c271fd6e783d42a6a136bf904b2
-SHA1 (patch-uim_skk.c) = 0d0bcf3c996ab5a4351e30cdf0f6f1fdc6faf5ad
+SHA1 (patch-uim_Makefile.am) = a5598e10d20eaf35d5af2d6b732129aa3069d3d3
 SHA1 (patch-uim_uim-module-manager.c) = 345b09a209fc1ccc9ba96aa50a5adac1f2ef35ee
 SHA1 (patch-xim_connection.cpp) = d3a34c533e99c6d6991093761ed7dcc40773520b
 SHA1 (patch-xim_ximic.cpp) = 8c19425ef926c384028db1edbb39a8a81dfd4ade

Index: pkgsrc/inputmethod/uim/options.mk
diff -u pkgsrc/inputmethod/uim/options.mk:1.37 pkgsrc/inputmethod/uim/options.mk:1.38
--- pkgsrc/inputmethod/uim/options.mk:1.37      Sun Mar  8 08:59:08 2020
+++ pkgsrc/inputmethod/uim/options.mk   Sat Nov 15 12:25:03 2025
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.37 2020/03/08 08:59:08 nros Exp $
+# $NetBSD: options.mk,v 1.38 2025/11/15 12:25:03 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.uim
-PKG_SUPPORTED_OPTIONS= gtk2 gtk3 qt5 xim
-PKG_SUGGESTED_OPTIONS= gtk2 gtk3 qt5 xim
+PKG_SUPPORTED_OPTIONS= gtk2 gtk3 gtk4 qt5 qt6 xim
+PKG_SUGGESTED_OPTIONS= gtk2 gtk3 gtk4 qt5 qt6 xim
 
 PKG_OPTIONS_LEGACY_OPTS+=      gtk:gtk2
 
@@ -26,6 +26,14 @@ GTK3_IMMODULES=              YES
 CONFIGURE_ARGS+=       --without-gtk3
 .endif
 
+.if !empty(PKG_OPTIONS:Mgtk4)
+PLIST_SRC+=            PLIST.gtk4
+GTK4_IMMODULES=                YES
+.include "../../x11/gtk4/modules.mk"
+.else
+CONFIGURE_ARGS+=       --without-gtk4
+.endif
+
 .if !empty(PKG_OPTIONS:Mgtk3)
 CONFIGURE_ARGS+=       --enable-default-toolkit=gtk3
 UIM_PREF_PROGRAM=      uim-pref-gtk3
@@ -38,10 +46,40 @@ UIM_PREF_PROGRAM=   uim-pref-gtk
 PLIST_SRC+=            PLIST.qt5
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-qt5-immodule
+CONFIGURE_ENV+=                QMAKE5=${PREFIX}/qt5/bin/qmake
+CONFIGURE_ENV+=                ax_cv_path_QMAKE5=${PREFIX}/qt5/bin/qmake
+BUILDLINK_INCDIRS.qt5-qtx11extras=     # empty
+BUILDLINK_LIBDIRS.qt5-qtx11extras=     # empty
+BUILDLINK_INCDIRS.qt5-qtxmlpatterns=   # empty
+BUILDLINK_LIBDIRS.qt5-qtxmlpatterns=   # empty
+BUILDLINK_INCDIRS.qt5-qtbase=          # empty
+BUILDLINK_LIBDIRS.qt5-qtbase=          # empty
+
+BUILDLINK_TRANSFORM+=  R:${PREFIX}/qt5/lib:${PREFIX}/qt5/lib
 .else
 CONFIGURE_ARGS+=       --without-qt5-immodule
 .endif
 
+.if !empty(PKG_OPTIONS:Mqt6)
+PLIST_SRC+=            PLIST.qt6
+.include "../../devel/qt6-qt5compat/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-qt6-immodule
+CONFIGURE_ENV+=                QMAKE6=${PREFIX}/qt6/bin/qmake
+CONFIGURE_ENV+=                ax_cv_path_QMAKE6=${PREFIX}/qt6/bin/qmake
+BUILDLINK_INCDIRS.qt6-qtsvg=           # empty
+BUILDLINK_LIBDIRS.qt6-qtsvg=           # empty
+BUILDLINK_INCDIRS.qt6-qtdeclarative=   # empty
+BUILDLINK_LIBDIRS.qt6-qtdeclarative=   # empty
+BUILDLINK_INCDIRS.qt6-qtbase=          # empty
+BUILDLINK_LIBDIRS.qt6-qtbase=          # empty
+
+FORCE_CXX_STD=         gnu++17
+BUILDLINK_TRANSFORM+=  R:${PREFIX}/qt6/lib:${PREFIX}/qt6/lib
+.else
+CONFIGURE_ARGS+=       --without-qt6-immodule
+FORCE_CXX_STD=         gnu++11
+.endif
+
 .if !empty(PKG_OPTIONS:Mxim)
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"

Index: pkgsrc/inputmethod/uim/patches/patch-uim_Makefile.am
diff -u pkgsrc/inputmethod/uim/patches/patch-uim_Makefile.am:1.3 pkgsrc/inputmethod/uim/patches/patch-uim_Makefile.am:1.4
--- pkgsrc/inputmethod/uim/patches/patch-uim_Makefile.am:1.3    Fri Nov  1 16:21:11 2019
+++ pkgsrc/inputmethod/uim/patches/patch-uim_Makefile.am        Sat Nov 15 12:25:04 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-uim_Makefile.am,v 1.3 2019/11/01 16:21:11 nia Exp $
+$NetBSD: patch-uim_Makefile.am,v 1.4 2025/11/15 12:25:04 ryoon Exp $
 
 https://github.com/uim/uim/pull/41
 
---- uim/Makefile.am.orig       2018-05-11 21:26:06.000000000 +0000
+--- uim/Makefile.am.orig       2025-08-15 11:59:24.000000000 +0000
 +++ uim/Makefile.am
-@@ -8,7 +8,8 @@ AUTOMAKE_OPTIONS = foreign
+@@ -13,7 +13,8 @@ AUTOMAKE_OPTIONS = foreign
  
  EXTRA_DIST = encoding-table.c test-gc.c version.h.in
  
@@ -14,12 +14,12 @@ https://github.com/uim/uim/pull/41
  # FIXME: $(UIM_SCM_CFLAGS) should only affect on uim-scm.c
  CFLAGS = @CFLAGS@ $(UIM_SCM_CFLAGS)
  CXXFLAGS = @CXXFLAGS@
-@@ -321,7 +322,7 @@ if LIBEDIT
+@@ -329,7 +330,7 @@ if LIBEDIT
  endif
  
  uim_module_manager_LIBS =
--uim_module_manager_CPPFLAGS = $(uim_defs) -I$(top_srcdir) -DUIM_DATADIR=\""$(datadir)/uim"\"
-+uim_module_manager_CPPFLAGS = $(uim_defs) -I$(top_srcdir) -DUIM_DATADIR=\""$(datadir)/uim"\" -DUIM_CONFDIR=\""$(sysconfdir)/uim"\"
+-uim_module_manager_CPPFLAGS = $(uim_defs) $(AM_CPPFLAGS) -DUIM_DATADIR=\""$(datadir)/uim"\"
++uim_module_manager_CPPFLAGS = $(uim_defs) $(AM_CPPFLAGS) -DUIM_DATADIR=\""$(datadir)/uim"\" -DUIM_CONFDIR=\""$(sysconfdir)/uim"\"
  uim_module_manager_CFLAGS =
  uim_module_manager_LDADD = libuim-scm.la libuim.la
  uim_module_manager_SOURCES = uim-module-manager.c

Added files:

Index: pkgsrc/inputmethod/uim/PLIST.gtk4
diff -u /dev/null pkgsrc/inputmethod/uim/PLIST.gtk4:1.1
--- /dev/null   Sat Nov 15 12:25:04 2025
+++ pkgsrc/inputmethod/uim/PLIST.gtk4   Sat Nov 15 12:25:03 2025
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.gtk4,v 1.1 2025/11/15 12:25:03 ryoon Exp $
+lib/gtk-4.0/4.0.0/immodules/libim-uim.la
Index: pkgsrc/inputmethod/uim/PLIST.qt6
diff -u /dev/null pkgsrc/inputmethod/uim/PLIST.qt6:1.1
--- /dev/null   Sat Nov 15 12:25:04 2025
+++ pkgsrc/inputmethod/uim/PLIST.qt6    Sat Nov 15 12:25:03 2025
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.qt6,v 1.1 2025/11/15 12:25:03 ryoon Exp $
+qt6/plugins/platforminputcontexts/libuimplatforminputcontextplugin.so