Attachment #186991 for bug #194460

Lines 12-17 Link Here

(-)b/config.h.meson (+3 lines)
12	/* Define the location where the catalogs will be installed */	12	/* Define the location where the catalogs will be installed */
13	#mesondefine GTK_LOCALEDIR	13	#mesondefine GTK_LOCALEDIR
14		14
		15	/* Define if we're using atk-bridge-2.0 */
		16	#mesondefine HAVE_ATK_BRIDGE
		17
15	/* Define to 1 if you have the `bind_textdomain_codeset' function. */	18	/* Define to 1 if you have the `bind_textdomain_codeset' function. */
16	#mesondefine HAVE_BIND_TEXTDOMAIN_CODESET	19	#mesondefine HAVE_BIND_TEXTDOMAIN_CODESET
17		20

Lines 35-41 Link Here

(-)b/gtk/a11y/gtkaccessibility.c (-2 / +2 lines)
35	#include <gtk/gtktogglebutton.h>	35	#include <gtk/gtktogglebutton.h>
36	#include <gtk/gtkaccessible.h>	36	#include <gtk/gtkaccessible.h>
37		37
38	#ifdef GDK_WINDOWING_X11	38	#ifdef HAVE_ATK_BRIDGE
39	#include <atk-bridge.h>	39	#include <atk-bridge.h>
40	#endif	40	#endif
41		41
Lines 988-994 _gtk_accessibility_init (void) Link Here
988	_gtk_accessibility_override_atk_util ();	988	_gtk_accessibility_override_atk_util ();
989	do_window_event_initialization ();	989	do_window_event_initialization ();
990		990
991	#ifdef GDK_WINDOWING_X11	991	#ifdef HAVE_ATK_BRIDGE
992	atk_bridge_adaptor_init (NULL, NULL);	992	atk_bridge_adaptor_init (NULL, NULL);
993	#endif	993	#endif
994		994




  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']


    x11_pkgs += ['xdamage']
  endif

  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())

Lines 26-31 option('enable-cloudproviders', type: 'boolean', value: false, Link Here

(-)b/meson_options.txt (+2 lines)
26	description : 'Enable the cloudproviders support')	26	description : 'Enable the cloudproviders support')
27	option('enable-xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',	27	option('enable-xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
28	description : 'Enable support for the Xinerama extension')	28	description : 'Enable support for the Xinerama extension')
		29	option('enable-atk-bridge', type: 'boolean', value: 'true',
		30	description : 'Enable AT-SPI ATK bridge support (requires DBus)')
29	option('disable-modules', type: 'boolean', value : 'false',	31	option('disable-modules', type: 'boolean', value : 'false',
30	description : 'Disable dynamic module loading')	32	description : 'Disable dynamic module loading')
31	option('with-included-immodules', type: 'string', value : '',	33	option('with-included-immodules', type: 'string', value : '',

Return to bug 194460

Lines 434-440 if x11_enabled Link Here

(-)b/meson.build (-2 / +5 lines)
434	xfixes_dep = dependency('xfixes', required: false)	434	xfixes_dep = dependency('xfixes', required: false)
435	xcomposite_dep = dependency('xcomposite', required: false)	435	xcomposite_dep = dependency('xcomposite', required: false)
436	fontconfig_dep = dependency('fontconfig')	436	fontconfig_dep = dependency('fontconfig')
437	atkbridge_dep = dependency('atk-bridge-2.0', version: atk_req)
438		437
439	backend_immodules += ['xim']	438	backend_immodules += ['xim']
440		439
Lines 453-459 if x11_enabled Link Here
453	x11_pkgs += ['xdamage']	452	x11_pkgs += ['xdamage']
454	endif	453	endif
455		454
456	atk_pkgs += ['atk-bridge-2.0']	455	if get_option('enable-atk-bridge')
		456	atkbridge_dep = dependency('atk-bridge-2.0', version: atk_req)
		457	atk_pkgs += ['atk-bridge-2.0']
		458	cdata.set('HAVE_ATK_BRIDGE', 1)
		459	endif
457		460
458	cdata.set('HAVE_XDAMAGE', xdamage_dep.found())	461	cdata.set('HAVE_XDAMAGE', xdamage_dep.found())
459	cdata.set('HAVE_XCURSOR', xcursor_dep.found())	462	cdata.set('HAVE_XCURSOR', xcursor_dep.found())