CVS commit: pkgsrc/inputmethod/ibus

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Jun 15 08:51:04 UTC 2024

Modified Files:
        pkgsrc/inputmethod/ibus: Makefile Makefile.common distinfo
Added Files:
        pkgsrc/inputmethod/ibus/patches: patch-util_IMdkit_i18nPtHdr.c

Log Message:
ibus: update to 1.5.30.

- remove tweaks for -rc2 rename
- explicitly disable gtk4 for now
- disable a change for upstream https://github.com/ibus/ibus/issues/2560
  because this sync() call makes all inputs extremely slower during
  IME enabled on at least NetBSD/i386 10.0

Upstream changes:
 https://github.com/ibus/ibus/releases/tag/1.5.30
 https://github.com/ibus/ibus/releases/tag/1.5.30-rc2
 https://github.com/ibus/ibus/releases/tag/1.5.30-rc1

1.5.30

Changes between ibus-1.5.30 and ibus-1.5.30-rc2

Bug Fixes:
src/ibusengine: Identify SUPER_MASK in GTK4 with MOD4_MASK 7f3bde0

Contributors:
configure: Fix bash '=' operator for BSD (Izumi Tsutsui) 7078329
github/workflows: Update action/checkout version (Rafael Fontenelle) 68217a0
src/ibusservice: Fix unused variable (Jan Engelhardt) cd2cde9

1.5.30-rc2

Changes between ibus-1.5.30-rc2 and ibus-1.5.30.rc1

Bug Fixes:
src/ibusengine: Identify SUPER_MASK in GTK4 with MOD4_MASK e4eaeb7
ui/gtk3: Fix SEGV with Super-space in Wayland c63cc67
src/ibusengine: Free names in ibus_engine_filter_key_event() ca61d6e
tools: Fix ibus start/restart in Plasma Wayland 5696033
ui/gtk3: Fix ibus-daemon timeout in Plasma Wayland b4b9c2e
ui/gtk3: Set Indicator status at launching time b25643c

Translation Contributors:
po: Update translation (German) (Mike FABIAN) 95bdbb2
po: Update translation (Korean) (simmon) 633b3c0
po: Update translation (Swedish) (Luna Jernberg) 537d4d0
po: Update translation (Turkish) (Oguz Ersen) 841724a
po: Update translation (Ukrainian) (Yuri Chornoivan) 2a58178
po: Update translation (Polish) (Piotr Drag) 01e3964
po: Update translation (Georgian) (Weblate Translation Memory) dfbed6c
po: Update translation (Punjabi) (A S Alam) ca90790
po: Update translation (Danish) (Alan01) 6df5e1e

1.5.30-rc1

Enhance IBus with Plasma Wayland:

  * Implement preedit color in Plasma Wayland 59944dd
  * Implement ibus start/restart for Plasma Wayland 74712fa e425bbf
  * Show preferences menu item in activate menu 3e7ee44

Data Updates & Bug Fixes:

  * Fix control keys with game application 4872c1f
  * Fix typing freeze with barcode reader b49f3a4
  * Fix memory issues 1be3e2f 0a7a4d1 43a6e38
  * Fix preedit issue with X applications 719792d
  * Code maintenance ac46d15 8470873 820fed3
  * Update simple.xml, ibusunicodegen.h 1a17f88 228f0a7
  * Update CI 2ede4a1 a69a449

Code Contributors:

  * setup/enginedialog: Improve the search for engines (Mike FABIAN) d3d7762
  * configure: Don't do AC_CHECK_FILE when cross compiling (oreo639) cc46e62

Translation Contributors:

  * po: Update translation (Georgian) (Temuri Doghonadze) 16ebd40
  * po: Update translation (Chinese (Traditional) (zh_TW)) (Cheng-Chia Tseng)
    92769c3
  * po: Update translation (Czech) (Krystof Cerny) 4620b33
  * po: Update translation (Czech) (Daniel Rusek) e513e26
  * po: Update translation (Hebrew) (Yaron Shahrabani) 68c1d6a
  * po: Update translation (Punjabi) (A S Alam) 82b56fd
  * po: Update translation (Turkish) (Oguz Ersen) 8e31032
  * po: Update translation (Chinese (Simplified) (zh_CN)) (Liu Tao) 847a80e
  * po: Update translation (Korean) (simmon) 1180470
  * po: Update translation (Portuguese (Brazil)) (Rafael Fontenelle) dc27015


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/inputmethod/ibus/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/inputmethod/ibus/Makefile.common
cvs rdiff -u -r1.33 -r1.34 pkgsrc/inputmethod/ibus/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/ibus/patches/patch-util_IMdkit_i18nPtHdr.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/ibus/Makefile
diff -u pkgsrc/inputmethod/ibus/Makefile:1.105 pkgsrc/inputmethod/ibus/Makefile:1.106
--- pkgsrc/inputmethod/ibus/Makefile:1.105      Sun Apr  7 07:34:26 2024
+++ pkgsrc/inputmethod/ibus/Makefile    Sat Jun 15 08:51:03 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.105 2024/04/07 07:34:26 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2024/06/15 08:51:03 tsutsui Exp $
 
-PKGREVISION= 2
 .include "Makefile.common"
 
 COMMENT=       Intelligent Input Bus
