summaryrefslogtreecommitdiff
path: root/x11-toolkits/gtk30/files/patch-atk-bridge-option
diff options
context:
space:
mode:
authorNuno Teixeira <eduardo@FreeBSD.org>2023-12-23 12:56:37 +0000
committerNuno Teixeira <eduardo@FreeBSD.org>2023-12-23 18:14:13 +0000
commit0a1dd69c3167141ace3cb39e897fd6e6ee0026c1 (patch)
treec5f3de1f2e97c90b2400a1fe6f08f77eefcdf8aa /x11-toolkits/gtk30/files/patch-atk-bridge-option
parentaudio/sidplayfp: Update to 2.5.1 (diff)
x11-toolkits/gtk30: Update to 3.24.38
- Switch to DISTVERSION - Switch to meson build - Fix ATK_BRIGDE option (deps run detection: #PR269963) - Group backends into multi option (at least one backend needed to build) - Pet portlint, portclippy and portfmt ChangeLog: https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/NEWS PR: 269963, 275567 Exp-run by: antoine
Diffstat (limited to 'x11-toolkits/gtk30/files/patch-atk-bridge-option')
-rw-r--r--x11-toolkits/gtk30/files/patch-atk-bridge-option124
1 files changed, 36 insertions, 88 deletions
diff --git a/x11-toolkits/gtk30/files/patch-atk-bridge-option b/x11-toolkits/gtk30/files/patch-atk-bridge-option
index aa07786f757d..fe5bb6ce22a9 100644
--- a/x11-toolkits/gtk30/files/patch-atk-bridge-option
+++ b/x11-toolkits/gtk30/files/patch-atk-bridge-option
@@ -1,120 +1,68 @@
Revert https://gitlab.gnome.org/GNOME/gtk/-/commit/ed8203e700aa
+NetBSD pkgsrc patch
---- config.h.in.orig 2019-07-03 20:26:06 UTC
-+++ config.h.in
-@@ -10,6 +10,9 @@
- /* Disable deprecation warnings from glib */
- #undef GLIB_DISABLE_DEPRECATION_WARNINGS
-
-+/* Define to use atk-bridge-2.0 */
-+#undef HAVE_ATK_BRIDGE
-+
- /* Define to 1 if you have the `bind_textdomain_codeset' function. */
- #undef HAVE_BIND_TEXTDOMAIN_CODESET
-
---- config.h.meson.orig 2019-06-17 17:04:21 UTC
-+++ config.h.meson
-@@ -11,6 +11,9 @@
- /* Disable deprecation warnings from glib */
- #mesondefine GLIB_DISABLE_DEPRECATION_WARNINGS
-
-+/* Define to use atk-bridge-2.0 */
-+#mesondefine HAVE_ATK_BRIDGE
-+
- /* Define to 1 if you have the `bind_textdomain_codeset' function. */
- #mesondefine HAVE_BIND_TEXTDOMAIN_CODESET
-
---- configure.orig 2019-07-03 20:26:06 UTC
-+++ configure
-@@ -1061,6 +1061,7 @@ enable_glibtest
- enable_modules
- with_included_immodules
- with_x
-+with_atk_bridge
- enable_win32_gles
- enable_cups
- enable_papi
-@@ -1838,6 +1839,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 AT-SPI ATK bridge
- --with-html-dir=PATH path to installed docs
- --with-xml-catalog=CATALOG
- path to xml catalog to use
-@@ -27103,8 +27105,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
---- gtk/a11y/gtkaccessibility.c.orig 2019-01-03 00:44:12 UTC
+--- gtk/a11y/gtkaccessibility.c.orig 2023-05-22 02:22:08 UTC
+++ gtk/a11y/gtkaccessibility.c
-@@ -37,7 +37,7 @@
- #include <gtk/gtktogglebutton.h>
+@@ -38,8 +38,10 @@
#include <gtk/gtkaccessible.h>
--#ifdef GDK_WINDOWING_X11
+ #ifdef GDK_WINDOWING_X11
+#ifdef HAVE_ATK_BRIDGE
#include <atk-bridge.h>
#endif
++#endif
-@@ -988,7 +988,7 @@ _gtk_accessibility_init (void)
- _gtk_accessibility_override_atk_util ();
+ static gboolean gail_focus_watcher (GSignalInvocationHint *ihint,
+ guint n_param_values,
+@@ -989,7 +991,9 @@ _gtk_accessibility_init (void)
do_window_event_initialization ();
--#ifdef GDK_WINDOWING_X11
+ #ifdef GDK_WINDOWING_X11
+#ifdef HAVE_ATK_BRIDGE
atk_bridge_adaptor_init (NULL, NULL);
++#endif
#endif
---- meson.build.orig 2020-12-06 00:49:26 UTC
+ atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
+--- meson.build.orig 2023-05-22 02:22:08 UTC
+++ meson.build
-@@ -576,7 +576,7 @@ if x11_enabled
+@@ -137,6 +137,7 @@ win32_enabled = get_option('win32_backend')
+ broadway_enabled = get_option('broadway_backend')
+ quartz_enabled = get_option('quartz_backend')
+ win32_enabled = get_option('win32_backend')
++atkbridge_enabled = get_option('atk_bridge')
+
+ os_unix = false
+ os_linux = false
+@@ -564,7 +565,10 @@ 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: get_option('atk-bridge'))
++ if atkbridge_enabled
+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req)
++ cdata.set('HAVE_ATK_BRIDGE', 1)
++ endif
- x11_pkgs = ['fontconfig', 'x11', 'xext', 'xi', 'xrandr']
+ backend_immodules += ['xim']
-@@ -593,7 +593,10 @@ if x11_enabled
+@@ -583,7 +587,9 @@ if x11_enabled
x11_pkgs += ['xdamage']
endif
-- atk_pkgs += ['atk-bridge-2.0']
-+ if atkbridge_dep.found()
-+ atk_pkgs += ['atk-bridge-2.0']
-+ cdata.set('HAVE_ATK_BRIDGE', 1)
++ if atkbridge_enabled
+ atk_pkgs += ['atk-bridge-2.0']
+ endif
cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false)
cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false)
---- meson_options.txt.orig 2019-06-17 18:03:27 UTC
+--- meson_options.txt.orig 2023-05-22 02:22:08 UTC
+++ meson_options.txt
-@@ -13,6 +13,8 @@ option('mir_backend', type: 'boolean', value: false,
- description : 'Enable the Mir gdk backend')
+@@ -9,6 +9,8 @@ option('quartz_backend', type: 'boolean', value: true,
+ description : 'Enable the Windows gdk backend (only when building on Windows)')
+ option('quartz_backend', type: 'boolean', value: true,
+ description : 'Enable the macOS gdk backend (only when building on macOS)')
++option('atk_bridge', type: 'boolean', value: true,
++ description : 'Enable Atk bridge')
# Optional dependencies
-+option('atk-bridge', type: 'boolean', value: 'true',
-+ description : 'Enable AT-SPI ATK bridge support')
option('xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
- description : 'Enable support for the Xinerama extension')
- option('cloudproviders', type: 'boolean', value: false,