add patched gtk+ from flussence

3 files changed, 137 insertions, 0 deletions

diff --git a/x11-libs/gtk+/files/atk-bridge.patch b/x11-libs/gtk+/files/atk-bridge.patch
new file mode 100644
index 0000000..298942a
--- /dev/null
+++ b/x11-libs/gtk+/files/atk-bridge.patch
@@ -0,0 +1,87 @@
+From 168e00a41c383aed29f442f56e4d2a28baa47e11 Mon Sep 17 00:00:00 2001
+From: Enne Eziarc <flussence+git@flussence.eu>
+Date: Fri, 3 Mar 2023 20:24:31 +0000
+Subject: [PATCH 2/2] Make atk-bridge optional on X11
+
+---
+ gtk/a11y/gtkaccessibility.c |  4 ++--
+ meson.build                 | 13 ++++++++++---
+ meson_options.txt           |  2 ++
+ 3 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c
+index 7f0e5207d..f2ef2eb7e 100644
+--- a/gtk/a11y/gtkaccessibility.c
++++ b/gtk/a11y/gtkaccessibility.c
+@@ -37,7 +37,7 @@
+ #include <gtk/gtktogglebutton.h>
+ #include <gtk/gtkaccessible.h>
+ 
+-#ifdef GDK_WINDOWING_X11
++#ifdef HAVE_ATK_BRIDGE
+ #include <atk-bridge.h>
+ #endif
+ 
+@@ -988,7 +988,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
+ 
+diff --git a/meson.build b/meson.build
+index 5444fa112..000fd3932 100644
+--- a/meson.build
++++ b/meson.build
+@@ -564,7 +564,6 @@ 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)
+ 
+   backend_immodules += ['xim']
+ 
+@@ -583,8 +582,6 @@ if x11_enabled
+     x11_pkgs += ['xdamage']
+   endif
+ 
+-  atk_pkgs += ['atk-bridge-2.0']
+-
+   cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false)
+   cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false)
+   cdata.set('HAVE_XCOMPOSITE', xcomposite_dep.found() ? 1 : false)
+@@ -626,6 +623,16 @@ if x11_enabled
+     cdata.set('XINPUT_2_4', 1)
+   endif
+ 
++  enable_atk_bridge = get_option('atk_bridge')
++  if enable_atk_bridge
++    atkbridge_dep  = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: enable_atk_bridge)
++    if atkbridge_dep.found()
++      cdata.set('HAVE_ATK_BRIDGE', 1)
++      atk_pkgs += ['atk-bridge-2.0']
++    endif
++  else
++    atkbridge_dep = []
++  endif
+ 
+   enable_xinerama = get_option('xinerama')
+   if enable_xinerama != 'no'
+diff --git a/meson_options.txt b/meson_options.txt
+index 94099aa01..c4ec4fd44 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -11,6 +11,8 @@ option('quartz_backend', type: 'boolean', value: true,
+   description : 'Enable the macOS gdk backend (only when building on macOS)')
+ 
+ # 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,
+-- 
+2.39.2
+
diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini
new file mode 100644
index 0000000..a65c0a8
--- /dev/null
+++ b/x11-libs/gtk+/files/settings.ini
@@ -0,0 +1,4 @@
+[Settings]
+gtk-theme-name = Adwaita
+gtk-icon-theme-name = gnome
+gtk-cursor-theme-name = Adwaita
diff --git a/x11-libs/gtk+/files/update-icon-cache.patch b/x11-libs/gtk+/files/update-icon-cache.patch
new file mode 100644
index 0000000..a658997
--- /dev/null
+++ b/x11-libs/gtk+/files/update-icon-cache.patch
@@ -0,0 +1,46 @@
+From 122eb59b31368fd1bc077dc066e3abefb1ee6c6e Mon Sep 17 00:00:00 2001
+From: Enne Eziarc <flussence+git@flussence.eu>
+Date: Fri, 3 Mar 2023 21:07:28 +0000
+Subject: [PATCH 1/2] Don't build or use bundled gtk-update-icon-cache
+
+---
+ docs/reference/gtk/meson.build |  1 -
+ gtk/meson.build                | 10 ----------
+ 2 files changed, 11 deletions(-)
+
+diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
+index 9fa282d38..6e84d9ffa 100644
+--- a/docs/reference/gtk/meson.build
++++ b/docs/reference/gtk/meson.build
+@@ -500,7 +500,6 @@ if get_option('man') and xsltproc.found()
+ 
+   man_files = [
+     [ 'gtk-query-immodules-3.0', '1', ],
+-    [ 'gtk-update-icon-cache', '1', ],
+     [ 'gtk-encode-symbolic-svg', '1', ],
+     [ 'gtk-launch', '1', ],
+     [ 'gtk-builder-tool', '1', ],
+diff --git a/gtk/meson.build b/gtk/meson.build
+index 4b7a453e1..944c091dd 100644
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1113,16 +1113,6 @@ if win32_enabled
+   extra_update_icon_cache_objs = import('windows').compile_resources(uac_rc)
+ endif
+ 
+-gtk_update_icon_cache = executable(
+-  'gtk-update-icon-cache',
+-  'updateiconcache.c',
+-  extra_update_icon_cache_objs,
+-  c_args: gtk_cargs,
+-  dependencies: libgtk_dep,
+-  install: true
+-)
+-gtk_tools += gtk_update_icon_cache
+-
+ gtk_query_immodules = executable(
+   'gtk-query-immodules-3.0',
+   'queryimmodules.c',
+-- 
+2.39.2
+