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

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun Nov 17 00:16:16 UTC 2024

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

Log Message:
at-spi2-core: add dbus option.

Turning off the dbus option makes this into more or less the same as
the old atk library: that is, if you didn't have at-spi2-core
installed before, only atk, you can turn the option off to avoid
incurring a mandatory dbus dependency in all sorts of things that
didn't previously have one, like gtk2.

If you did have at-spi2-core installed before because things actually
used it, turning off the dbus option off will break those things. (As
in, they won't even build.)

It would be better if turning off dbus provided the at-spi2-core
libraries in a way that didn't depend on dbus, so things that wanted
them could build, but that's not the hook that upstream gives us.
(It's also not clear from very casual inspection whether at-spi2 is
architected adequately to be transport-independent.)

It also might be better to go back to having a separate package for
the atk library, but this is also not so easy to arrange.

Therefore, the dbus option is enabled by default here.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/at-spi2-core/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/at-spi2-core/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/at-spi2-core/buildlink3.mk
cvs rdiff -u -r0 -r1.1 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.51 pkgsrc/devel/at-spi2-core/Makefile:1.52
--- pkgsrc/devel/at-spi2-core/Makefile:1.51     Thu Nov 14 22:19:17 2024
+++ pkgsrc/devel/at-spi2-core/Makefile  Sun Nov 17 00:16:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2024/11/14 22:19:17 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2024/11/17 00:16:16 dholland Exp $
 
 DISTNAME=      at-spi2-core-2.54.0
 PKGREVISION=   3
@@ -28,11 +28,6 @@ SUBST_FILES.eg+=     bus/meson.build
 SUBST_STAGE.eg=                pre-configure
 SUBST_MESSAGE.eg=      Fixing path to examples directory.
 
-CONF_FILES=    ${EGDIR}/at-spi2/accessibility.conf \
-               ${PKG_SYSCONFDIR}/at-spi2/accessibility.conf
-CONF_FILES+=   ${EGDIR}/xdg/autostart/at-spi-dbus-bus.desktop \
-               ${PKG_SYSCONFDIR}/xdg/autostart/at-spi-dbus-bus.desktop
-MAKE_DIRS+=    ${PKG_SYSCONFDIR}/at-spi2
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg/autostart
 
 PYTHON_FOR_BUILD_ONLY= tool
@@ -40,15 +35,11 @@ PYTHON_FOR_BUILD_ONLY=      tool
 PKGCONFIG_OVERRIDE+=           output/meson-private/*.pc
 PKGCONFIG_OVERRIDE_STAGE=      post-configure
 
-post-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/xdg/autostart
-       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/xdg/autostart/at-spi-dbus-bus.desktop \
-             ${DESTDIR}${EGDIR}/xdg/autostart/at-spi-dbus-bus.desktop
+.include "options.mk"
 
 .include "../../devel/meson/build.mk"
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.gobject-introspection=     build
 .include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/at-spi2-core/PLIST
diff -u pkgsrc/devel/at-spi2-core/PLIST:1.18 pkgsrc/devel/at-spi2-core/PLIST:1.19
--- pkgsrc/devel/at-spi2-core/PLIST:1.18        Sun Oct 20 14:02:23 2024
+++ pkgsrc/devel/at-spi2-core/PLIST     Sun Nov 17 00:16:16 2024
@@ -1,36 +1,36 @@
-@comment $NetBSD: PLIST,v 1.18 2024/10/20 14:02:23 wiz Exp $
-include/at-spi-2.0/atspi/atspi-accessible.h
-include/at-spi-2.0/atspi/atspi-action.h
-include/at-spi-2.0/atspi/atspi-application.h
-include/at-spi-2.0/atspi/atspi-collection.h
-include/at-spi-2.0/atspi/atspi-component.h
-include/at-spi-2.0/atspi/atspi-constants.h
-include/at-spi-2.0/atspi/atspi-device-legacy.h
-include/at-spi-2.0/atspi/atspi-device-listener.h
-include/at-spi-2.0/atspi/atspi-device.h
-include/at-spi-2.0/atspi/atspi-document.h
-include/at-spi-2.0/atspi/atspi-editabletext.h
-include/at-spi-2.0/atspi/atspi-enum-types.h
-include/at-spi-2.0/atspi/atspi-event-listener.h
-include/at-spi-2.0/atspi/atspi-gmain.h
-include/at-spi-2.0/atspi/atspi-hyperlink.h
-include/at-spi-2.0/atspi/atspi-hypertext.h
-include/at-spi-2.0/atspi/atspi-image.h
-include/at-spi-2.0/atspi/atspi-matchrule.h
-include/at-spi-2.0/atspi/atspi-misc.h
-include/at-spi-2.0/atspi/atspi-object.h
-include/at-spi-2.0/atspi/atspi-registry.h
-include/at-spi-2.0/atspi/atspi-relation.h
-include/at-spi-2.0/atspi/atspi-selection.h
-include/at-spi-2.0/atspi/atspi-stateset.h
-include/at-spi-2.0/atspi/atspi-table-cell.h
-include/at-spi-2.0/atspi/atspi-table.h
-include/at-spi-2.0/atspi/atspi-text.h
-include/at-spi-2.0/atspi/atspi-types.h
-include/at-spi-2.0/atspi/atspi-value.h
-include/at-spi-2.0/atspi/atspi-version.h
-include/at-spi-2.0/atspi/atspi.h
-include/at-spi2-atk/2.0/atk-bridge.h
+@comment $NetBSD: PLIST,v 1.19 2024/11/17 00:16:16 dholland 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
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-collection.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-component.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-constants.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-device-legacy.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-device-listener.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-device.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-document.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-editabletext.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-enum-types.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-event-listener.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-gmain.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-hyperlink.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-hypertext.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-image.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-matchrule.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-misc.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-object.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-registry.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-relation.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-selection.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-stateset.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-table-cell.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-table.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-text.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-types.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-value.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi-version.h
+${PLIST.dbus}include/at-spi-2.0/atspi/atspi.h
+${PLIST.dbus}include/at-spi2-atk/2.0/atk-bridge.h
 include/atk-1.0/atk/atk-autocleanups.h
 include/atk-1.0/atk/atk-enum-types.h
 include/atk-1.0/atk/atk.h
@@ -67,30 +67,30 @@ include/atk-1.0/atk/atkvalue.h
 include/atk-1.0/atk/atkversion.h
 include/atk-1.0/atk/atkwindow.h
 lib/girepository-1.0/Atk-1.0.typelib
-lib/girepository-1.0/Atspi-2.0.typelib
-lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
-lib/gtk-2.0/modules/libatk-bridge.so
+${PLIST.dbus}lib/girepository-1.0/Atspi-2.0.typelib
+${PLIST.dbus}lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
+${PLIST.dbus}lib/gtk-2.0/modules/libatk-bridge.so
 lib/libatk-1.0.so
 lib/libatk-1.0.so.0
 lib/libatk-1.0.so.0.25409.1
-lib/libatk-bridge-2.0.so
-lib/libatk-bridge-2.0.so.0
-lib/libatk-bridge-2.0.so.0.0.0
-lib/libatspi.so
-lib/libatspi.so.0
-lib/libatspi.so.0.0.1
-lib/pkgconfig/atk-bridge-2.0.pc
+${PLIST.dbus}lib/libatk-bridge-2.0.so
+${PLIST.dbus}lib/libatk-bridge-2.0.so.0
+${PLIST.dbus}lib/libatk-bridge-2.0.so.0.0.0
+${PLIST.dbus}lib/libatspi.so
+${PLIST.dbus}lib/libatspi.so.0
+${PLIST.dbus}lib/libatspi.so.0.0.1
+${PLIST.dbus}lib/pkgconfig/atk-bridge-2.0.pc
 lib/pkgconfig/atk.pc
-lib/pkgconfig/atspi-2.pc
-lib/systemd/user/at-spi-dbus-bus.service
-libexec/at-spi-bus-launcher
-libexec/at-spi2-registryd
-share/dbus-1/accessibility-services/org.a11y.atspi.Registry.service
-share/dbus-1/services/org.a11y.Bus.service
-share/examples/at-spi2-core/at-spi2/accessibility.conf
-share/examples/at-spi2-core/xdg/autostart/at-spi-dbus-bus.desktop
+${PLIST.dbus}lib/pkgconfig/atspi-2.pc
+${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
+${PLIST.dbus}share/dbus-1/services/org.a11y.Bus.service
+${PLIST.dbus}share/examples/at-spi2-core/at-spi2/accessibility.conf
+${PLIST.dbus}share/examples/at-spi2-core/xdg/autostart/at-spi-dbus-bus.desktop
 share/gir-1.0/Atk-1.0.gir
-share/gir-1.0/Atspi-2.0.gir
+${PLIST.dbus}share/gir-1.0/Atspi-2.0.gir
 share/locale/ab/LC_MESSAGES/at-spi2-core.mo
 share/locale/af/LC_MESSAGES/at-spi2-core.mo
 share/locale/am/LC_MESSAGES/at-spi2-core.mo

Index: pkgsrc/devel/at-spi2-core/buildlink3.mk
diff -u pkgsrc/devel/at-spi2-core/buildlink3.mk:1.11 pkgsrc/devel/at-spi2-core/buildlink3.mk:1.12
--- pkgsrc/devel/at-spi2-core/buildlink3.mk:1.11        Sun Oct 20 14:02:23 2024
+++ pkgsrc/devel/at-spi2-core/buildlink3.mk     Sun Nov 17 00:16:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2024/10/20 14:02:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2024/11/17 00:16:16 dholland Exp $
 
 BUILDLINK_TREE+=       at-spi2-core
 
@@ -9,8 +9,15 @@ BUILDLINK_API_DEPENDS.at-spi2-core+=   at-
 BUILDLINK_ABI_DEPENDS.at-spi2-core+=   at-spi2-core>=2.54.0
 BUILDLINK_PKGSRCDIR.at-spi2-core?=     ../../devel/at-spi2-core
 
+pkgbase:= at-spi2-core
+.include "../../mk/pkg-build-options.mk"
+
 .include "../../devel/glib2/buildlink3.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.at-spi2-core:Mdbus)
 .include "../../sysutils/dbus/buildlink3.mk"
+.endif
+
 .endif # AT_SPI2_CORE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -at-spi2-core

Added files:

Index: pkgsrc/devel/at-spi2-core/options.mk
diff -u /dev/null pkgsrc/devel/at-spi2-core/options.mk:1.1
--- /dev/null   Sun Nov 17 00:16:16 2024
+++ pkgsrc/devel/at-spi2-core/options.mk        Sun Nov 17 00:16:16 2024
@@ -0,0 +1,46 @@
+# $NetBSD: options.mk,v 1.1 2024/11/17 00:16:16 dholland Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.at-spi2-core
+
+#
+# Make dbus optional. Note that turning dbus off does not actually
+# make at-spi2 work without dbus; it tells it to build only atk, and
+# makes this package approximately equivalent to the standalone atk
+# package that used to exist. This in turn avoids incurring a
+# mandatory dbus dependency for a large number of applications that
+# never previously had one.
+#
+# However, anything that actually needs at-spi2 will not work with
+# dbus turned off, and probably not build either.
+#
+PKG_SUPPORTED_OPTIONS= dbus
+PKG_SUGGESTED_OPTIONS= dbus
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=   dbus
+
+
+.if !empty(PKG_OPTIONS:Mdbus)
+PLIST.dbus=    yes
+
+#
+# These files only get installed when dbus is in use.
+#
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/at-spi2
+CONF_FILES=    ${EGDIR}/at-spi2/accessibility.conf \
+               ${PKG_SYSCONFDIR}/at-spi2/accessibility.conf
+CONF_FILES+=   ${EGDIR}/xdg/autostart/at-spi-dbus-bus.desktop \
+               ${PKG_SYSCONFDIR}/xdg/autostart/at-spi-dbus-bus.desktop
+post-install:
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/xdg/autostart
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/xdg/autostart/at-spi-dbus-bus.desktop \
+             ${DESTDIR}${EGDIR}/xdg/autostart/at-spi-dbus-bus.desktop
+
+.include "../../sysutils/dbus/buildlink3.mk"
+
+.else
+MESON_ARGS+=   -Datk_only=true
+.endif
+
+.include "../../mk/bsd.prefs.mk"