diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2026-09-21 08:38:38 +0000 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2026-09-21 08:45:12 +0000 |
| commit | 403d33d8112c4e2b0f27a694bc5dd106023f7822 (patch) | |
| tree | 5d283a2159f9a70e4f9af57cd97349b7fa837d14 | |
| parent | 942b0b4d98d8134644b08ca1d1a65519eca5a192 (diff) | |
textproc/uim: Update to 1.9.7
- Remove textproc/uim-gtk2 because the upstream dropped gtk2 support
- Add textproc/uim-gtk4
- Bump PORTREVISION of textproc/uim consumers
34 files changed, 92 insertions, 316 deletions
@@ -5617,3 +5617,4 @@ devel/py-game_sdl2||2026-09-15|Has expired: Depends on expired lang/cython0 databases/py-cassandra-driver||2026-09-15|Has expired: Depends on expired lang/cython0 misc/py-python-pygtrie|misc/py-pygtrie|2026-09-16|Project was renamed on PyPI sysutils/py-py-cpuinfo|sysutils/py-py-cpuinfo2|2026-09-16|Remove obsolete sysutils/py-py-cpuinfo in favor of sysutils/py-py-cpuinfo2 +textproc/uim-gtk2||2026-09-20|Has expired: Uses deprecated gtk2 libraries diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile index 5e8ccb38339c..7f91ed56168e 100644 --- a/japanese/scim-uim/Makefile +++ b/japanese/scim-uim/Makefile @@ -1,6 +1,6 @@ PORTNAME= scim-uim PORTVERSION= 0.2.0 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= japanese MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION} \ http://freedesktop.org/~suzhe/sources/ diff --git a/japanese/uim-anthy-unicode/Makefile b/japanese/uim-anthy-unicode/Makefile index 4a4d305ede9e..e72685ffcf50 100644 --- a/japanese/uim-anthy-unicode/Makefile +++ b/japanese/uim-anthy-unicode/Makefile @@ -1,4 +1,3 @@ -PORTREVISION= 1 CATEGORIES= japanese .if defined(WITHOUT_X11) PKGNAMESUFFIX= -anthy-unicode-nox11 @@ -36,7 +35,7 @@ do-build: do-install: (cd ${WRKSRC}/uim && \ - ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la INSTALL_STRIP_FLAG=-s install-uim_pluginLTLIBRARIES) + ${MAKE_CMD} DESTDIR=${STAGEDIR} uimplugin_LTLIBRARIES=libuim-anthy-utf8.la lib_LTLIBRARIES= INSTALL_STRIP_FLAG=-s install-uimpluginLTLIBRARIES) .if !defined(WITHOUT_X11) (cd ${WRKSRC}/gtk3/dict && ${MAKE_CMD} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk3 INSTALL_STRIP_FLAG=-s install-binPROGRAMS install-uim_dict_uiDATA) .endif diff --git a/japanese/uim-mozc/Makefile b/japanese/uim-mozc/Makefile index e7d2e477909f..9ea8f3ef8864 100644 --- a/japanese/uim-mozc/Makefile +++ b/japanese/uim-mozc/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 11 +PORTREVISION= 12 PKGNAMEPREFIX= ja-uim- COMMENT= Mozc engine for uim diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile index 34bddcff2d7e..10a6a5125228 100644 --- a/japanese/uim-tomoe-gtk/Makefile +++ b/japanese/uim-tomoe-gtk/Makefile @@ -1,6 +1,6 @@ PORTNAME= uim-tomoe-gtk PORTVERSION= 0.6.0 -PORTREVISION= 24 +PORTREVISION= 25 CATEGORIES= japanese MASTER_SITES= SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/textproc/Makefile b/textproc/Makefile index 4a603337391d..4de7e8950c31 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -2267,8 +2267,8 @@ SUBDIR += ugrep SUBDIR += uim SUBDIR += uim-el - SUBDIR += uim-gtk2 SUBDIR += uim-gtk3 + SUBDIR += uim-gtk4 SUBDIR += uim-m17nlib SUBDIR += uim-qt5 SUBDIR += uim-qt6 diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile index af13d470bc21..bd426a56e87d 100644 --- a/textproc/uim-el/Makefile +++ b/textproc/uim-el/Makefile @@ -1,6 +1,5 @@ PORTNAME= uim-el -PORTVERSION= 1.9.6 -PORTREVISION= 3 +PORTVERSION= 1.9.7 CATEGORIES= textproc MAINTAINER= nobutaka@FreeBSD.org diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo index 63365d31d133..046ca4390cab 100644 --- a/textproc/uim-el/distinfo +++ b/textproc/uim-el/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1747554528 -SHA256 (uim-uim-1.9.6_GH0.tar.gz) = b982dc4eb3b3f31799299e1d1dd5b953c617aa13f41781273998584d0a35bf20 -SIZE (uim-uim-1.9.6_GH0.tar.gz) = 4163170 +TIMESTAMP = 1789911473 +SHA256 (uim-uim-1.9.7_GH0.tar.gz) = 19382d84944dbc55e0a09867229721267fa3c2671e2a451c28e50d5f981cb7b7 +SIZE (uim-uim-1.9.7_GH0.tar.gz) = 4017422 diff --git a/textproc/uim-el/files/patch-autogen.sh b/textproc/uim-el/files/patch-autogen.sh index 38c1ef7aa378..177084824a3b 100644 --- a/textproc/uim-el/files/patch-autogen.sh +++ b/textproc/uim-el/files/patch-autogen.sh @@ -1,15 +1,8 @@ ---- autogen.sh.orig 2025-02-23 08:00:09 UTC +--- autogen.sh.orig 2026-09-20 13:59:40 UTC +++ autogen.sh -@@ -3,9 +3,6 @@ ${AUTORECONF:-autoreconf} --force --install "$@" +@@ -3,5 +3,3 @@ ${AUTORECONF:-autoreconf} --force --install "$@" set -e ${AUTORECONF:-autoreconf} --force --install "$@" --# WORKAROUND: intltool-merge creates .intltool-merge-cache.lock but --# it's not listed in mostlyclean in po/Makefile.in.in. It causes a --# "make distcheck" failure. --sed -i.bak -e 's/ \.intltool-merge-cache$/ .intltool-merge-cache{,.lock}/g' \ -- po/Makefile.in.in --rm -f po/Makefile.in.in.bak -+if command -v intltoolize >/dev/null; then -+ intltoolize --copy --force --automake -+fi +-cd sigscheme +-./autogen.sh "$@" diff --git a/textproc/uim-el/files/patch-emacs_uim-leim.el b/textproc/uim-el/files/patch-emacs_uim-leim.el deleted file mode 100644 index 35a142cf4d8a..000000000000 --- a/textproc/uim-el/files/patch-emacs_uim-leim.el +++ /dev/null @@ -1,35 +0,0 @@ ---- emacs/uim-leim.el.orig 2024-01-27 11:04:16 UTC -+++ emacs/uim-leim.el -@@ -62,7 +62,7 @@ - - (let (im) - ;; register inactivation function -- (setq inactivate-current-input-method-function 'uim-leim-inactivate) -+ (setq deactivate-current-input-method-function 'uim-leim-inactivate) - - ;; get plain IM engine name from LEIM style name - ;; ex. "Japanese-anthy-uim" => "anthy" -@@ -80,7 +80,7 @@ - (defun uim-leim-reset () - (when uim-leim-active - (message "uim.el: uim-leim-reset") -- (inactivate-input-method))) -+ (deactivate-input-method))) - - - (defun uim-leim-make-im-name (im) -@@ -156,12 +156,12 @@ - (lambda () - (when uim-leim-active - (message "uim.el: LEIM inactivated" -- (inactivate-input-method))))) -+ (deactivate-input-method))))) - - (add-hook 'uim-buffer-init-hook - (lambda () - (add-hook 'change-major-mode-hook -- 'inactivate-input-method nil t))) -+ 'deactivate-input-method nil t))) - - ;; - ;;uim-leim-update-label diff --git a/textproc/uim-gtk2/pkg-descr b/textproc/uim-gtk2/pkg-descr deleted file mode 100644 index c55045b0cdfc..000000000000 --- a/textproc/uim-gtk2/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -GTK+ 2.x modules of uim input method. diff --git a/textproc/uim-gtk2/pkg-plist b/textproc/uim-gtk2/pkg-plist deleted file mode 100644 index 1a2e1d2daee2..000000000000 --- a/textproc/uim-gtk2/pkg-plist +++ /dev/null @@ -1,11 +0,0 @@ -bin/uim-im-switcher-gtk -bin/uim-input-pad-ja -bin/uim-pref-gtk -bin/uim-toolbar-gtk -bin/uim-toolbar-gtk-systray -lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.so -libexec/uim-candwin-gtk -libexec/uim-candwin-horizontal-gtk -libexec/uim-candwin-tbl-gtk -@postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache -@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache diff --git a/textproc/uim-gtk2/Makefile b/textproc/uim-gtk4/Makefile index 73d539e550e9..8823a2874489 100644 --- a/textproc/uim-gtk2/Makefile +++ b/textproc/uim-gtk4/Makefile @@ -1,16 +1,14 @@ -PKGNAMESUFFIX= -gtk2 +PKGNAMESUFFIX= -gtk4 -COMMENT= GTK 2.x modules of uim input method +COMMENT= GTK 4.x modules of uim input method -USE_GNOME= cairo gdkpixbuf gtk20 +USE_GNOME= cairo gdkpixbuf gtk40 LIB_DEPENDS= libuim.so:textproc/uim \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} -CONFIGURE_ARGS= --with-gtk2 --enable-pref +CONFIGURE_ARGS= --with-gtk4 --enable-default-toolkit=gtk4 UIM_SLAVE= yes @@ -20,9 +18,9 @@ IGNORE= requires X11 do-build: (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la) - (cd ${WRKSRC}/gtk2 && ${MAKE_CMD}) + (cd ${WRKSRC}/gtk4/immodule && ${MAKE_CMD}) do-install: - (cd ${WRKSRC}/gtk2 && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip) + (cd ${WRKSRC}/gtk4/immodule && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip) .include "${MASTERDIR}/Makefile" diff --git a/textproc/uim-gtk4/pkg-descr b/textproc/uim-gtk4/pkg-descr new file mode 100644 index 000000000000..b7885574a9e4 --- /dev/null +++ b/textproc/uim-gtk4/pkg-descr @@ -0,0 +1 @@ +GTK+ 4.x modules of uim input method. diff --git a/textproc/uim-gtk4/pkg-plist b/textproc/uim-gtk4/pkg-plist new file mode 100644 index 000000000000..c8489061ce16 --- /dev/null +++ b/textproc/uim-gtk4/pkg-plist @@ -0,0 +1 @@ +lib/gtk-4.0/%%GTK4_VERSION%%/immodules/libim-uim.so diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile index 045952f3064b..95287dde720b 100644 --- a/textproc/uim-m17nlib/Makefile +++ b/textproc/uim-m17nlib/Makefile @@ -26,7 +26,7 @@ do-build: do-install: (cd ${WRKSRC}/uim && \ - ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-m17nlib.la INSTALL_STRIP_FLAG=-s install-uim_pluginLTLIBRARIES && \ + ${MAKE_CMD} DESTDIR=${STAGEDIR} uimplugin_LTLIBRARIES=libuim-m17nlib.la lib_LTLIBRARIES= INSTALL_STRIP_FLAG=-s install-uimpluginLTLIBRARIES && \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/uim/pixmaps && \ DESTDIR="${STAGEDIR}" ${SH} ../pixmaps/uim-m17nlib-relink-icons) diff --git a/textproc/uim-qt5/pkg-plist b/textproc/uim-qt5/pkg-plist index bed63089645f..fbf8ad2d02c5 100644 --- a/textproc/uim-qt5/pkg-plist +++ b/textproc/uim-qt5/pkg-plist @@ -2,11 +2,5 @@ bin/uim-chardict-qt5 bin/uim-im-switcher-qt5 bin/uim-pref-qt5 bin/uim-toolbar-qt5 -%%QT_QMLDIR%%/com/github/uim/libuim-qtquick-plugin.so -%%QT_QMLDIR%%/com/github/uim/qmldir %%QT_PLUGINDIR%%/platforminputcontexts/libuimplatforminputcontextplugin.so libexec/uim-candwin-qt5 -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 -share/plasma/plasmoids/com.github.uim.status/metadata.json diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 13094a20bce1..8b7d9654affa 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -1,5 +1,5 @@ PORTNAME= uim -PORTVERSION= 1.9.6 +PORTVERSION= 1.9.7 PORTREVISION?= 0 CATEGORIES?= textproc .if !defined(UIM_SLAVE) && defined(WITHOUT_X11) @@ -27,7 +27,8 @@ GH_TUPLE= uim:sigscheme:ccf1f92:sigscheme \ GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -CONFIGURE_ARGS+= --enable-maintainer-mode +CONFIGURE_ARGS+= --enable-maintainer-mode \ + --with-sqlite3 --without-mozc OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT= X11 @@ -53,7 +54,7 @@ LIB_DEPENDS+= libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz CONFIGURE_ARGS+= --with-gtk3 --enable-default-toolkit=gtk3 .endif -CONFIGURE_ARGS+= --enable-emacs --with-sj3 --with-canna --with-prime +CONFIGURE_ARGS+= --enable-emacs --with-canna .endif CPPFLAGS+= -I${LOCALBASE}/include @@ -79,12 +80,12 @@ PLIST_SUB+= X11="" CONFIGURE_ARGS+= --enable-storage=fatty .endif -.for _x in x xft gtk2 gtk3 qt5 qt6 anthy canna m17nlib prime scim dict +.for _x in x xft gtk3 gtk4 qt5 qt6 anthy anthy-utf8 canna m17nlib scim dict .if ${CONFIGURE_ARGS:M--with-${_x}} == "" CONFIGURE_ARGS+=--without-${_x} .endif .endfor -.for _x in gnome-applet kde-applet emacs pref +.for _x in gnome3-applet kde5-applet emacs pref .if ${CONFIGURE_ARGS:M--enable-${_x}} == "" CONFIGURE_ARGS+=--disable-${_x} .endif diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo index 427cf96e7581..84a08c2413f6 100644 --- a/textproc/uim/distinfo +++ b/textproc/uim/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1747549318 -SHA256 (uim-uim-1.9.6_GH0.tar.gz) = b982dc4eb3b3f31799299e1d1dd5b953c617aa13f41781273998584d0a35bf20 -SIZE (uim-uim-1.9.6_GH0.tar.gz) = 4163170 +TIMESTAMP = 1789891850 +SHA256 (uim-uim-1.9.7_GH0.tar.gz) = 19382d84944dbc55e0a09867229721267fa3c2671e2a451c28e50d5f981cb7b7 +SIZE (uim-uim-1.9.7_GH0.tar.gz) = 4017422 SHA256 (uim-sigscheme-ccf1f92_GH0.tar.gz) = 320e0e9af6c64fb9fa2b58643792b9ed5b66b9add3ed233a391b6a2518a6313f SIZE (uim-sigscheme-ccf1f92_GH0.tar.gz) = 570780 SHA256 (uim-libgcroots-f019129_GH0.tar.gz) = b88a61336ddf230b083f7185eb94aa0f1d3168204a84d35578eccaf0a61c1800 diff --git a/textproc/uim/files/patch-autogen.sh b/textproc/uim/files/patch-autogen.sh deleted file mode 100644 index 38c1ef7aa378..000000000000 --- a/textproc/uim/files/patch-autogen.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- autogen.sh.orig 2025-02-23 08:00:09 UTC -+++ autogen.sh -@@ -3,9 +3,6 @@ ${AUTORECONF:-autoreconf} --force --install "$@" - set -e - - ${AUTORECONF:-autoreconf} --force --install "$@" --# WORKAROUND: intltool-merge creates .intltool-merge-cache.lock but --# it's not listed in mostlyclean in po/Makefile.in.in. It causes a --# "make distcheck" failure. --sed -i.bak -e 's/ \.intltool-merge-cache$/ .intltool-merge-cache{,.lock}/g' \ -- po/Makefile.in.in --rm -f po/Makefile.in.in.bak -+if command -v intltoolize >/dev/null; then -+ intltoolize --copy --force --automake -+fi diff --git a/textproc/uim/files/patch-configure.ac b/textproc/uim/files/patch-configure.ac index d0447119aa33..9aff480a0216 100644 --- a/textproc/uim/files/patch-configure.ac +++ b/textproc/uim/files/patch-configure.ac @@ -1,20 +1,20 @@ ---- configure.ac.orig 2025-04-13 09:17:52 UTC +--- configure.ac.orig 2026-09-20 00:33:22 UTC +++ configure.ac -@@ -124,7 +124,7 @@ if test "x$with_anthy" = xyes; then - if test "x$with_anthy" = xyes; then +@@ -126,7 +126,7 @@ if test "x$with_anthy" = xyes; then ANTHY_LIBS="-lanthy -lanthydic" ANTHY_CFLAGS="" -- PKG_CHECK_EXISTS(anthy >= 8622, -+ PKG_CHECK_EXISTS(anthy >= 0.4, - [AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1, - "libanthy can handle UTF-8")]) - fi -@@ -146,7 +146,7 @@ if test "x$with_anthy_utf8" != xno; then - [with_anthy_utf8=yes - AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1, - [libanthy-unicode can handle UTF-8])], -- [PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 8622, -+ [PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 0.4, - [with_anthy_utf8=yes - AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1, - [libanthy can handle UTF-8])], + PKG_CHECK_EXISTS( +- anthy >= 8622, ++ anthy >= 1.0, + [AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1, "libanthy can handle UTF-8")], + [PKG_CHECK_EXISTS( + anthy < 1000, # https://salsa.debian.org/debian/anthy supports UTF-8. +@@ -154,7 +154,7 @@ if test "x$with_anthy_utf8" != xno; then + [libanthy-unicode can handle UTF-8])], + [PKG_CHECK_MODULES( + ANTHY_UTF8, +- anthy >= 8622, ++ anthy >= 1.0, + [with_anthy_utf8=yes + AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1, [libanthy can handle UTF-8])], + [PKG_CHECK_MODULES( diff --git a/textproc/uim/files/patch-gtk2_candwin_Makefile.am b/textproc/uim/files/patch-gtk2_candwin_Makefile.am deleted file mode 100644 index d1c8ba27c952..000000000000 --- a/textproc/uim/files/patch-gtk2_candwin_Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ ---- gtk2/candwin/Makefile.am.orig 2025-05-18 07:54:29 UTC -+++ gtk2/candwin/Makefile.am -@@ -9,24 +9,21 @@ uim_candwin_gtk_SOURCES = gtk.c \ - uim_candwin_gtk_SOURCES = gtk.c \ - ../immodule/caret-state-indicator.c \ - ../immodule/caret-state-indicator.h --uim_candwin_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ -- $(top_builddir)/uim/libuim.la -+uim_candwin_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim - uim_candwin_gtk_CPPFLAGS = $(AM_CPPFLAGS) - uim_candwin_gtk_CFLAGS = @GTK2_CFLAGS@ - - uim_candwin_tbl_gtk_SOURCES = tbl-gtk.c \ - ../immodule/caret-state-indicator.c \ - ../immodule/caret-state-indicator.h --uim_candwin_tbl_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ -- $(top_builddir)/uim/libuim.la -+uim_candwin_tbl_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim - uim_candwin_tbl_gtk_CPPFLAGS = $(AM_CPPFLAGS) - uim_candwin_tbl_gtk_CFLAGS = @GTK2_CFLAGS@ - - uim_candwin_horizontal_gtk_SOURCES = horizontal-gtk.c \ - ../immodule/caret-state-indicator.c \ - ../immodule/caret-state-indicator.h --uim_candwin_horizontal_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ -- $(top_builddir)/uim/libuim.la -lm -+uim_candwin_horizontal_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim -lm - uim_candwin_horizontal_gtk_CPPFLAGS = $(AM_CPPFLAGS) - uim_candwin_horizontal_gtk_CFLAGS = @GTK2_CFLAGS@ - endif diff --git a/textproc/uim/files/patch-gtk2_immodule_Makefile.am b/textproc/uim/files/patch-gtk2_immodule_Makefile.am deleted file mode 100644 index 19eb55d8de91..000000000000 --- a/textproc/uim/files/patch-gtk2_immodule_Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ ---- gtk2/immodule/Makefile.am.orig 2025-05-18 06:24:43 UTC -+++ gtk2/immodule/Makefile.am -@@ -17,9 +17,7 @@ im_uim_la_LDFLAGS = -module -avoid-version - - im_uim_la_SOURCES = $(IM_UIM_SOURCES) - im_uim_la_LDFLAGS = -module -avoid-version --im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \ -- $(top_builddir)/uim/libuim.la \ -- $(top_builddir)/uim/libuim-counted-init.la -+im_uim_la_LIBADD = -luim-scm -luim $(top_builddir)/uim/libuim-counted-init.la - if LIBUIM_X_UTIL - im_uim_la_LIBADD += $(top_builddir)/uim/libuim-x-util.la - endif diff --git a/textproc/uim/files/patch-gtk2_pad_Makefile.am b/textproc/uim/files/patch-gtk2_pad_Makefile.am deleted file mode 100644 index 8d4626e45826..000000000000 --- a/textproc/uim/files/patch-gtk2_pad_Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ ---- gtk2/pad/Makefile.am.orig 2025-05-18 06:24:43 UTC -+++ gtk2/pad/Makefile.am -@@ -7,8 +7,7 @@ uim_input_pad_ja_SOURCES = ja.c - bin_PROGRAMS = uim-input-pad-ja - - uim_input_pad_ja_SOURCES = ja.c --uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ -- $(top_builddir)/uim/libuim.la -+uim_input_pad_ja_LDADD = @GTK2_LIBS@ -luim-scm -luim - uim_input_pad_ja_CPPFLAGS = $(AM_CPPFLAGS) - uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@ - endif diff --git a/textproc/uim/files/patch-gtk2_pref_Makefile.am b/textproc/uim/files/patch-gtk2_pref_Makefile.am deleted file mode 100644 index 33219942f9d6..000000000000 --- a/textproc/uim/files/patch-gtk2_pref_Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ ---- gtk2/pref/Makefile.am.orig 2025-05-18 08:33:21 UTC -+++ gtk2/pref/Makefile.am -@@ -1,7 +1,5 @@ helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\" - helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\" - --if PREF --if GTK2_4 - AM_CPPFLAGS = \ - -I$(top_builddir)/uim \ - -I$(top_srcdir)/replace \ -@@ -14,13 +12,9 @@ uim_pref_gtk_SOURCES = gtk.c \ - gtk-keytab.h \ - ../immodule/key-util-gtk.c \ - ../immodule/key-util-gtk.h --uim_pref_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-custom.la \ -- $(top_builddir)/uim/libuim-scm.la \ -- $(top_builddir)/uim/libuim.la -+uim_pref_gtk_LDADD = @GTK2_LIBS@ -luim-custom -luim-scm -luim - if LIBUIM_X_UTIL - uim_pref_gtk_LDADD += $(top_builddir)/uim/libuim-x-util.la - endif - uim_pref_gtk_CPPFLAGS = $(helper_defs) $(AM_CPPFLAGS) - uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@ --endif --endif diff --git a/textproc/uim/files/patch-gtk2_switcher_Makefile.am b/textproc/uim/files/patch-gtk2_switcher_Makefile.am deleted file mode 100644 index 0e3a8557347e..000000000000 --- a/textproc/uim/files/patch-gtk2_switcher_Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ ---- gtk2/switcher/Makefile.am.orig 2025-05-18 07:34:02 UTC -+++ gtk2/switcher/Makefile.am -@@ -7,10 +7,7 @@ uim_im_switcher_gtk_SOURCES = gtk.c - bin_PROGRAMS = uim-im-switcher-gtk - - uim_im_switcher_gtk_SOURCES = gtk.c --uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ -- $(top_builddir)/uim/libuim-custom.la \ -- $(top_builddir)/uim/libuim-scm.la \ -- $(top_builddir)/uim/libuim.la -+uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim-custom -luim - uim_im_switcher_gtk_CPPFLAGS = $(AM_CPPFLAGS) - uim_im_switcher_gtk_CFLAGS = @GTK2_CFLAGS@ - endif diff --git a/textproc/uim/files/patch-gtk2_toolbar_Makefile.am b/textproc/uim/files/patch-gtk2_toolbar_Makefile.am deleted file mode 100644 index 412e7352e752..000000000000 --- a/textproc/uim/files/patch-gtk2_toolbar_Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ ---- gtk2/toolbar/Makefile.am.orig 2025-05-18 07:36:36 UTC -+++ gtk2/toolbar/Makefile.am -@@ -11,9 +11,7 @@ uim_toolbar_applet_LDADD = @GTK2_LIBS@ @GNOME_APPLET_L - libexec_PROGRAMS = uim-toolbar-applet - - uim_toolbar_applet_LDADD = @GTK2_LIBS@ @GNOME_APPLET_LIBS@ \ -- $(top_builddir)/uim/libuim-scm.la \ -- $(top_builddir)/uim/libuim.la \ -- $(top_builddir)/uim/libuim-custom.la -+ -luim-scm -luim -luim-custom - uim_toolbar_applet_CPPFLAGS = $(helper_defs) $(AM_CPPFLAGS) - uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @GNOME_APPLET_CFLAGS@ - if GCC -@@ -50,9 +48,7 @@ uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk - endif - - uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk.c --uim_toolbar_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ -- $(top_builddir)/uim/libuim.la \ -- $(top_builddir)/uim/libuim-custom.la -+uim_toolbar_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim -luim-custom - uim_toolbar_gtk_CPPFLAGS = $(AM_CPPFLAGS) - uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@ - -@@ -60,8 +56,6 @@ uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \ - eggtrayicon.c eggtrayicon.h - uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \ - @X11_LIBS@ \ -- $(top_builddir)/uim/libuim-scm.la \ -- $(top_builddir)/uim/libuim.la \ -- $(top_builddir)/uim/libuim-custom.la -+ -luim-scm -luim -luim-custom - uim_toolbar_gtk_systray_CPPFLAGS = $(AM_CPPFLAGS) - uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@ diff --git a/textproc/uim/files/patch-gtk3_toolbar_Makefile.am b/textproc/uim/files/patch-gtk3_toolbar_Makefile.am index ccb71767c39d..a8f642df0c3c 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 2025-05-18 07:43:25 UTC +--- gtk3/toolbar/Makefile.am.orig 2026-09-20 08:18:28 UTC +++ gtk3/toolbar/Makefile.am @@ -16,9 +16,7 @@ libuim_toolbar_applet_gnome3_la_LIBADD = @GTK3_LIBS@ @ xmlui_DATA = uim-applet-menu.xml @@ -11,7 +11,7 @@ libuim_toolbar_applet_gnome3_la_CPPFLAGS = \ -DUIM_UIDATADIR="\"${xmluidir}\"" \ $(helper_defs) $(AM_CPPFLAGS) -@@ -55,9 +53,7 @@ uim_toolbar_gtk3_SOURCES = standalone-gtk.c common-gt +@@ -57,9 +55,7 @@ uim_toolbar_gtk3_SOURCES = standalone-gtk.c common-gt if GTK3 bin_PROGRAMS = uim-toolbar-gtk3 uim-toolbar-gtk3-systray uim_toolbar_gtk3_SOURCES = standalone-gtk.c common-gtk.c @@ -22,7 +22,7 @@ uim_toolbar_gtk3_CPPFLAGS = $(AM_CPPFLAGS) uim_toolbar_gtk3_CFLAGS = @GTK3_CFLAGS@ -@@ -67,9 +63,7 @@ uim_toolbar_gtk3_systray_LDADD = @GTK3_LIBS@ \ +@@ -69,9 +65,7 @@ uim_toolbar_gtk3_systray_LDADD = @GTK3_LIBS@ \ eggtrayicon.h uim_toolbar_gtk3_systray_LDADD = @GTK3_LIBS@ \ @X11_LIBS@ \ diff --git a/textproc/uim/files/patch-gtk4_immodule_Makefile.am b/textproc/uim/files/patch-gtk4_immodule_Makefile.am new file mode 100644 index 000000000000..d470694ac528 --- /dev/null +++ b/textproc/uim/files/patch-gtk4_immodule_Makefile.am @@ -0,0 +1,13 @@ +--- gtk4/immodule/Makefile.am.orig 2026-09-20 13:23:35 UTC ++++ gtk4/immodule/Makefile.am +@@ -15,8 +15,8 @@ libim_uim_la_LDFLAGS = -module -avoid-version + + libim_uim_la_SOURCES = $(LIBIM_UIM_SOURCES) + libim_uim_la_LDFLAGS = -module -avoid-version +-libim_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \ +- $(top_builddir)/uim/libuim.la \ ++libim_uim_la_LIBADD = -luim-scm \ ++ -luim \ + $(top_builddir)/uim/libuim-counted-init.la + libim_uim_la_LIBADD += @GTK4_LIBS@ + libim_uim_la_LIBADD += -lm diff --git a/textproc/uim/files/patch-qt5_applet_Makefile.am b/textproc/uim/files/patch-qt5_applet_Makefile.am index 99667e926f6f..f595d62ad040 100644 --- a/textproc/uim/files/patch-qt5_applet_Makefile.am +++ b/textproc/uim/files/patch-qt5_applet_Makefile.am @@ -1,12 +1,13 @@ ---- qt5/applet/Makefile.am.orig 2022-05-04 19:18:08 UTC +--- qt5/applet/Makefile.am.orig 2026-09-20 08:18:28 UTC +++ qt5/applet/Makefile.am -@@ -6,6 +6,8 @@ EXTRA_DIST = \ - plasmoid +@@ -7,7 +7,9 @@ if KDE5_APPLET if QT5 + if KDE5_APPLET -all clean install uninstall: +all clean uninstall: $(MAKE) $(AM_MAKEFLAGS) -C ../applet.cmake $@ +install: + $(MAKE) $(AM_MAKEFLAGS) -C ../applet.cmake install/strip endif + endif diff --git a/textproc/uim/files/patch-scm_Makefile.am b/textproc/uim/files/patch-scm_Makefile.am new file mode 100644 index 000000000000..a7f4bce3d292 --- /dev/null +++ b/textproc/uim/files/patch-scm_Makefile.am @@ -0,0 +1,10 @@ +--- scm/Makefile.am.orig 2026-09-20 10:05:02 UTC ++++ scm/Makefile.am +@@ -26,7 +26,6 @@ SCM_FILES = plugin.scm im.scm im-custom.scm lazy-load. + japanese-act-utf8.scm japanese-kzik-utf8.scm \ + anthy.scm anthy-custom.scm anthy-key-custom.scm \ + anthy-utf8.scm anthy-utf8-custom.scm \ +- mozc.scm mozc-custom.scm mozc-key-custom.scm \ + canna.scm cannav3-socket.scm canna-custom.scm canna-key-custom.scm \ + wnn.scm wnn-custom.scm wnn-key-custom.scm \ + skk.scm skk-editor.scm skk-custom.scm skk-key-custom.scm skk-dialog.scm \ diff --git a/textproc/uim/files/patch-scm_sj3-custom.scm b/textproc/uim/files/patch-scm_sj3-custom.scm deleted file mode 100644 index 53c1f4995ec0..000000000000 --- a/textproc/uim/files/patch-scm_sj3-custom.scm +++ /dev/null @@ -1,11 +0,0 @@ ---- scm/sj3-custom.scm.orig 2013-06-30 04:26:09 UTC -+++ scm/sj3-custom.scm -@@ -339,7 +339,7 @@ - (N_ "SJ3 user name") - (N_ "long description will be here.")) - --(define-custom 'sj3-unix-domain-socket-path "/var/sj3/run/sj3serv.socket" -+(define-custom 'sj3-unix-domain-socket-path "/var/run/sj3/socket" - '(sj3-advanced sj3server) - '(string ".*") - (N_ "SJ3 server socket path") diff --git a/textproc/uim/files/patch-uim_Makefile.am b/textproc/uim/files/patch-uim_Makefile.am index 2d9fb25b4f06..1f2f7a399375 100644 --- a/textproc/uim/files/patch-uim_Makefile.am +++ b/textproc/uim/files/patch-uim_Makefile.am @@ -1,29 +1,29 @@ ---- uim/Makefile.am.orig 2025-05-18 07:54:29 UTC +--- uim/Makefile.am.orig 2026-09-20 08:21:15 UTC +++ uim/Makefile.am @@ -86,7 +86,7 @@ if M17NLIB if M17NLIB - uim_plugin_LTLIBRARIES += libuim-m17nlib.la + uimplugin_LTLIBRARIES += libuim-m17nlib.la libuim_m17nlib_la_SOURCES = m17nlib.c - libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ libuim-scm.la libuim.la + libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ -luim-scm -luim - libuim_m17nlib_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module + libuim_m17nlib_la_LDFLAGS = -rpath $(uimplugindir) -avoid-version -module libuim_m17nlib_la_CPPFLAGS = $(AM_CPPFLAGS) @M17NLIB_CFLAGS@ endif @@ -105,7 +105,7 @@ else else - uim_plugin_LTLIBRARIES += libuim-anthy.la + uimplugin_LTLIBRARIES += libuim-anthy.la libuim_anthy_la_SOURCES = anthy.c - libuim_anthy_la_LIBADD = @ANTHY_LIBS@ libuim-scm.la libuim.la + libuim_anthy_la_LIBADD = @ANTHY_LIBS@ -luim-scm -luim - libuim_anthy_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module + libuim_anthy_la_LDFLAGS = -rpath $(uimplugindir) -avoid-version -module libuim_anthy_la_CPPFLAGS = $(AM_CPPFLAGS) endif @@ -117,7 +117,7 @@ else else - uim_plugin_LTLIBRARIES += libuim-anthy-utf8.la + uimplugin_LTLIBRARIES += libuim-anthy-utf8.la libuim_anthy_utf8_la_SOURCES = anthy-utf8.c - libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ libuim-scm.la libuim.la + libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ -luim-scm -luim - libuim_anthy_utf8_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module + libuim_anthy_utf8_la_LDFLAGS = -rpath $(uimplugindir) -avoid-version -module libuim_anthy_utf8_la_CPPFLAGS = $(AM_CPPFLAGS) @ANTHY_UTF8_CFLAGS@ endif diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist index 38d14a7938d9..14561e8b50a5 100644 --- a/textproc/uim/pkg-plist +++ b/textproc/uim/pkg-plist @@ -58,9 +58,6 @@ share/locale/ko/LC_MESSAGES/uim.mo %%PORTDOCS%%%%DOCSDIR%%/README.key %%PORTDOCS%%%%DOCSDIR%%/README.xim %%DATADIR%%/action.scm -%%DATADIR%%/ajax-ime-custom.scm -%%DATADIR%%/ajax-ime-key-custom.scm -%%DATADIR%%/ajax-ime.scm %%DATADIR%%/annotation-custom.scm %%DATADIR%%/annotation-dict.scm %%DATADIR%%/annotation-eb.scm @@ -83,7 +80,6 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/canna-key-custom.scm %%DATADIR%%/canna.scm %%DATADIR%%/cannav3-socket.scm -%%DATADIR%%/composer.scm %%DATADIR%%/ct.scm %%DATADIR%%/custom-rt.scm %%DATADIR%%/custom.scm @@ -96,7 +92,6 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/elatin-custom.scm %%DATADIR%%/elatin-rules.scm %%DATADIR%%/elatin.scm -%%DATADIR%%/event.scm %%DATADIR%%/fileio.scm %%DATADIR%%/generic-custom.scm %%DATADIR%%/generic-key-custom.scm @@ -109,7 +104,6 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/hangul2.scm %%DATADIR%%/hangul3.scm %%DATADIR%%/http-client.scm -%%DATADIR%%/http-server.scm %%DATADIR%%/i18n.scm %%DATADIR%%/ichar.scm %%DATADIR%%/im-custom.scm @@ -121,11 +115,16 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/ipa-x-sampa.scm %%DATADIR%%/iso-639-1.scm %%DATADIR%%/japanese-act.scm +%%DATADIR%%/japanese-act-utf8.scm %%DATADIR%%/japanese-azik.scm +%%DATADIR%%/japanese-azik-utf8.scm %%DATADIR%%/japanese-custom.scm %%DATADIR%%/japanese-kana.scm +%%DATADIR%%/japanese-kana-utf8.scm %%DATADIR%%/japanese-kzik.scm +%%DATADIR%%/japanese-kzik-utf8.scm %%DATADIR%%/japanese.scm +%%DATADIR%%/japanese-utf8.scm %%DATADIR%%/json-parser-expanded.scm %%DATADIR%%/json.scm %%DATADIR%%/key.scm @@ -148,17 +147,9 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/look.scm %%DATADIR%%/m17nlib.scm %%DATADIR%%/m17nlib-custom.scm -%%DATADIR%%/mana-custom.scm -%%DATADIR%%/mana-key-custom.scm -%%DATADIR%%/mana.scm -%%DATADIR%%/match.scm -%%DATADIR%%/ng-action.scm -%%DATADIR%%/ng-key.scm %%DATADIR%%/openssl.scm %%DATADIR%%/packrat.scm %%DATADIR%%/pinyin-big5.scm -%%DATADIR%%/pixmaps/ajax-ime.png -%%DATADIR%%/pixmaps/ajax-ime.svg %%DATADIR%%/pixmaps/anthy.png %%DATADIR%%/pixmaps/baidu-olime-jp.png %%DATADIR%%/pixmaps/baidu-olime-jp.svg @@ -250,8 +241,6 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/pixmaps/latin.svg %%DATADIR%%/pixmaps/look.png %%DATADIR%%/pixmaps/look.svg -%%DATADIR%%/pixmaps/mana.png -%%DATADIR%%/pixmaps/mana.svg %%DATADIR%%/pixmaps/null.png %%DATADIR%%/pixmaps/off.png %%DATADIR%%/pixmaps/off.svg @@ -263,11 +252,6 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/pixmaps/on_dark_background.svg %%DATADIR%%/pixmaps/pinyin-big5.png %%DATADIR%%/pixmaps/pinyin-big5.svg -%%DATADIR%%/pixmaps/prime.png -%%DATADIR%%/pixmaps/prime_mode_application.png -%%DATADIR%%/pixmaps/prime_mode_application.svg -%%DATADIR%%/pixmaps/prime_mode_application_dark_background.png -%%DATADIR%%/pixmaps/prime_mode_application_dark_background.svg %%DATADIR%%/pixmaps/py.png %%DATADIR%%/pixmaps/py.svg %%DATADIR%%/pixmaps/pyunihan.png @@ -276,8 +260,6 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/pixmaps/romaja.svg %%DATADIR%%/pixmaps/scim.png %%DATADIR%%/pixmaps/scim.svg -%%DATADIR%%/pixmaps/sj3.png -%%DATADIR%%/pixmaps/sj3.svg %%DATADIR%%/pixmaps/skk.png %%DATADIR%%/pixmaps/skk.svg %%DATADIR%%/pixmaps/skk_dark_background.png @@ -298,6 +280,7 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/pixmaps/uim-dict.svg %%DATADIR%%/pixmaps/uim-gray.png %%DATADIR%%/pixmaps/uim-icon.png +%%DATADIR%%/pixmaps/uim-icon.svg %%DATADIR%%/pixmaps/uim-icon48.png %%DATADIR%%/pixmaps/uim-icon64.png %%DATADIR%%/pixmaps/unknown.png @@ -312,8 +295,6 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/pixmaps/wb86_dark_background.svg %%DATADIR%%/pixmaps/wnn.png %%DATADIR%%/pixmaps/wnn.svg -%%DATADIR%%/pixmaps/yahoo-jp.png -%%DATADIR%%/pixmaps/yahoo-jp.svg %%DATADIR%%/pixmaps/zm.png %%DATADIR%%/pixmaps/zm.svg %%DATADIR%%/pixmaps/zm_dark_background.png @@ -326,20 +307,12 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/predict-look-skk.scm %%DATADIR%%/predict-look.scm %%DATADIR%%/predict-sqlite3.scm -%%DATADIR%%/pregexp.scm -%%DATADIR%%/prime-custom.scm -%%DATADIR%%/prime-key-custom.scm -%%DATADIR%%/prime.scm %%DATADIR%%/process.scm %%DATADIR%%/py.scm %%DATADIR%%/pyload.scm %%DATADIR%%/pyunihan.scm %%DATADIR%%/rk.scm %%DATADIR%%/romaja.scm -%%DATADIR%%/sj3-custom.scm -%%DATADIR%%/sj3-key-custom.scm -%%DATADIR%%/sj3.scm -%%DATADIR%%/sj3v2-socket.scm %%DATADIR%%/skk-custom.scm %%DATADIR%%/skk-dialog.scm %%DATADIR%%/skk-editor.scm @@ -347,10 +320,7 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/skk.scm %%DATADIR%%/socket.scm %%DATADIR%%/sqlite3.scm -%%DATADIR%%/sxml-tools.scm -%%DATADIR%%/sxpathlib.scm %%DATADIR%%/tcode.scm -%%DATADIR%%/trec.scm %%DATADIR%%/trycode.scm %%DATADIR%%/tutcode-bushu.scm %%DATADIR%%/tutcode-bushudic.scm @@ -375,8 +345,4 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/wnn.scm %%DATADIR%%/xkb.scm %%DATADIR%%/xmload.scm -%%DATADIR%%/yahoo-jp-custom.scm -%%DATADIR%%/yahoo-jp-key-custom.scm -%%DATADIR%%/yahoo-jp.scm -%%DATADIR%%/zaurus.scm @dir %%DATADIR%%/helperdata |
