CVS commit: pkgsrc/devel/at-spi2-core

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon May 25 15:50:46 UTC 2026

Modified Files:
        pkgsrc/devel/at-spi2-core: Makefile PLIST options.mk

Log Message:
at-spi2-core: explicitly disable dbus-broker and systemd.

This fixes the build on (Fedora) Linux.

There are two implementations of dbus: dbus-daemon and dbus-broker.
Fedora defaults to the latter, but it requires systemd. pkgsrc has no
support for linking against builtin libsystemd, so make at-spi2-core use
dbus-daemon from pkgsrc.

Suggested by wiz@ and prlw1@ in tech-pkg.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/devel/at-spi2-core/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/at-spi2-core/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/at-spi2-core/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/at-spi2-core/Makefile
diff -u pkgsrc/devel/at-spi2-core/Makefile:1.67 pkgsrc/devel/at-spi2-core/Makefile:1.68
--- pkgsrc/devel/at-spi2-core/Makefile:1.67     Thu May 14 17:10:03 2026
+++ pkgsrc/devel/at-spi2-core/Makefile  Mon May 25 15:50:45 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2026/05/14 17:10:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.68 2026/05/25 15:50:45 bsiegert Exp $
 
 DISTNAME=      at-spi2-core-2.60.3
+PKGREVISION=   1
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/at-spi2-core/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/at-spi2-core/PLIST
diff -u pkgsrc/devel/at-spi2-core/PLIST:1.24 pkgsrc/devel/at-spi2-core/PLIST:1.25
--- pkgsrc/devel/at-spi2-core/PLIST:1.24        Thu May 14 17:10:03 2026
+++ pkgsrc/devel/at-spi2-core/PLIST     Mon May 25 15:50:45 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2026/05/14 17:10:03 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.25 2026/05/25 15:50:45 bsiegert Exp $
 ${PLIST.dbus}include/at-spi-2.0/atspi/atspi-accessible.h
 ${PLIST.dbus}include/at-spi-2.0/atspi/atspi-action.h
 ${PLIST.dbus}include/at-spi-2.0/atspi/atspi-application.h
@@ -84,7 +84,6 @@ lib/pkgconfig/atk.pc
 ${PLIST.dbus}lib/pkgconfig/atspi-2.pc
 ${PLIST.dbus}${PYSITELIB}/gi/overrides/Atspi.py
 ${PLIST.dbus}${PYSITELIB}/gi/overrides/Atspi.pyc
-${PLIST.dbus}lib/systemd/user/at-spi-dbus-bus.service
 ${PLIST.dbus}libexec/at-spi-bus-launcher
 ${PLIST.dbus}libexec/at-spi2-registryd
 ${PLIST.dbus}share/dbus-1/accessibility-services/org.a11y.atspi.Registry.service

Index: pkgsrc/devel/at-spi2-core/options.mk
diff -u pkgsrc/devel/at-spi2-core/options.mk:1.4 pkgsrc/devel/at-spi2-core/options.mk:1.5
--- pkgsrc/devel/at-spi2-core/options.mk:1.4    Fri May 15 17:00:54 2026
+++ pkgsrc/devel/at-spi2-core/options.mk        Mon May 25 15:50:45 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2026/05/15 17:00:54 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2026/05/25 15:50:45 bsiegert Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.at-spi2-core
 
@@ -24,6 +24,9 @@ PLIST_VARS+=  introspection
 .if ${PKG_OPTIONS:Mdbus}
 PLIST.dbus=    yes
 
+MESON_ARGS+=                   -Duse_systemd=false
+MESON_ARGS+=                   -Ddefault_bus=dbus-daemon
+
 #
 # These files only get installed when dbus is in use.
 #