@@ -26,6 +25,7 @@ CONFIGURE_ARGS+=      --localedir=${PREFIX}/$
 CONFIGURE_ARGS+=       --enable-dconf
 CONFIGURE_ARGS+=       --enable-gtk2
 CONFIGURE_ARGS+=       --enable-gtk3
+CONFIGURE_ARGS+=       --disable-gtk4
 CONFIGURE_ARGS+=       --enable-surrounding-text
 CONFIGURE_ARGS+=       --enable-introspection=yes
 CONFIGURE_ARGS+=       --disable-systemd-services

Index: pkgsrc/inputmethod/ibus/Makefile.common
diff -u pkgsrc/inputmethod/ibus/Makefile.common:1.22 pkgsrc/inputmethod/ibus/Makefile.common:1.23
--- pkgsrc/inputmethod/ibus/Makefile.common:1.22        Sat Nov 18 07:13:42 2023
+++ pkgsrc/inputmethod/ibus/Makefile.common     Sat Jun 15 08:51:03 2024
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.22 2023/11/18 07:13:42 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.23 2024/06/15 08:51:03 tsutsui Exp $
 #
 # used by inputmethod/ibus/Makefile
 # used by inputmethod/ibus-python/Makefile
 
-DISTNAME=      ibus-1.5.29-rc2
-PKGNAME=       ${DISTNAME:S/-rc2//}
+DISTNAME=      ibus-1.5.30
 CATEGORIES=    inputmethod
 MASTER_SITES=  https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
 

Index: pkgsrc/inputmethod/ibus/distinfo
diff -u pkgsrc/inputmethod/ibus/distinfo:1.33 pkgsrc/inputmethod/ibus/distinfo:1.34
--- pkgsrc/inputmethod/ibus/distinfo:1.33       Sun Dec 17 09:04:10 2023
+++ pkgsrc/inputmethod/ibus/distinfo    Sat Jun 15 08:51:03 2024
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.33 2023/12/17 09:04:10 nros Exp $
+$NetBSD: distinfo,v 1.34 2024/06/15 08:51:03 tsutsui Exp $
 
-BLAKE2s (ibus-1.5.29-rc2.tar.gz) = 645fbfb3f779426119a276520486df7f594cfc9a41a91e1b02ff4ad0a931df6f
-SHA512 (ibus-1.5.29-rc2.tar.gz) = 47dd39c9615783b6c157a25e8a2506dc2e1f440d56aa649ee8cb95a390cb4efab9c95e72ac84b5d042c25e350599b4d352ddc66f1385af6660d4a7a296e44ca7
-Size (ibus-1.5.29-rc2.tar.gz) = 3991416 bytes
+BLAKE2s (ibus-1.5.30.tar.gz) = cfe48e2a6cf9b01ef097af6f2c547472324d50096dd4b2e1aa31d21499f68e84
+SHA512 (ibus-1.5.30.tar.gz) = cbed37bf62e8d8593c838f8ef7fe0b22bf8f4a661b887fc7be2f2768dda912075abdf3070c22b9699def90e7002aaaf7394f5fc590e12ef6ebb2bb5161cc29a0
+Size (ibus-1.5.30.tar.gz) = 4124084 bytes
 SHA1 (patch-client_gtk2_ibusimcontext.c) = 8dcbb38404e599618891de6a406bc1a07db634d4
 SHA1 (patch-client_gtk3_ibusimcontext.c) = 105a2560014f8bd9699393bef3dda00a6c925c6a
 SHA1 (patch-src_ibuscomposetable.c) = 4a0f2feb9f58e04199fec08433559a2701ddb69c
 SHA1 (patch-ui_gtk3_Makefile.am) = e0b74afa665b395bb5ac5da678c57e8646bbb71a
 SHA1 (patch-ui_gtk3_Makefile.in) = e52d7d60e975bbc8d1c2807deaef8f0d09b46548
+SHA1 (patch-util_IMdkit_i18nPtHdr.c) = 9d3da82d2d0422d5f26d886ca1f67aa4dce5f5f8

Added files:

Index: pkgsrc/inputmethod/ibus/patches/patch-util_IMdkit_i18nPtHdr.c
diff -u /dev/null pkgsrc/inputmethod/ibus/patches/patch-util_IMdkit_i18nPtHdr.c:1.1
--- /dev/null   Sat Jun 15 08:51:04 2024
+++ pkgsrc/inputmethod/ibus/patches/patch-util_IMdkit_i18nPtHdr.c       Sat Jun 15 08:51:04 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-util_IMdkit_i18nPtHdr.c,v 1.1 2024/06/15 08:51:04 tsutsui Exp $
+
+- disable a change for upstream https://github.com/ibus/ibus/issues/2560
+  because this sync() call makes all inputs extremely slower during
+  IME enabled on at least NetBSD/i386 10.0.
+
+--- util/IMdkit/i18nPtHdr.c.orig       2024-06-15 08:35:06.196322428 +0000
++++ util/IMdkit/i18nPtHdr.c
+@@ -1757,7 +1757,9 @@ static void ProcessQueue (XIMS ims, CARD
+         switch (hdr->major_opcode)
+         {
+         case XIM_FORWARD_EVENT:
++#if 0 /* XXX: disable fix for #2560 for a certain environments */
+             sync();
++#endif
+             ForwardEventMessageProc(ims, &call_data, p1);
+             break;
+         }