FreeBSD Bugzilla – Attachment 148453 Details for
Bug 194460
x11-toolkits/gtk30: add ATK_BRIDGE option
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch, ports version (3.8.8)
no_atk-bridge.diff (text/plain), 4.01 KB, created by
Jan Beich
on 2014-10-19 02:11:02 UTC
(
hide
)
Description:
patch, ports version (3.8.8)
Filename:
MIME Type:
Creator:
Jan Beich
Created:
2014-10-19 02:11:02 UTC
Size:
4.01 KB
patch
obsolete
>Index: x11-toolkits/gtk30/Makefile >=================================================================== >--- x11-toolkits/gtk30/Makefile (revision 371166) >+++ x11-toolkits/gtk30/Makefile (working copy) >@@ -24,9 +24,7 @@ PORTSCOUT= ignore:1 > .else > PORTSCOUT= limit:1,even > >-BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk >-RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ >- ${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk >+RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme > > USE_PERL5= build > USE_LDCONFIG= yes >@@ -49,12 +47,19 @@ GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ > org.gtk.Settings.ColorChooser.gschema.xml \ > org.gtk.Settings.FileChooser.gschema.xml > >-OPTIONS_DEFINE= CUPS COLORD DEBUG >-OPTIONS_DEFAULT=CUPS COLORD >+OPTIONS_DEFINE= ATK_BRIDGE CUPS COLORD DEBUG >+OPTIONS_DEFAULT=ATK_BRIDGE CUPS COLORD >+ATK_BRIDGE_DESC=AT-SPI ATK bridge support (depends on devel/dbus) > COLORD_DESC= Color profile support > > .include <bsd.port.options.mk> > >+.if ${PORT_OPTIONS:MATK_BRIDGE} >+LIB_DEPENDS+= libatk-bridge-2.0.so:${PORTSDIR}/accessibility/at-spi2-atk >+.else >+CONFIGURE_ARGS+=--without-atk-bridge >+.endif >+ > .if ${PORT_OPTIONS:MCUPS} > LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client > CONFIGURE_ARGS+=--enable-cups=auto >Index: x11-toolkits/gtk30/files/patch-atk-bridge-option >=================================================================== >--- x11-toolkits/gtk30/files/patch-atk-bridge-option (revision 0) >+++ x11-toolkits/gtk30/files/patch-atk-bridge-option (working copy) >@@ -0,0 +1,89 @@ >+# Revert bug 677491 comment 45 >+ >+diff --git configure configure.ac >+index d4c2262..37b6349 100644 >+--- configure >++++ configure >+@@ -1039,6 +1039,7 @@ enable_glibtest >+ enable_modules >+ with_included_immodules >+ with_x >++with_atk_bridge >+ enable_cups >+ enable_papi >+ enable_cloudprint >+@@ -1790,6 +1791,7 @@ Optional Packages: >+ --with-included-immodules=MODULE1,MODULE2,... >+ build the specified input methods into gtk >+ --with-x use the X Window System >++ --without-atk-bridge Do not use atk-bridge-2.0 >+ --with-html-dir=PATH path to installed docs >+ --with-xml-catalog=CATALOG >+ path to xml catalog to use >+@@ -24609,8 +24611,20 @@ fi >+ # Check for Accessibility Toolkit flags >+ ######################################## >+ >+-if test x$enable_x11_backend = xyes; then >++ >++# Check whether --with-atk-bridge was given. >++if test "${with_atk_bridge+set}" = set; then : >++ withval=$with_atk_bridge; : >++else >++ with_atk_bridge=$enable_x11_backend >++fi >++ >++ >++if test x$with_atk_bridge != xno; then >+ ATK_PACKAGES="atk atk-bridge-2.0" >++ >++$as_echo "#define HAVE_ATK_BRIDGE 1" >>confdefs.h >++ >+ else >+ ATK_PACKAGES="atk" >+ fi >+diff --git config.h.in config.h.in >+index d4c2262..37b6349 100644 >+--- config.h.in >++++ config.h.in >+@@ -15,6 +15,9 @@ >+ /* Define the location where the catalogs will be installed */ >+ #undef GTK_LOCALEDIR >+ >++/* Define if we're using atk-bridge-2.0 */ >++#undef HAVE_ATK_BRIDGE >++ >+ /* Define to 1 if you have the `bind_textdomain_codeset' function. */ >+ #undef HAVE_BIND_TEXTDOMAIN_CODESET >+ >+diff --git gtk/a11y/gtkaccessibility.c gtk/a11y/gtkaccessibility.c >+index 4f5028b..ff8450a 100644 >+--- gtk/a11y/gtkaccessibility.c >++++ gtk/a11y/gtkaccessibility.c >+@@ -37,7 +37,7 @@ >+ #include <gtk/gtkcombobox.h> >+ #include <gtk/gtkaccessible.h> >+ >+-#ifdef GDK_WINDOWING_X11 >++#ifdef HAVE_ATK_BRIDGE >+ #include <atk-bridge.h> >+ #endif >+ >+@@ -989,7 +989,7 @@ _gtk_accessibility_shutdown (void) >+ >+ g_clear_object (&atk_misc_instance); >+ >+-#ifdef GDK_WINDOWING_X11 >++#ifdef HAVE_ATK_BRIDGE >+ atk_bridge_adaptor_cleanup (); >+ #endif >+ >+@@ -1011,7 +1011,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 >+
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 194460
:
148452
|
148453
|
148454
|
148456
|
148457
|
148458
|
167889
|
186991
|
206632