Attachment 186991 Details for Bug 194460 – patch (4.0.0) for reference

[patch] patch (4.0.0) for reference

no_atk-bridge.gtk4.diff (text/plain), 3.19 KB, created by Jan Beich on 2017-10-07 21:59:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-10-07 21:59:31 UTC

Size: 3.19 KB

patch

obsolete

>From ac485a5e41ba858909ba4ba6bcdd23f754f36d6d Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 19 Oct 2014 02:08:00 +0000
>Subject: [PATCH] build: restore --without-atk-bridge as
> -Denable-atk-bridge=false
>
>This reverts commit ed8203e700aa8a8de40df071ffdc2d18cab68e29.
>
>Allow users to have a minimalistic desktop without DBus. AT-SPI bridge
>isn't required for accessibility with older Gtk+ versions and cannot be
>used without X11.
>
>https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194460
>---
> config.h.meson              | 3 +++
> gtk/a11y/gtkaccessibility.c | 4 ++--
> meson.build                 | 7 +++++--
> meson_options.txt           | 2 ++
> 4 files changed, 12 insertions(+), 4 deletions(-)
>
>diff --git a/config.h.meson b/config.h.meson
>index 651360abd2..b7e5142807 100644
>--- a/config.h.meson
>+++ b/config.h.meson
>@@ -12,6 +12,9 @@
> /* Define the location where the catalogs will be installed */
> #mesondefine GTK_LOCALEDIR
> 
>+/* Define if we're using atk-bridge-2.0 */
>+#mesondefine HAVE_ATK_BRIDGE
>+
> /* Define to 1 if you have the `bind_textdomain_codeset' function. */
> #mesondefine HAVE_BIND_TEXTDOMAIN_CODESET
> 
>diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c
>index 6cf86b07ae..efd26ac806 100644
>--- a/gtk/a11y/gtkaccessibility.c
>+++ b/gtk/a11y/gtkaccessibility.c
>@@ -35,7 +35,7 @@
> #include <gtk/gtktogglebutton.h>
> #include <gtk/gtkaccessible.h>
> 
>-#ifdef GDK_WINDOWING_X11
>+#ifdef HAVE_ATK_BRIDGE
> #include <atk-bridge.h>
> #endif
> 
>@@ -988,7 +988,7 @@ _gtk_accessibility_init (void)
>   _gtk_accessibility_override_atk_util ();
>   do_window_event_initialization ();
> 
>-#ifdef GDK_WINDOWING_X11
>+#ifdef HAVE_ATK_BRIDGE
>   atk_bridge_adaptor_init (NULL, NULL);
> #endif
> 
>diff --git a/meson.build b/meson.build
>index 5f2e82a1f5..6d4cc7b6cd 100644
>--- a/meson.build
>+++ b/meson.build
>@@ -434,7 +434,6 @@ if x11_enabled
>   xfixes_dep     = dependency('xfixes', required: false)
>   xcomposite_dep = dependency('xcomposite', required: false)
>   fontconfig_dep = dependency('fontconfig')
>-  atkbridge_dep  = dependency('atk-bridge-2.0', version: atk_req)
> 
>   backend_immodules += ['xim']
> 
>@@ -453,7 +452,11 @@ if x11_enabled
>     x11_pkgs += ['xdamage']
>   endif
> 
>-  atk_pkgs += ['atk-bridge-2.0']
>+  if get_option('enable-atk-bridge')
>+    atkbridge_dep = dependency('atk-bridge-2.0', version: atk_req)
>+    atk_pkgs += ['atk-bridge-2.0']
>+    cdata.set('HAVE_ATK_BRIDGE', 1)
>+  endif
> 
>   cdata.set('HAVE_XDAMAGE', xdamage_dep.found())
>   cdata.set('HAVE_XCURSOR', xcursor_dep.found())
>diff --git a/meson_options.txt b/meson_options.txt
>index 643aa144da..822a58c619 100644
>--- a/meson_options.txt
>+++ b/meson_options.txt
>@@ -26,6 +26,8 @@ option('enable-cloudproviders', type: 'boolean', value: false,
>   description : 'Enable the cloudproviders support')
> option('enable-xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
>   description : 'Enable support for the Xinerama extension')
>+option('enable-atk-bridge', type: 'boolean', value: 'true',
>+  description : 'Enable AT-SPI ATK bridge support (requires DBus)')
> option('disable-modules', type: 'boolean', value : 'false',
>   description : 'Disable dynamic module loading')
> option('with-included-immodules', type: 'string', value : '',

Actions: View | Diff

Attachments on bug 194460: 148452 | 148453 | 148454 | 148456 | 148457 | 148458 | 167889 | 186991 | 206632