CVS commit: pkgsrc/inputmethod/ibus

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

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat May 17 18:32:24 UTC 2025

Modified Files:
        pkgsrc/inputmethod/ibus: Makefile PLIST distinfo
Removed Files:
        pkgsrc/inputmethod/ibus: Makefile.common

Log Message:
ibus: update to 1.5.32.

pkgsrc changes:
 - merge Makefile.common into Makefile after removal of ibus-python
 - tweak PKGNAME and GITHUB_* definitions to make it easier to test
   beta and rc releases
 - avoid generating "*.cpython3*.opt-2.pyc" by -OO on byte compiling in
   py-compile generated by automake 1.17 in the upstream release tar files
    https://mail-index.netbsd.org/pkgsrc-users/2025/04/17/msg041482.html
 - make sure to always regenerate portal/ibus-portal-dbus.[ch] by
   gdbus-codegen to sync with system glib2 version
    https://github.com/ibus/ibus/issues/2734
 - pkglint and remove an obsolete GConf definition
 - take maintainership

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

1.5.32

 Changes between ibus-1.5.32-rc1 and ibus-1.5.32

 Bug Fixes:

  * Send FocusIn signal again after delayed FocusId property 0c08622
  * Fix time lag of CandidatePanel in X11 6ac6188
  * Update Unicode table with keysym 866c935
  * Fix misc issues 646cf45 acccc9f 1f35eaa

1.5.32-rc1

  * Now it supports the Wayland input-method protocol 2 and I summarize
    the settings including the compose setting in each desktop environment.
    https://github.com/ibus/ibus/wiki/WaylandDesktop

  * New option ibus start --type wayland is available and also --verbose
    option to see the detail.

 Features & Bug Fixes:

  * Wayland input-method protocol version 1 and 2 acaa666 59d50a7 0d16a6e
    5061135 33da4b3 821cef0 e27acd3 e5fc9e4 7b30d32 c22d412 c5748e6 fb4d7ba
  * Additional Wayland input-method; XIM and GTK2, Key repeating, Compose;
    d5e6e71 a4c4479 a9916dc db6de3a da30e1d 3ea43b7 b835c0d
  * ibus start --type wayland new option 33139a0 3389680
  * Compose feature updates 486799f 28b357d 09ea069 8490abc 4364c53
  * Build option --disable-xim --disable-gtk2 without X11 63edfd8
  * Call IBus.init() importing Python IBus module 98a7384
  * Refactor codes 15e0231 aac5446 3d6d4b2 b185b21 d039b95
  * Update CI 30e0598
  * Update issue template 414514d
  * Bug fixes of Wayland features c38d82f 719142e
  * Update simple.xml with xkeyboard-config 2.44 fb9769d


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 pkgsrc/inputmethod/ibus/Makefile
cvs rdiff -u -r1.24 -r0 pkgsrc/inputmethod/ibus/Makefile.common
cvs rdiff -u -r1.25 -r1.26 pkgsrc/inputmethod/ibus/PLIST
cvs rdiff -u -r1.35 -r1.36 pkgsrc/inputmethod/ibus/distinfo

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.111 pkgsrc/inputmethod/ibus/Makefile:1.112
--- pkgsrc/inputmethod/ibus/Makefile:1.111      Thu Apr 24 14:14:48 2025
+++ pkgsrc/inputmethod/ibus/Makefile    Sat May 17 18:32:24 2025
@@ -1,7 +1,15 @@
-# $NetBSD: Makefile,v 1.111 2025/04/24 14:14:48 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2025/05/17 18:32:24 tsutsui Exp $
 
