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

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sun Jan 12 19:20:26 UTC 2025

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

Log Message:
devel/at-spi2-core: Restore introspection option and cross-build.

This got lost in the transition from devel/atk.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/at-spi2-core/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/at-spi2-core/PLIST
cvs rdiff -u -r1.1 -r1.2 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.53 pkgsrc/devel/at-spi2-core/Makefile:1.54
--- pkgsrc/devel/at-spi2-core/Makefile:1.53     Sun Nov 17 03:43:29 2024
+++ pkgsrc/devel/at-spi2-core/Makefile  Sun Jan 12 19:20:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2024/11/17 03:43:29 dholland Exp $
+# $NetBSD: Makefile,v 1.54 2025/01/12 19:20:26 riastradh Exp $
 
 DISTNAME=      at-spi2-core-2.54.0
 PKGREVISION=   4
@@ -30,6 +30,15 @@ SUBST_MESSAGE.eg=    Fixing path to example
 
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg/autostart
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+TOOL_DEPENDS+=                         glib2-tools>=0:../../devel/glib2-tools
+MESON_CROSS_BINARIES+=                 glib-genmarshal glib-mkenums
+MESON_CROSS_BINARY.glib-genmarshal+=   ${TOOLBASE:Q}/bin/glib-genmarshal
+MESON_CROSS_BINARY.glib-mkenums+=      ${TOOLBASE:Q}/bin/glib-mkenums
+.endif
+
 PYTHON_FOR_BUILD_ONLY= tool
 
 PKGCONFIG_OVERRIDE+=           output/meson-private/*.pc
@@ -39,7 +48,5 @@ PKGCONFIG_OVERRIDE_STAGE=     post-configure
 
 .include "../../devel/meson/build.mk"
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_DEPMETHOD.gobject-introspection=     build
-.include "../../devel/gobject-introspection/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.19 pkgsrc/devel/at-spi2-core/PLIST:1.20
--- pkgsrc/devel/at-spi2-core/PLIST:1.19        Sun Nov 17 00:16:16 2024
+++ pkgsrc/devel/at-spi2-core/PLIST     Sun Jan 12 19:20:26 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2024/11/17 00:16:16 dholland Exp $
+@comment $NetBSD: PLIST,v 1.20 2025/01/12 19:20:26 riastradh 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
@@ -66,7 +66,7 @@ include/atk-1.0/atk/atkutil.h
 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
+${PLIST.introspection}lib/girepository-1.0/Atk-1.0.typelib
 ${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
@@ -89,7 +89,7 @@ ${PLIST.dbus}share/dbus-1/accessibility-
 ${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
+${PLIST.introspection}share/gir-1.0/Atk-1.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

Index: pkgsrc/devel/at-spi2-core/options.mk
diff -u pkgsrc/devel/at-spi2-core/options.mk:1.1 pkgsrc/devel/at-spi2-core/options.mk:1.2
--- pkgsrc/devel/at-spi2-core/options.mk:1.1    Sun Nov 17 00:16:16 2024
+++ pkgsrc/devel/at-spi2-core/options.mk        Sun Jan 12 19:20:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2024/11/17 00:16:16 dholland Exp $
+# $NetBSD: options.mk,v 1.2 2025/01/12 19:20:26 riastradh Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.at-spi2-core
 
@@ -13,13 +13,13 @@ PKG_OPTIONS_VAR=    PKG_OPTIONS.at-spi2-cor
 # 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
+PKG_SUPPORTED_OPTIONS= dbus introspection
+PKG_SUGGESTED_OPTIONS= dbus ${${USE_CROSS_COMPILE:tl} == "yes":?:introspection}
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=   dbus
-
+PLIST_VARS+=   introspection
 
 .if !empty(PKG_OPTIONS:Mdbus)
 PLIST.dbus=    yes
@@ -43,4 +43,10 @@ post-install:
 MESON_ARGS+=   -Datk_only=true
 .endif
 
+.if ${PKG_OPTIONS:Mintrospection}
+PLIST.introspection=   yes
+BUILDLINK_DEPMETHOD.gobject-introspection=     build
+.  include "../../devel/gobject-introspection/buildlink3.mk"
+.endif
+
 .include "../../mk/bsd.prefs.mk"