CVS commit: pkgsrc/inputmethod/ibus

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

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Tue Sep  2 11:38:04 UTC 2025

Modified Files:
        pkgsrc/inputmethod/ibus: Makefile distinfo
Removed Files:
        pkgsrc/inputmethod/ibus/patches: patch-ui_gtk3_Makefile.am
            patch-ui_gtk3_Makefile.in

Log Message:
ibus: use appropriate method to regenerate .c files from .vala sources.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 pkgsrc/inputmethod/ibus/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/inputmethod/ibus/distinfo
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am \
    pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in

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.115 pkgsrc/inputmethod/ibus/Makefile:1.116
--- pkgsrc/inputmethod/ibus/Makefile:1.115      Sat Aug 30 22:45:41 2025
+++ pkgsrc/inputmethod/ibus/Makefile    Tue Sep  2 11:38:04 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2025/08/30 22:45:41 wiz Exp $
+# $NetBSD: Makefile,v 1.116 2025/09/02 11:38:04 tsutsui Exp $
 
 DISTNAME=      ibus-1.5.32
 PKGNAME=       ${DISTNAME:S/-rc/rc/:S/-beta/beta/}
@@ -87,13 +87,14 @@ PLIST.wayland=              yes
 CONFIGURE_ARGS+=       --disable-wayland
 .endif
 
-# Trigger .vala->.c regeneration of files that contain
+# Explicitly clean .c files generated from .vala sources that contain
 # "#if USE_GDK_WAYLAND" preprocessing directives since we
 # might be on a platform where gtk3 is not built with Wayland.
+# See also https://github.com/ibus/ibus/issues/2767
 # Also make sure to regenerate portal/ibus-portal-dbus.[ch] to
 # sync with system glib2 version.
 pre-build:
-       ${TOUCH} ${WRKSRC}/ui/gtk3/*.vala
+       (cd ${WRKSRC} && ${MAKE_PROGRAM} -C ui/gtk3 maintainer-clean-generic)
        ${TOUCH} ${WRKSRC}/portal/org.freedesktop.IBus.Portal.xml
 
 .include "../../devel/glib2/schemas.mk"

Index: pkgsrc/inputmethod/ibus/distinfo
diff -u pkgsrc/inputmethod/ibus/distinfo:1.37 pkgsrc/inputmethod/ibus/distinfo:1.38
--- pkgsrc/inputmethod/ibus/distinfo:1.37       Thu Aug 28 12:08:47 2025
+++ pkgsrc/inputmethod/ibus/distinfo    Tue Sep  2 11:38:04 2025
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.37 2025/08/28 12:08:47 tsutsui Exp $
+$NetBSD: distinfo,v 1.38 2025/09/02 11:38:04 tsutsui Exp $
 
 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
-SHA1 (patch-ui_gtk3_Makefile.in) = e52d7d60e975bbc8d1c2807deaef8f0d09b46548
 SHA1 (patch-ui_gtk3_candidatepanel.vala) = a1d697d5b4f8d545918aca48165e2b07c47f858a
 SHA1 (patch-ui_gtk3_panel.vala) = a8fcb9ce00b260e2039c181198936cdf8a3344d4