From 05f9c34ad0b6bb3ef719db3df5fb44e3d6a5c2aa Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Fri, 28 Apr 2023 09:59:19 +0200 Subject: [PATCH] package/libgtk3: re-enable atk-bridge The at-spi2-core and at-spi2-atk were merged, and are now built by default, so this patch is no longer required. Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Reviewed-by: Adrian Perez de Castro [yann.morin.1998@free.fr: - rename remaining patch, - update .checkpackageignore ] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 3 +- ...ndency-from-gtk-encode-symbolic-svg.patch} | 0 package/libgtk3/0001-disable-atk-bridge.patch | 41 ------------------- 3 files changed, 1 insertion(+), 43 deletions(-) rename package/libgtk3/{0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch => 0001-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch} (100%) delete mode 100644 package/libgtk3/0001-disable-atk-bridge.patch diff --git a/.checkpackageignore b/.checkpackageignore index 94a32e0531..3ac032400b 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -772,8 +772,7 @@ package/libgpgme/0001-Fix-build-without-threads.patch Upstream package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch Upstream package/libgsm/0001-misc-fixes-from-archlinux.patch Upstream package/libgtk2/0001-reduce-dependencies.patch Upstream -package/libgtk3/0001-disable-atk-bridge.patch Upstream -package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch Upstream +package/libgtk3/0001-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch Upstream package/libhdhomerun/0001-dont-strip.patch Upstream package/libhid/0001-dont-fiddle-with-debug-flags.patch Upstream package/libhid/0002-no-newline-in-ldflags.patch Upstream diff --git a/package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch b/package/libgtk3/0001-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch similarity index 100% rename from package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch rename to package/libgtk3/0001-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch deleted file mode 100644 index f3e9bff2ba..0000000000 --- a/package/libgtk3/0001-disable-atk-bridge.patch +++ /dev/null @@ -1,41 +0,0 @@ -Remove atk-bridge support. - -atk-bridge doesn't seem useful for now in Buildroot and requires to -add two new packages just for it: at-spi2-core and at-spi2-atk. - -Signed-off-by: Hadrien Boutteville - ---- a/gtk/a11y/gtkaccessibility.c -+++ b/gtk/a11y/gtkaccessibility.c -@@ -37,10 +37,6 @@ - #include - #include - --#ifdef GDK_WINDOWING_X11 --#include --#endif -- - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, - guint n_param_values, - const GValue *param_values, -@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) - _gtk_accessibility_override_atk_util (); - do_window_event_initialization (); - --#ifdef GDK_WINDOWING_X11 -- atk_bridge_adaptor_init (NULL, NULL); --#endif -- - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); - } ---- a/meson.build -+++ b/meson.build -@@ -564,7 +564,7 @@ if x11_enabled - xfixes_dep = dependency('xfixes', required: false) - xcomposite_dep = dependency('xcomposite', required: false) - fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) -- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) -+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) - - backend_immodules += ['xim'] -