diff options
26 files changed, 104 insertions, 90 deletions
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index 7c4f0838e183..7a570bcd4def 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -1,7 +1,7 @@ PORTNAME= mozc PORTVERSION= 2.23.2815.102.01 DISTVERSIONPREFIX= v -PORTREVISION?= 29 +PORTREVISION?= 30 CATEGORIES= japanese MAINTAINER= hrs@FreeBSD.org diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile index 6a9f974c39e7..5e8ccb38339c 100644 --- a/japanese/scim-uim/Makefile +++ b/japanese/scim-uim/Makefile @@ -1,6 +1,6 @@ PORTNAME= scim-uim PORTVERSION= 0.2.0 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= japanese MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION} \ http://freedesktop.org/~suzhe/sources/ diff --git a/japanese/uim-mozc/Makefile b/japanese/uim-mozc/Makefile index 8813a8bc0213..e7d2e477909f 100644 --- a/japanese/uim-mozc/Makefile +++ b/japanese/uim-mozc/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 10 +PORTREVISION= 11 PKGNAMEPREFIX= ja-uim- COMMENT= Mozc engine for uim diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile index b84514ab44ce..34bddcff2d7e 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= 23 +PORTREVISION= 24 CATEGORIES= japanese MASTER_SITES= SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile index f82792bc976f..fcd45f416f37 100644 --- a/textproc/uim-el/Makefile +++ b/textproc/uim-el/Makefile @@ -1,5 +1,5 @@ PORTNAME= uim-el -PORTVERSION= 1.9.3 +PORTVERSION= 1.9.6 CATEGORIES= textproc PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo index c44b7f345200..63365d31d133 100644 --- a/textproc/uim-el/distinfo +++ b/textproc/uim-el/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746443050 -SHA256 (uim-uim-1.9.3_GH0.tar.gz) = 314d30101ac83dfbd5b8e3805f065dc34e0b2ed7b356ed6412f611e2d96b9d35 -SIZE (uim-uim-1.9.3_GH0.tar.gz) = 4052603 +TIMESTAMP = 1747554528 +SHA256 (uim-uim-1.9.6_GH0.tar.gz) = b982dc4eb3b3f31799299e1d1dd5b953c617aa13f41781273998584d0a35bf20 +SIZE (uim-uim-1.9.6_GH0.tar.gz) = 4163170 diff --git a/textproc/uim-el/files/patch-emacs_Makefile.am b/textproc/uim-el/files/patch-emacs_Makefile.am index 9edaeaaa6f40..10eacfe8895e 100644 --- a/textproc/uim-el/files/patch-emacs_Makefile.am +++ b/textproc/uim-el/files/patch-emacs_Makefile.am @@ -1,20 +1,22 @@ ---- emacs/Makefile.am.orig 2021-04-29 12:52:58 UTC +--- emacs/Makefile.am.orig 2025-05-18 07:48:51 UTC +++ emacs/Makefile.am -@@ -1,13 +1,11 @@ +@@ -1,6 +1,5 @@ EXTRA_DIST = README.ja uim-version.el.in EXTRA_DIST = README.ja uim-version.el.in -if UIM_EL - - uimel_lispdir = $(UIMEL_LISP_DIR) - dist_uimel_lisp_DATA = uim.el uim-var.el uim-version.el uim-keymap.el \ + AM_CPPFLAGS = \ + -I$(top_builddir)/uim \ + -I$(top_srcdir)/replace \ +@@ -11,8 +10,6 @@ dist_uimel_lisp_DATA = uim.el uim-var.el uim-version.e uim-key.el uim-util.el \ uim-candidate.el uim-preedit.el uim-debug.el uim-leim.el uim-helper.el -bin_PROGRAMS = uim-el-agent uim-el-helper-agent - +- uim_el_agent_SOURCES = uim-el-agent.c debug.c output.c context.c preedit.c \ key.c candidate.c encoding.c im.c callback.c commit.c \ -@@ -27,4 +25,3 @@ uim_el_helper_agent_CPPFLAGS = -I$(top_srcdir) + helper.c prop.c helper-message.c callback.h candidate.h commit.h context.h \ +@@ -31,4 +28,3 @@ uim_el_helper_agent_LDADD = $(top_builddir)/uim/libuim uim_el_helper_agent_LDADD = $(top_builddir)/uim/libuim-scm.la \ $(top_builddir)/uim/libuim.la diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 9fa042279485..50051c7a8ed4 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -1,5 +1,5 @@ PORTNAME= uim -PORTVERSION= 1.9.3 +PORTVERSION= 1.9.6 CATEGORIES?= textproc .if !defined(UIM_SLAVE) && defined(WITHOUT_X11) PKGNAMESUFFIX= -nox11 diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo index 50fcefff1b04..427cf96e7581 100644 --- a/textproc/uim/distinfo +++ b/textproc/uim/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1746442886 -SHA256 (uim-uim-1.9.3_GH0.tar.gz) = 314d30101ac83dfbd5b8e3805f065dc34e0b2ed7b356ed6412f611e2d96b9d35 -SIZE (uim-uim-1.9.3_GH0.tar.gz) = 4052603 +TIMESTAMP = 1747549318 +SHA256 (uim-uim-1.9.6_GH0.tar.gz) = b982dc4eb3b3f31799299e1d1dd5b953c617aa13f41781273998584d0a35bf20 +SIZE (uim-uim-1.9.6_GH0.tar.gz) = 4163170 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-emacs_Makefile.am b/textproc/uim/files/patch-emacs_Makefile.am index 5f49dcd48461..07841fa725c4 100644 --- a/textproc/uim/files/patch-emacs_Makefile.am +++ b/textproc/uim/files/patch-emacs_Makefile.am @@ -1,7 +1,7 @@ ---- emacs/Makefile.am.orig 2021-04-29 07:41:09 UTC +--- emacs/Makefile.am.orig 2025-05-18 06:22:16 UTC +++ emacs/Makefile.am -@@ -3,9 +3,6 @@ EXTRA_DIST = README.ja uim-version.el.in - if UIM_EL +@@ -7,9 +7,6 @@ uimel_lispdir = $(UIMEL_LISP_DIR) + -I$(top_srcdir) uimel_lispdir = $(UIMEL_LISP_DIR) -dist_uimel_lisp_DATA = uim.el uim-var.el uim-version.el uim-keymap.el \ diff --git a/textproc/uim/files/patch-gtk2_candwin_Makefile.am b/textproc/uim/files/patch-gtk2_candwin_Makefile.am index ad5f2e9a3ee3..d1c8ba27c952 100644 --- a/textproc/uim/files/patch-gtk2_candwin_Makefile.am +++ b/textproc/uim/files/patch-gtk2_candwin_Makefile.am @@ -1,13 +1,13 @@ ---- gtk2/candwin/Makefile.am.orig 2021-04-30 14:25:14 UTC +--- gtk2/candwin/Makefile.am.orig 2025-05-18 07:54:29 UTC +++ gtk2/candwin/Makefile.am -@@ -4,24 +4,21 @@ libexec_PROGRAMS = uim-candwin-gtk uim-candwin-tbl-gtk +@@ -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 = -I$(top_srcdir) + uim_candwin_gtk_CPPFLAGS = $(AM_CPPFLAGS) uim_candwin_gtk_CFLAGS = @GTK2_CFLAGS@ uim_candwin_tbl_gtk_SOURCES = tbl-gtk.c \ @@ -16,7 +16,7 @@ -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 = -I$(top_srcdir) + uim_candwin_tbl_gtk_CPPFLAGS = $(AM_CPPFLAGS) uim_candwin_tbl_gtk_CFLAGS = @GTK2_CFLAGS@ uim_candwin_horizontal_gtk_SOURCES = horizontal-gtk.c \ @@ -25,6 +25,6 @@ -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 = -I$(top_srcdir) + 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 index ef57c8f1640d..19eb55d8de91 100644 --- a/textproc/uim/files/patch-gtk2_immodule_Makefile.am +++ b/textproc/uim/files/patch-gtk2_immodule_Makefile.am @@ -1,6 +1,6 @@ ---- gtk2/immodule/Makefile.am.orig 2021-04-29 16:18:54 UTC +--- gtk2/immodule/Makefile.am.orig 2025-05-18 06:24:43 UTC +++ gtk2/immodule/Makefile.am -@@ -12,9 +12,7 @@ module_LTLIBRARIES = $(im_uim_la) +@@ -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 diff --git a/textproc/uim/files/patch-gtk2_pad_Makefile.am b/textproc/uim/files/patch-gtk2_pad_Makefile.am index bc1e8cd65c93..8d4626e45826 100644 --- a/textproc/uim/files/patch-gtk2_pad_Makefile.am +++ b/textproc/uim/files/patch-gtk2_pad_Makefile.am @@ -1,12 +1,12 @@ ---- gtk2/pad/Makefile.am.orig 2021-04-29 15:53:36 UTC +--- gtk2/pad/Makefile.am.orig 2025-05-18 06:24:43 UTC +++ gtk2/pad/Makefile.am -@@ -2,8 +2,7 @@ if GTK2 +@@ -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 = -I$(top_srcdir) -I$(top_builddir) + 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 index 30164eaf459b..33219942f9d6 100644 --- a/textproc/uim/files/patch-gtk2_pref_Makefile.am +++ b/textproc/uim/files/patch-gtk2_pref_Makefile.am @@ -1,6 +1,14 @@ ---- gtk2/pref/Makefile.am.orig 2021-04-29 15:56:45 UTC +--- gtk2/pref/Makefile.am.orig 2025-05-18 08:33:21 UTC +++ gtk2/pref/Makefile.am -@@ -9,9 +9,7 @@ uim_pref_gtk_SOURCES = gtk.c \ +@@ -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 @@ -11,3 +19,7 @@ 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 index f4915bbaa3b5..0e3a8557347e 100644 --- a/textproc/uim/files/patch-gtk2_switcher_Makefile.am +++ b/textproc/uim/files/patch-gtk2_switcher_Makefile.am @@ -1,6 +1,6 @@ ---- gtk2/switcher/Makefile.am.orig 2021-04-29 15:59:54 UTC +--- gtk2/switcher/Makefile.am.orig 2025-05-18 07:34:02 UTC +++ gtk2/switcher/Makefile.am -@@ -2,10 +2,7 @@ if GTK2 +@@ -7,10 +7,7 @@ uim_im_switcher_gtk_SOURCES = gtk.c bin_PROGRAMS = uim-im-switcher-gtk uim_im_switcher_gtk_SOURCES = gtk.c @@ -9,6 +9,6 @@ - $(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 = -I$(top_srcdir) -I$(top_builddir) + 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 index 639b1596ee6e..412e7352e752 100644 --- a/textproc/uim/files/patch-gtk2_toolbar_Makefile.am +++ b/textproc/uim/files/patch-gtk2_toolbar_Makefile.am @@ -1,6 +1,6 @@ ---- gtk2/toolbar/Makefile.am.orig 2022-05-04 18:55:24 UTC +--- gtk2/toolbar/Makefile.am.orig 2025-05-18 07:36:36 UTC +++ gtk2/toolbar/Makefile.am -@@ -6,9 +6,7 @@ if GNOME_APPLET +@@ -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@ \ @@ -8,10 +8,10 @@ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la + -luim-scm -luim -luim-custom - uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) + uim_toolbar_applet_CPPFLAGS = $(helper_defs) $(AM_CPPFLAGS) uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @GNOME_APPLET_CFLAGS@ if GCC -@@ -45,9 +43,7 @@ bin_PROGRAMS = uim-toolbar-gtk uim-toolbar-gtk-systray +@@ -50,9 +48,7 @@ uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk endif uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk.c @@ -19,10 +19,10 @@ - $(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 = -I$(top_srcdir) -I$(top_builddir) + uim_toolbar_gtk_CPPFLAGS = $(AM_CPPFLAGS) uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@ -@@ -55,8 +51,6 @@ uim_toolbar_gtk_systray_SOURCES = systray-gtk.c commo +@@ -60,8 +56,6 @@ uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \ eggtrayicon.c eggtrayicon.h uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \ @X11_LIBS@ \ @@ -30,5 +30,5 @@ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la + -luim-scm -luim -luim-custom - uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_toolbar_gtk_systray_CPPFLAGS = $(AM_CPPFLAGS) uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@ diff --git a/textproc/uim/files/patch-gtk3_dict_Makefile.am b/textproc/uim/files/patch-gtk3_dict_Makefile.am index 2069d023d223..2f75340e9cba 100644 --- a/textproc/uim/files/patch-gtk3_dict_Makefile.am +++ b/textproc/uim/files/patch-gtk3_dict_Makefile.am @@ -1,12 +1,12 @@ ---- gtk3/dict/Makefile.am.orig 2021-04-29 13:55:45 UTC +--- gtk3/dict/Makefile.am.orig 2025-05-18 07:39:28 UTC +++ gtk3/dict/Makefile.am -@@ -19,8 +19,7 @@ uim_dict_gtk3_SOURCES = ../../gtk2/dict/main-gtk.c \ - ../../gtk2/dict/cclass-dialog.c \ - ../../gtk2/dict/cclass-dialog.h - +@@ -26,8 +26,7 @@ uim_dict_gtk3_SOURCES = main-gtk.c \ + cclass-dialog.c \ + cclass-dialog.h + -uim_dict_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_dict_gtk3_LDADD = @GTK3_LIBS@ -luim-scm -luim - uim_dict_gtk3_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) + uim_dict_gtk3_CPPFLAGS = $(helper_defs) $(AM_CPPFLAGS) uim_dict_gtk3_CFLAGS = @GTK3_CFLAGS@ uim_dict_uidir = $(datadir)/uim/helperdata diff --git a/textproc/uim/files/patch-gtk3_immodule_Makefile.am b/textproc/uim/files/patch-gtk3_immodule_Makefile.am index e9db25d1594f..af7ee1a98c27 100644 --- a/textproc/uim/files/patch-gtk3_immodule_Makefile.am +++ b/textproc/uim/files/patch-gtk3_immodule_Makefile.am @@ -1,6 +1,6 @@ ---- gtk3/immodule/Makefile.am.orig 2021-04-30 14:45:56 UTC +--- gtk3/immodule/Makefile.am.orig 2025-05-18 07:40:15 UTC +++ gtk3/immodule/Makefile.am -@@ -11,9 +11,7 @@ module_LTLIBRARIES = $(im_uim_la) +@@ -16,9 +16,7 @@ im_uim_la_LDFLAGS = -module -avoid-version im_uim_la_SOURCES = $(IM_UIM_SOURCES) im_uim_la_LDFLAGS = -module -avoid-version diff --git a/textproc/uim/files/patch-gtk3_pad_Makefile.am b/textproc/uim/files/patch-gtk3_pad_Makefile.am index eb73f0a1e568..30dda5d8bd34 100644 --- a/textproc/uim/files/patch-gtk3_pad_Makefile.am +++ b/textproc/uim/files/patch-gtk3_pad_Makefile.am @@ -1,12 +1,12 @@ ---- gtk3/pad/Makefile.am.orig 2021-04-30 14:51:47 UTC +--- gtk3/pad/Makefile.am.orig 2025-05-18 07:40:15 UTC +++ gtk3/pad/Makefile.am -@@ -1,8 +1,7 @@ - if GTK3 +@@ -6,8 +6,7 @@ uim_input_pad_ja_gtk3_SOURCES = ja.c + bin_PROGRAMS = uim-input-pad-ja-gtk3 - uim_input_pad_ja_gtk3_SOURCES = ../../gtk2/pad/ja.c + uim_input_pad_ja_gtk3_SOURCES = ja.c -uim_input_pad_ja_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_input_pad_ja_gtk3_LDADD = @GTK3_LIBS@ -luim-scm -luim - uim_input_pad_ja_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_input_pad_ja_gtk3_CPPFLAGS = $(AM_CPPFLAGS) uim_input_pad_ja_gtk3_CFLAGS = @GTK3_CFLAGS@ diff --git a/textproc/uim/files/patch-gtk3_pref_Makefile.am b/textproc/uim/files/patch-gtk3_pref_Makefile.am index 9203590f85ab..38293b84fbcc 100644 --- a/textproc/uim/files/patch-gtk3_pref_Makefile.am +++ b/textproc/uim/files/patch-gtk3_pref_Makefile.am @@ -1,9 +1,9 @@ ---- gtk3/pref/Makefile.am.orig 2021-04-30 14:54:42 UTC +--- gtk3/pref/Makefile.am.orig 2025-05-18 07:41:20 UTC +++ gtk3/pref/Makefile.am -@@ -10,9 +10,7 @@ uim_pref_gtk3_SOURCES = ../../gtk2/pref/gtk.c \ - ../../gtk2/pref/gtk-keytab.h \ - ../../gtk2/immodule/key-util-gtk.c \ - ../../gtk2/immodule/key-util-gtk.h +@@ -14,9 +14,7 @@ uim_pref_gtk3_SOURCES = gtk.c \ + gtk-keytab.h \ + ../immodule/key-util-gtk.c \ + ../immodule/key-util-gtk.h -uim_pref_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-custom.la \ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la diff --git a/textproc/uim/files/patch-gtk3_switcher_Makefile.am b/textproc/uim/files/patch-gtk3_switcher_Makefile.am index fcab2c96bd00..da5000fcaf1b 100644 --- a/textproc/uim/files/patch-gtk3_switcher_Makefile.am +++ b/textproc/uim/files/patch-gtk3_switcher_Makefile.am @@ -1,14 +1,14 @@ ---- gtk3/switcher/Makefile.am.orig 2021-04-30 14:58:08 UTC +--- gtk3/switcher/Makefile.am.orig 2025-05-18 07:42:28 UTC +++ gtk3/switcher/Makefile.am -@@ -1,10 +1,7 @@ - if GTK3 +@@ -6,10 +6,7 @@ uim_im_switcher_gtk3_SOURCES = gtk.c + bin_PROGRAMS = uim-im-switcher-gtk3 - uim_im_switcher_gtk3_SOURCES = ../../gtk2/switcher/gtk.c + uim_im_switcher_gtk3_SOURCES = gtk.c -uim_im_switcher_gtk3_LDADD = @GTK3_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_gtk3_LDADD = @GTK3_LIBS@ -luim-scm -luim-custom -luim-scm -luim - uim_im_switcher_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_im_switcher_gtk3_CPPFLAGS = $(AM_CPPFLAGS) uim_im_switcher_gtk3_CFLAGS = @GTK3_CFLAGS@ diff --git a/textproc/uim/files/patch-gtk3_toolbar_Makefile.am b/textproc/uim/files/patch-gtk3_toolbar_Makefile.am index a946771304b2..ccb71767c39d 100644 --- a/textproc/uim/files/patch-gtk3_toolbar_Makefile.am +++ b/textproc/uim/files/patch-gtk3_toolbar_Makefile.am @@ -1,6 +1,6 @@ ---- gtk3/toolbar/Makefile.am.orig 2022-05-04 18:55:24 UTC +--- gtk3/toolbar/Makefile.am.orig 2025-05-18 07:43:25 UTC +++ gtk3/toolbar/Makefile.am -@@ -11,9 +11,7 @@ xmluidir = $(pkgdatadir)/ui +@@ -16,9 +16,7 @@ libuim_toolbar_applet_gnome3_la_LIBADD = @GTK3_LIBS@ @ xmlui_DATA = uim-applet-menu.xml libuim_toolbar_applet_gnome3_la_LIBADD = @GTK3_LIBS@ @GNOME3_APPLET_LIBS@ \ @@ -10,26 +10,26 @@ + -luim-scm -luim -luim-custom libuim_toolbar_applet_gnome3_la_CPPFLAGS = \ -DUIM_UIDATADIR="\"${xmluidir}\"" \ - $(helper_defs) -I$(top_srcdir) -I$(top_builddir) -@@ -52,9 +50,7 @@ if GTK3 + $(helper_defs) $(AM_CPPFLAGS) +@@ -55,9 +53,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 = ../../gtk2/toolbar/standalone-gtk.c \ - ../../gtk2/toolbar/common-gtk.c + uim_toolbar_gtk3_SOURCES = standalone-gtk.c common-gtk.c -uim_toolbar_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la +uim_toolbar_gtk3_LDADD = @GTK3_LIBS@ -luim-scm -luim -luim-custom - uim_toolbar_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_toolbar_gtk3_CPPFLAGS = $(AM_CPPFLAGS) uim_toolbar_gtk3_CFLAGS = @GTK3_CFLAGS@ -@@ -64,9 +60,7 @@ uim_toolbar_gtk3_systray_SOURCES = ../../gtk2/toolbar - ../../gtk2/toolbar/eggtrayicon.h +@@ -67,9 +63,7 @@ uim_toolbar_gtk3_systray_LDADD = @GTK3_LIBS@ \ + eggtrayicon.h uim_toolbar_gtk3_systray_LDADD = @GTK3_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_gtk3_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_toolbar_gtk3_systray_CPPFLAGS = $(AM_CPPFLAGS) uim_toolbar_gtk3_systray_CFLAGS = @GTK3_CFLAGS@ endif diff --git a/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt b/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt index 03283e10d33e..fedfa33d5735 100644 --- a/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt +++ b/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt @@ -1,6 +1,6 @@ ---- qt5/applet/qtquick-plugin/CMakeLists.txt.orig 2021-04-30 17:45:18 UTC +--- qt5/applet/qtquick-plugin/CMakeLists.txt.orig 2025-05-16 13:44:13 UTC +++ qt5/applet/qtquick-plugin/CMakeLists.txt -@@ -40,8 +40,8 @@ target_compile_options( +@@ -47,8 +47,8 @@ target_link_libraries( target_link_libraries( uim-qtquick-plugin PRIVATE diff --git a/textproc/uim/files/patch-scm_predict-custom.scm b/textproc/uim/files/patch-scm_predict-custom.scm index c7dd90b79d55..273b1d66a939 100644 --- a/textproc/uim/files/patch-scm_predict-custom.scm +++ b/textproc/uim/files/patch-scm_predict-custom.scm @@ -1,11 +1,11 @@ ---- scm/predict-custom.scm.orig 2025-02-23 08:00:09 UTC +--- scm/predict-custom.scm.orig 2025-05-16 13:44:13 UTC +++ scm/predict-custom.scm @@ -110,7 +110,7 @@ (N_ "Look-SKK prediction") (N_ "long description will be here.")) -(define-custom 'predict-custom-look-skk-jisyo "/usr/share/skk/SKK-JISYO.L" -+(define-custom 'predict-custom-look-skk-jisyo "%PREFIX%/share/skk/SKK-JISYO.L" ++(define-custom 'predict-custom-look-skk-jisyo "/usr/local/share/skk/SKK-JISYO.L" '(predict predict-look-skk) '(pathname regular-file) (N_ "Sorted SKK-JISYO dictionary file") diff --git a/textproc/uim/files/patch-scm_predict-look-skk.scm b/textproc/uim/files/patch-scm_predict-look-skk.scm index 6a7726d76a4b..3c31b9d9774c 100644 --- a/textproc/uim/files/patch-scm_predict-look-skk.scm +++ b/textproc/uim/files/patch-scm_predict-look-skk.scm @@ -1,11 +1,11 @@ ---- scm/predict-look-skk.scm.orig 2025-02-23 08:00:09 UTC +--- scm/predict-look-skk.scm.orig 2025-05-16 13:44:13 UTC +++ scm/predict-look-skk.scm @@ -37,7 +37,7 @@ (define-class predict-look-skk predict '((limit 10) - (jisyo "/usr/share/skk/SKK-JISYO.L")) ;; SKK-JISYO -+ (jisyo "%PREFIX%/share/skk/SKK-JISYO.L")) ;; SKK-JISYO ++ (jisyo "/usr/local/share/skk/SKK-JISYO.L")) ;; SKK-JISYO '(search)) (class-set-method! predict-look-skk search diff --git a/textproc/uim/files/patch-uim_Makefile.am b/textproc/uim/files/patch-uim_Makefile.am index 16bbd52e6da2..2d9fb25b4f06 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 2021-04-29 13:46:21 UTC +--- uim/Makefile.am.orig 2025-05-18 07:54:29 UTC +++ uim/Makefile.am -@@ -81,7 +81,7 @@ libuim_custom_la_SOURCES = uim-custom.c +@@ -86,7 +86,7 @@ if M17NLIB if M17NLIB uim_plugin_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_CPPFLAGS = -I$(top_srcdir) @M17NLIB_CFLAGS@ + libuim_m17nlib_la_CPPFLAGS = $(AM_CPPFLAGS) @M17NLIB_CFLAGS@ endif -@@ -100,7 +100,7 @@ if ENABLE_ANTHY_STATIC +@@ -105,7 +105,7 @@ else else uim_plugin_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_CPPFLAGS = -I$(top_srcdir) + libuim_anthy_la_CPPFLAGS = $(AM_CPPFLAGS) endif -@@ -112,7 +112,7 @@ if ENABLE_ANTHY_UTF8_STATIC +@@ -117,7 +117,7 @@ else else uim_plugin_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_CPPFLAGS = -I$(top_srcdir) @ANTHY_UTF8_CFLAGS@ + libuim_anthy_utf8_la_CPPFLAGS = $(AM_CPPFLAGS) @ANTHY_UTF8_CFLAGS@ endif |