View | Details | Raw Unified | Return to bug 194460 | Differences between
and this patch

Collapse All | Expand All

(-)x11-toolkits/gtk30/Makefile (-4 / +6 lines)
Lines 24-34 PORTSCOUT= ignore:1 Link Here
24
.else
24
.else
25
PORTSCOUT=	limit:1,even
25
PORTSCOUT=	limit:1,even
26
26
27
BUILD_DEPENDS+=	at-spi2-atk>=0:${PORTSDIR}/accessibility/at-spi2-atk
28
LIB_DEPENDS=	libepoxy.so:${PORTSDIR}/graphics/libepoxy
27
LIB_DEPENDS=	libepoxy.so:${PORTSDIR}/graphics/libepoxy
29
RUN_DEPENDS+=	hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme \
28
RUN_DEPENDS+=	hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme \
30
		adwaita-icon-theme>=0:${PORTSDIR}/x11-themes/adwaita-icon-theme \
29
		adwaita-icon-theme>=0:${PORTSDIR}/x11-themes/adwaita-icon-theme \
31
		at-spi2-atk>=0:${PORTSDIR}/accessibility/at-spi2-atk
32
30
33
USE_PERL5=	build
31
USE_PERL5=	build
34
USE_LDCONFIG=	yes
32
USE_LDCONFIG=	yes
Lines 54-66 GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ Link Here
54
		org.gtk.Settings.Debug.gschema.xml \
52
		org.gtk.Settings.Debug.gschema.xml \
55
		org.gtk.Settings.FileChooser.gschema.xml
53
		org.gtk.Settings.FileChooser.gschema.xml
56
54
57
OPTIONS_DEFINE=	CUPS CLOUDPRINT COLORD DEBUG BROADWAY
55
OPTIONS_DEFINE=	ATK_BRIDGE CUPS CLOUDPRINT COLORD DEBUG BROADWAY
58
OPTIONS_DEFAULT=CUPS COLORD BROADWAY
56
OPTIONS_DEFAULT=ATK_BRIDGE CUPS COLORD BROADWAY
59
OPTIONS_SUB=	yes
57
OPTIONS_SUB=	yes
60
58
61
BROADWAY_DESC=	Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets.
59
BROADWAY_DESC=	Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets.
62
BROADWAY_CONFIGURE_ENABLE=	broadway-backend
60
BROADWAY_CONFIGURE_ENABLE=	broadway-backend
63
61
62
ATK_BRIDGE_CONFIGURE_WITH=atk-bridge
63
ATK_BRIDGE_LIB_DEPENDS=libatk-bridge-2.0.so:${PORTSDIR}/accessibility/at-spi2-atk
64
ATK_BRIDGE_DESC=AT-SPI ATK bridge support (depends on devel/dbus)
65
64
COLORD_DESC=	Color profile support
66
COLORD_DESC=	Color profile support
65
COLORD_LIB_DEPENDS=	libcolord.so:${PORTSDIR}/graphics/colord
67
COLORD_LIB_DEPENDS=	libcolord.so:${PORTSDIR}/graphics/colord
66
COLORD_CONFIGURE_ENABLE=colord
68
COLORD_CONFIGURE_ENABLE=colord
(-)x11-toolkits/gtk30/files/patch-atk-bridge-option (+80 lines)
Line 0 Link Here
1
# Revert bug 677491 comment 45
2
3
diff --git configure configure
4
index  **NOT SURE HERE**
5
--- configure
6
+++ configure
7
@@ -1061,6 +1061,7 @@
8
 enable_modules
9
 with_included_immodules
10
 with_x
11
+with_atk_bridge
12
 enable_win32_gles
13
 enable_cups
14
 enable_papi
15
@@ -1838,6 +1839,7 @@
16
   --with-included-immodules=MODULE1,MODULE2,...
17
                           build the specified input methods into gtk
18
   --with-x                use the X Window System
19
+  --without-atk-bridge    Do not use atk-bridge-2.0
20
   --with-html-dir=PATH    path to installed docs
21
   --with-xml-catalog=CATALOG
22
                           path to xml catalog to use
23
@@ -27103,8 +27105,20 @@
24
 # Check for Accessibility Toolkit flags
25
 ########################################
26
 
27
-if test x$enable_x11_backend = xyes; then
28
+
29
+# Check whether --with-atk-bridge was given.
30
+if test "${with_atk_bridge+set}" = set; then :
31
+  withval=$with_atk_bridge; :
32
+else
33
+  with_atk_bridge=$enable_x11_backend
34
+fi
35
+
36
+
37
+if test x$with_atk_bridge != xno; then
38
    ATK_PACKAGES="atk atk-bridge-2.0"
39
+
40
+$as_echo "#define HAVE_ATK_BRIDGE 1" >>confdefs.h
41
+
42
 else
43
    ATK_PACKAGES="atk"
44
 fi
45
diff --git config.h.in config.h.in
46
index d4c2262..37b6349 100644
47
--- config.h.in
48
+++ config.h.in
49
@@ -15,6 +15,9 @@
50
 /* Define the location where the catalogs will be installed */
51
 #undef GTK_LOCALEDIR
52
 
53
+/* Define if we're using atk-bridge-2.0 */
54
+#undef HAVE_ATK_BRIDGE
55
+
56
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
57
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
58
 
59
diff --git gtk/a11y/gtkaccessibility.c gtk/a11y/gtkaccessibility.c
60
index 4f5028b..ff8450a 100644
61
--- gtk/a11y/gtkaccessibility.c
62
+++ gtk/a11y/gtkaccessibility.c
63
@@ -37,7 +37,7 @@
64
 #include <gtk/gtktogglebutton.h>
65
 #include <gtk/gtkaccessible.h>
66
 
67
-#ifdef GDK_WINDOWING_X11
68
+#ifdef HAVE_ATK_BRIDGE
69
 #include <atk-bridge.h>
70
 #endif
71
 
72
@@ -987,7 +987,7 @@ _gtk_accessibility_init (void)
73
   _gtk_accessibility_override_atk_util ();
74
   do_window_event_initialization ();
75
 
76
-#ifdef GDK_WINDOWING_X11
77
+#ifdef HAVE_ATK_BRIDGE
78
   atk_bridge_adaptor_init (NULL, NULL);
79
 #endif
80
 
0
81

Return to bug 194460