CVS commit: pkgsrc/x11/gtk3

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

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun Nov 17 03:54:28 UTC 2024

Modified Files:
        pkgsrc/x11/gtk3: options.mk

Log Message:
gtk3: Restore the gtk3-atk-bridge option.

It no longer unconditionally depends on dbus without this, so it's now
possible to build without dbus again.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/gtk3/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/x11/gtk3/options.mk
diff -u pkgsrc/x11/gtk3/options.mk:1.28 pkgsrc/x11/gtk3/options.mk:1.29
--- pkgsrc/x11/gtk3/options.mk:1.28     Wed Oct 30 14:05:35 2024
+++ pkgsrc/x11/gtk3/options.mk  Sun Nov 17 03:54:28 2024
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.28 2024/10/30 14:05:35 wiz Exp $
+# $NetBSD: options.mk,v 1.29 2024/11/17 03:54:28 dholland Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk3
-PKG_SUPPORTED_OPTIONS+=        cups
+PKG_SUPPORTED_OPTIONS+=        gtk3-atk-bridge cups
 PKG_SUPPORTED_OPTIONS+=        wayland x11
 .if exists(/System/Library/Frameworks/Quartz.framework)
 PKG_SUPPORTED_OPTIONS+=        quartz
@@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS+=       x11
 .if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
 PKG_SUGGESTED_OPTIONS+=        wayland
 .endif
-PKG_SUGGESTED_OPTIONS+=        cups
+PKG_SUGGESTED_OPTIONS+=        gtk3-atk-bridge cups
 
 .include "../../mk/bsd.options.mk"
 
@@ -51,6 +51,12 @@ MESON_ARGS+= -Dx11_backend=true
 MESON_ARGS+=   -Dxinerama=yes
 PLIST.x11=     yes
 
+.  if !empty(PKG_OPTIONS:Mgtk3-atk-bridge)
+MESON_ARGS+=   -Datk_bridge=true
+.  else
+MESON_ARGS+=   -Datk_bridge=false
+.  endif
+
 BUILDLINK_API_DEPENDS.Xft2+=   Xft2>=2.1.2nb2
 
 .include "../../x11/xorgproto/buildlink3.mk"