-PKGREVISION= 2
-.include "Makefile.common"
+DISTNAME=      ibus-1.5.32
+PKGNAME=       ${DISTNAME:S/-rc/rc/:S/-beta/beta/}
+CATEGORIES=    inputmethod
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=ibus/}
+GITHUB_PROJECT=        ${PKGBASE}
+GITHUB_RELEASE=        ${DISTNAME:S/${PKGBASE}-//}
+
+MAINTAINER=    tsutsui%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/ibus/ibus/wiki
+LICENSE=       gnu-lgpl-v2.1
 
 COMMENT=       Intelligent Input Bus
 
@@ -15,10 +23,11 @@ PYTHON_VERSIONS_INCOMPATIBLE=       27
 GNU_CONFIGURE=                 yes
 USE_LIBTOOL=                   yes
 USE_TOOLS+=                    pkg-config intltool msgfmt gmake msgmerge
+# To regenarete portal/ibus-portal-dbus.[ch] to sync with system glib2 version
+USE_TOOLS+=                    gdbus-codegen
 USE_LANGUAGES=                 c c++
 USE_PKGLOCALEDIR=              yes
 
-GCONF_SCHEMAS+=                ibus.schemas
 PKGCONFIG_OVERRIDE+=   ibus-1.0.pc.in
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR}
@@ -38,13 +47,21 @@ CONFIGURE_ARGS+=    --with-ucd-dir=${PREFIX
 # XXX lack of dbusmenu-glib
 CONFIGURE_ARGS+=       --disable-appindicator
 
+# avoid generating "*.cpython3*.opt-2.pyc" by -OO on byte compiling
+# https://mail-index.netbsd.org/pkgsrc-users/2025/04/17/msg041482.html
+SUBST_CLASSES+=                pyopt
+SUBST_MESSAGE.pyopt=   Fixing Python byte compile optimization level.
+SUBST_STAGE.pyopt=     pre-configure
+SUBST_FILES.pyopt=     py-compile
+SUBST_SED.pyopt=       -e 's/ -OO / -O /g'
+
 SUBST_CLASSES+=                dbus
 SUBST_STAGE.dbus=      post-configure
 SUBST_FILES.dbus=      src/ibusshare.c
 SUBST_SED.dbus=                -e 's,/var/lib/dbus/machine-id,${VARBASE}/lib/dbus/machine-id,g'
 
-BUILD_DEFS+=   PKG_SYSCONFBASE VARBASE
-MANCOMPRESSED= yes
+BUILD_DEFS+=           PKG_SYSCONFBASE VARBASE
+MANCOMPRESSED=         yes
 
 INSTALL_MAKE_FLAGS+=   sysconfdir=${PREFIX}/share/examples/ibus
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}/dconf/db/ibus.d
@@ -72,8 +89,11 @@ CONFIGURE_ARGS+=     --disable-wayland
 # Trigger .vala->.c regeneration of files that contain
 # "#if USE_GDK_WAYLAND" preprocessing directives since we
 # might be on a platform where gtk3 is not built with Wayland.
+# Also make sure to regenerate portal/ibus-portal-dbus.[ch] to
+# sync with system glib2 version.
 pre-build:
        ${TOUCH} ${WRKSRC}/ui/gtk3/*.vala
+       ${TOUCH} ${WRKSRC}/portal/org.freedesktop.IBus.Portal.xml
 
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/dconf/database.mk"

Index: pkgsrc/inputmethod/ibus/PLIST
diff -u pkgsrc/inputmethod/ibus/PLIST:1.25 pkgsrc/inputmethod/ibus/PLIST:1.26
--- pkgsrc/inputmethod/ibus/PLIST:1.25  Sat Nov 23 05:09:04 2024
+++ pkgsrc/inputmethod/ibus/PLIST       Sat May 17 18:32:24 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2024/11/23 05:09:04 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.26 2025/05/17 18:32:24 tsutsui Exp $
 bin/ibus
 bin/ibus-daemon
 bin/ibus-setup
@@ -322,6 +322,7 @@ share/locale/id/LC_MESSAGES/ibus10.mo
 share/locale/it/LC_MESSAGES/ibus10.mo
 share/locale/ja/LC_MESSAGES/ibus10.mo
 share/locale/ka/LC_MESSAGES/ibus10.mo
+share/locale/kab/LC_MESSAGES/ibus10.mo
 share/locale/kn/LC_MESSAGES/ibus10.mo
 share/locale/ko/LC_MESSAGES/ibus10.mo
 share/locale/lv/LC_MESSAGES/ibus10.mo

Index: pkgsrc/inputmethod/ibus/distinfo
diff -u pkgsrc/inputmethod/ibus/distinfo:1.35 pkgsrc/inputmethod/ibus/distinfo:1.36
--- pkgsrc/inputmethod/ibus/distinfo:1.35       Sat Nov 23 05:09:04 2024
+++ pkgsrc/inputmethod/ibus/distinfo    Sat May 17 18:32:24 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.35 2024/11/23 05:09:04 tsutsui Exp $
+$NetBSD: distinfo,v 1.36 2025/05/17 18:32:24 tsutsui Exp $
 
-BLAKE2s (ibus-1.5.31.tar.gz) = 72a2d7cb626e0235a544940472efc1fe835670c1b84e6281b5063510e85e3549
-SHA512 (ibus-1.5.31.tar.gz) = adfad740002662262981ddfcc3f6eb1e898433d3bd90b07535ceef367d496d3da3e0836e59133d0063caf2d3d55d0deb6cf18ae2807fdd1ce4afab84a7725ca5
-Size (ibus-1.5.31.tar.gz) = 4108303 bytes
+BLAKE2s (ibus-1.5.32.tar.gz) = ff1fb8b798af776696a817d9b63ad2e414562268468c9b978d48b8e0df77f77c
+SHA512 (ibus-1.5.32.tar.gz) = 2c63cab1fe553cb8f3ce00d22f3374e396f8cb3f9e66b81b8c8c59d141eb68d036549460ac0b836e93b0261c185a33aba0fc930178fd04d142344324e1562b9c
+Size (ibus-1.5.32.tar.gz) = 4192999 bytes
 SHA1 (patch-client_gtk2_ibusimcontext.c) = 8dcbb38404e599618891de6a406bc1a07db634d4
 SHA1 (patch-client_gtk3_ibusimcontext.c) = 105a2560014f8bd9699393bef3dda00a6c925c6a
 SHA1 (patch-ui_gtk3_Makefile.am) = e0b74afa665b395bb5ac5da678c57e8646bbb71a