| Message ID | 20230227105838.358916-4-thomas.devoogdt@barco.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [v5,1/5] package/at-spi2-core: bump to version 2.47.1 | expand |
On Mon, 27 Feb 2023 11:58:37 +0100 Thomas Devoogdt <thomas@devoogdt.com> wrote: > 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 <thomas.devoogdt@barco.com> Tested-by: Adrian Perez de Castro <aperez@igalia.com> > --- > v5: added re-enable atk-bridge patch to the package/at-spi2-core: bump to version 2.47.1 group > --- > package/libgtk3/0001-disable-atk-bridge.patch | 41 ------------------- > 1 file changed, 41 deletions(-) > delete mode 100644 package/libgtk3/0001-disable-atk-bridge.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 <hadrien.boutteville@gmail.com> > - > ---- a/gtk/a11y/gtkaccessibility.c > -+++ b/gtk/a11y/gtkaccessibility.c > -@@ -37,10 +37,6 @@ > - #include <gtk/gtktogglebutton.h> > - #include <gtk/gtkaccessible.h> > - > --#ifdef GDK_WINDOWING_X11 > --#include <atk-bridge.h> > --#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'] > - > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > Cheers, —Adrián
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 <hadrien.boutteville@gmail.com> - ---- a/gtk/a11y/gtkaccessibility.c -+++ b/gtk/a11y/gtkaccessibility.c -@@ -37,10 +37,6 @@ - #include <gtk/gtktogglebutton.h> - #include <gtk/gtkaccessible.h> - --#ifdef GDK_WINDOWING_X11 --#include <atk-bridge.h> --#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'] -
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 <thomas.devoogdt@barco.com> --- v5: added re-enable atk-bridge patch to the package/at-spi2-core: bump to version 2.47.1 group --- package/libgtk3/0001-disable-atk-bridge.patch | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 package/libgtk3/0001-disable-atk-bridge.patch