spacepaste

Paste details

reply | raw

  1.  
  2. $ cat /tmp/gtk+-3.22.19.atk-bridge.patch
  3. $NetBSD: patch-configure.ac,v 1.2 2014/09/08 12:06:48 wiz Exp $
  5. Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
  7. --- 1/configure.ac
  8. +++ 2/configure.ac
  9. @@ -1370,8 +1370,13 @@ AC_SUBST(GDK_DEP_CFLAGS)
  10. # Check for Accessibility Toolkit flags
  11. ########################################
  13. -if test x$enable_x11_backend = xyes; then
  14. +AC_ARG_WITH(atk-bridge,
  15. + AS_HELP_STRING([--without-atk-bridge], [Do not use atk-bridge-2.0]),
  16. + :, with_atk_bridge=yes)
  17. +
  18. +if test x$enable_x11_backend = xyes -a x$with_atk_bridge = xyes; then
  19. ATK_PACKAGES="atk atk-bridge-2.0"
  20. + AC_DEFINE([HAVE_ATK_BRIDGE], [1], [Define if we're using atk-bridge-2.0])
  21. else
  22. ATK_PACKAGES="atk"
  23. fi
  24. $NetBSD: patch-config.h.in,v 1.2 2014/09/08 12:06:48 wiz Exp $
  26. Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
  28. --- 1/config.h.in
  29. +++ 1/config.h.in
  30. @@ -10,6 +10,9 @@
  31. /* Disable deprecation warnings from glib */
  32. #undef GLIB_DISABLE_DEPRECATION_WARNINGS
  34. +/* Define if we're using atk-bridge-2.0 */
  35. +#undef HAVE_ATK_BRIDGE
  36. +
  37. /* Define to 1 if you have the `bind_textdomain_codeset' function. */
  38. #undef HAVE_BIND_TEXTDOMAIN_CODESET
  40. Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
  41. --- 1/gtk/a11y/gtkaccessibility.c
  42. +++ 1/gtk/a11y/gtkaccessibility.c
  43. @@ -38,8 +38,10 @@
  44. #include <gtk/gtkaccessible.h>
  46. #ifdef GDK_WINDOWING_X11
  47. +#ifdef HAVE_ATK_BRIDGE
  48. #include <atk-bridge.h>
  49. #endif
  50. +#endif
  52. static gboolean gail_focus_watcher (GSignalInvocationHint *ihint,
  53. guint n_param_values,
  54. @@ -989,8 +991,10 @@ _gtk_accessibility_init (void)
  55. do_window_event_initialization ();
  57. #ifdef GDK_WINDOWING_X11
  58. +#ifdef HAVE_ATK_BRIDGE
  59. atk_bridge_adaptor_init (NULL, NULL);
  60. #endif
  61. +#endif
  63. atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
  64. }
  66. $ cat /tmp/gtk+-3.22.19.ebuild.patch
  67. --- /usr/portage/x11-libs/gtk+/gtk+-3.22.19.ebuild 2018-05-21 20:39:19.000000000 -0500
  68. +++ /usr/local/portage/x11-libs/gtk+/gtk+-3.22.19.ebuild 2018-07-19 17:49:00.890779434 -0500
  69. @@ -11,7 +11,7 @@
  71. LICENSE="LGPL-2+"
  72. SLOT="3"
  73. -IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
  74. +IUSE="aqua atk-bridge broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
  75. REQUIRED_USE="
  76. || ( aqua wayland X )
  77. xinerama? ( X )
  78. @@ -48,7 +48,7 @@
  79. >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
  80. )
  81. X? (
  82. - >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
  83. + atk-bridge? ( >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] )
  84. x11-libs/libX11[${MULTILIB_USEDEP}]
  85. >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
  86. x11-libs/libXext[${MULTILIB_USEDEP}]
  87. @@ -120,6 +120,9 @@
  88. # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
  89. eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
  91. + # get rid of gtk3-atk-bridge crap
  92. + eapply "${FILESDIR}"/${PN}-3.22.19.atk-bridge.patch
  93. +
  94. eautoreconf
  95. gnome2_src_prepare
  96. }
  97. @@ -143,6 +146,7 @@
  98. $(use_enable X xkb) \
  99. $(use_enable X xrandr) \
  100. $(use_enable xinerama) \
  101. + $(use_with atk-bridge) \
  102. --disable-papi \
  103. --disable-mir-backend \
  104. --enable-man \
  105.  
Powered by spacepaste. Paste removal.