Orz日記 by Akio Morita

_ [FreeBSD]ibusでXIM EUC-JP localeを動かすパッチ

ibus-1.5.32で動かなくなっているXIM EUC-JP locale(ja-ktermで必要)を動かすパッチのまとめ

• 本質は、post-patchターゲットで行っているibus Issue 2547のロールバック
• util/IMdkit/i18nOffsetCache.c側の修正は、realloc時のoffset_cache->capacityの扱いがおかしい部分の修正

--- textproc/ibus/Makefile.orig
+++ textproc/ibus/Makefile
@@ -108,6 +108,10 @@ PLIST_SUB+=       COMPDIR=""
 PLIST_SUB+=   COMPDIR="@comment "
 .endif

+post-patch:
+      # Rollback https://github.com/ibus/ibus/issues/2547 for ja_JP.eucJP locale XIM on ja-kterm
+      ${REINPLACE_CMD} -e 's/gdk_init/gtk_init/' ${WRKSRC}/client/x11/main.c
+
 post-configure:
       # Clean pre-generated source code, which may not match the options selected.
       ${MAKE} -C ${WRKSRC}/ui/gtk3 maintainer-clean-generic
--- /dev/null  2025-07-10 11:37:47.184390000 +0900
+++ textproc/ibus/files/patch-i18nOffsetCache  2025-07-03 17:34:38.139498000 +0900
@@ -0,0 +1,15 @@
+--- util/IMdkit/i18nOffsetCache.c.orig        2025-04-08 21:57:26.000000000 +0900
++++ util/IMdkit/i18nOffsetCache.c     2025-07-03 17:34:35.553162000 +0900
+@@ -84,10 +84,10 @@
+
+     if (++offset_cache->size > offset_cache->capacity) {
+         Xi18nAtomOffsetPair *pair = (Xi18nAtomOffsetPair *) realloc (data,
+-                offset_cache->capacity * sizeof (Xi18nAtomOffsetPair));
+-        offset_cache->capacity *= OFFSET_CACHE_GROWTH_FACTOR;
++                offset_cache->capacity * OFFSET_CACHE_GROWTH_FACTOR * sizeof (Xi18nAtomOffsetPair));
+         if (pair) {
+             offset_cache->data = pair;
++            offset_cache->capacity *= OFFSET_CACHE_GROWTH_FACTOR;
+         } else {
+             offset_cache->data = data;
+             --offset_cache->size;