CVS commit: pkgsrc/x11/gtk3

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Oct 30 14:05:35 UTC 2024

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

Log Message:
gtk3: remove gtk3-atk-bridge

It was default-on, and the package now always depends on at-spi2-core,
so there is no point in the option any longer.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/x11/gtk3/buildlink3.mk
cvs rdiff -u -r1.27 -r1.28 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/buildlink3.mk
diff -u pkgsrc/x11/gtk3/buildlink3.mk:1.56 pkgsrc/x11/gtk3/buildlink3.mk:1.57
--- pkgsrc/x11/gtk3/buildlink3.mk:1.56  Sun Oct 20 14:04:48 2024
+++ pkgsrc/x11/gtk3/buildlink3.mk       Wed Oct 30 14:05:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.56 2024/10/20 14:04:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.57 2024/10/30 14:05:35 wiz Exp $
 
 BUILDLINK_TREE+=       gtk3
 
@@ -25,9 +25,6 @@ pkgbase := gtk3
 BUILDLINK_API_DEPENDS.libepoxy+=       libepoxy>=1.4
 .include "../../graphics/libepoxy/buildlink3.mk"
 .if ${PKG_BUILD_OPTIONS.gtk3:Mx11}
-.  if ${PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge}
-.    include "../../devel/at-spi2-core/buildlink3.mk"
-.  endif # PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge
 .include "../../x11/libXcursor/buildlink3.mk"
 BUILDLINK_API_DEPENDS.Xft2+=   Xft2>=2.1.2nb2
 .include "../../x11/libXft/buildlink3.mk"

Index: pkgsrc/x11/gtk3/options.mk
diff -u pkgsrc/x11/gtk3/options.mk:1.27 pkgsrc/x11/gtk3/options.mk:1.28
--- pkgsrc/x11/gtk3/options.mk:1.27     Sun Oct 20 14:04:48 2024
+++ pkgsrc/x11/gtk3/options.mk  Wed Oct 30 14:05:35 2024
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.27 2024/10/20 14:04:48 wiz Exp $
+# $NetBSD: options.mk,v 1.28 2024/10/30 14:05:35 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk3
-PKG_SUPPORTED_OPTIONS+=        gtk3-atk-bridge cups
+PKG_SUPPORTED_OPTIONS+=        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+=        gtk3-atk-bridge cups
+PKG_SUGGESTED_OPTIONS+=        cups
 
 .include "../../mk/bsd.options.mk"
 
@@ -51,14 +51,6 @@ MESON_ARGS+= -Dx11_backend=true
 MESON_ARGS+=   -Dxinerama=yes
 PLIST.x11=     yes
 
-.  if !empty(PKG_OPTIONS:Mgtk3-atk-bridge)
-BUILDLINK_API_DEPENDS.at-spi2-core+=   at-spi2-core>=2.54
-.    include "../../devel/at-spi2-core/buildlink3.mk"
-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"