CVS commit: [pkgsrc-2026Q2] pkgsrc/inputmethod/ibus

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Aug 24 20:55:25 UTC 2026

Modified Files:
        pkgsrc/inputmethod/ibus [pkgsrc-2026Q2]: Makefile

Log Message:
Pullup ticket #7241 - requested by tsutsuii
inputmethod/ibus: Build fix

Revisions pulled up:
- inputmethod/ibus/Makefile                                     1.126

---
   Module Name:    pkgsrc
   Committed By:   tsutsui
   Date:           Wed Aug 19 16:18:16 UTC 2026

   Modified Files:
           pkgsrc/inputmethod/ibus: Makefile

   Log Message:
   ibus: regenerate tools Vala sources before build

   The generated tools/main.c in the distfile may contain Wayland code
   even when ibus is configured with --disable-wayland, causing the build
   to fail due to missing wayland headers or libraries.

   Clean the generated sources before build so they are regenerated
   with the current configure options, as already done for ui/gtk3.

   This should fix workaround for PR pkg/60476 on pkgsrc-2026Q2.


To generate a diff of this commit:
cvs rdiff -u -r1.123.2.1 -r1.123.2.2 pkgsrc/inputmethod/ibus/Makefile

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.123.2.1 pkgsrc/inputmethod/ibus/Makefile:1.123.2.2
--- pkgsrc/inputmethod/ibus/Makefile:1.123.2.1  Sun Aug  9 18:36:12 2026
+++ pkgsrc/inputmethod/ibus/Makefile    Mon Aug 24 20:55:25 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123.2.1 2026/08/09 18:36:12 bsiegert Exp $
+# $NetBSD: Makefile,v 1.123.2.2 2026/08/24 20:55:25 maya Exp $
 
 DISTNAME=      ibus-1.5.34
 PKGNAME=       ${DISTNAME:S/-rc/rc/:S/-beta/beta/}
@@ -88,14 +88,16 @@ PLIST.wayland=              yes
 CONFIGURE_ARGS+=       --disable-wayland
 .endif
 
-# 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.
+# Explicitly regenerate .c sources from .vala where the generated sources
+# depend on configure result.  Generated sources in the distfile may have
+# been created with different options.
 # 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:
        (cd ${WRKSRC} && ${MAKE_PROGRAM} -C ui/gtk3 maintainer-clean-generic)
+       (cd ${WRKSRC} && ${MAKE_PROGRAM} -C tools maintainer-clean-generic)
        (cd ${WRKSRC} && ${MAKE_PROGRAM} -C portal maintainer-clean-generic)
 
 .include "../../devel/glib2/schemas.mk"