mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-07-03 18:18:44 +08:00
64 lines
2.2 KiB
Diff
64 lines
2.2 KiB
Diff
diff -ruwN gtk+-3.24.43/gtk/a11y/gtkaccessibility.c source/gtk/a11y/gtkaccessibility.c
|
|
--- gtk+-3.24.43/gtk/a11y/gtkaccessibility.c 2024-07-10 11:03:14.000000000 -0600
|
|
+++ source/gtk/a11y/gtkaccessibility.c 2025-05-04 19:46:06.985224833 -0600
|
|
@@ -37,7 +37,7 @@
|
|
#include <gtk/gtktogglebutton.h>
|
|
#include <gtk/gtkaccessible.h>
|
|
|
|
-#ifdef GDK_WINDOWING_X11
|
|
+#if defined(GDK_WINDOWING_X11) && !defined(__redox__)
|
|
#include <atk-bridge.h>
|
|
#endif
|
|
|
|
@@ -254,7 +254,7 @@
|
|
}
|
|
}
|
|
|
|
-#ifdef GDK_WINDOWING_X11
|
|
+#if defined(GDK_WINDOWING_X11) && !defined(__redox__)
|
|
/*
|
|
* If the focus widget is a GtkSocket without a plug
|
|
* then ignore the focus notification as the embedded
|
|
@@ -986,7 +986,7 @@
|
|
_gtk_accessibility_override_atk_util ();
|
|
do_window_event_initialization ();
|
|
|
|
-#ifdef GDK_WINDOWING_X11
|
|
+#if defined(GDK_WINDOWING_X11) && !defined(__redox__)
|
|
atk_bridge_adaptor_init (NULL, NULL);
|
|
#endif
|
|
|
|
diff -ruwN gtk+-3.24.43/gtk/gtkmain.c source/gtk/gtkmain.c
|
|
--- gtk+-3.24.43/gtk/gtkmain.c 2024-07-10 11:03:14.000000000 -0600
|
|
+++ source/gtk/gtkmain.c 2025-05-13 17:04:00.340216840 -0600
|
|
@@ -355,7 +355,7 @@
|
|
check_setugid (void)
|
|
{
|
|
/* this isn't at all relevant on MS Windows and doesn't compile ... --hb */
|
|
-#ifndef G_OS_WIN32
|
|
+#if !defined(G_OS_WIN32) && !defined(__redox__)
|
|
uid_t ruid, euid, suid; /* Real, effective and saved user ID's */
|
|
gid_t rgid, egid, sgid; /* Real, effective and saved group ID's */
|
|
|
|
diff -ruwN gtk+-3.24.43/meson.build source/meson.build
|
|
--- gtk+-3.24.43/meson.build 2024-07-10 11:03:14.000000000 -0600
|
|
+++ source/meson.build 2025-05-10 13:39:34.329344669 -0600
|
|
@@ -565,7 +565,7 @@
|
|
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)
|
|
+ #TODO atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req)
|
|
|
|
backend_immodules += ['xim']
|
|
|
|
@@ -584,7 +584,7 @@
|
|
x11_pkgs += ['xdamage']
|
|
endif
|
|
|
|
- atk_pkgs += ['atk-bridge-2.0']
|
|
+ #atk_pkgs += ['atk-bridge-2.0']
|
|
|
|
cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false)
|
|
cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false)
|