Skip to content

Commit 3fc6c6e

Browse files
Make wayland dependency optional (#3347)
1 parent 7be3fbf commit 3fc6c6e

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

eel/eel-gtk-extensions.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@
3838
#include <X11/Xatom.h>
3939
#include <gdk/gdk.h>
4040
#include <gdk/gdkprivate.h>
41+
#ifdef GDK_WINDOWING_WAYLAND
4142
#include <gdk/gdkwayland.h>
43+
#endif
4244
#include <gtk/gtk.h>
4345
#include <glib/gi18n-lib.h>
4446
#include <math.h>
@@ -253,14 +255,15 @@ gboolean
253255
eel_check_is_wayland (void)
254256
{
255257
static gboolean using_wayland = FALSE;
258+
#ifdef GDK_WINDOWING_WAYLAND
256259
static gsize once_init = 0;
257260

258261
if (g_once_init_enter (&once_init)) {
259262
using_wayland = GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ());
260263

261264
g_once_init_leave (&once_init, 1);
262265
}
263-
266+
#endif
264267
return using_wayland;
265268
}
266269

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ glib_version = '>=2.45.7'
7272
math = cc.find_library('m', required: true)
7373

7474
gtk = dependency('gtk+-3.0', version: '>=3.10.0')
75-
gtk_wl = dependency('gtk+-wayland-3.0', version: '>=3.10.0')
7675
gio = dependency('gio-2.0', version: glib_version)
7776
gio_unix= dependency('gio-unix-2.0', version: glib_version)
7877
glib = dependency('glib-2.0', version: glib_version)
@@ -203,6 +202,7 @@ message('\n'.join(['',
203202
' libexif support: @0@'.format(libexif_enabled),
204203
' exempi support: @0@'.format(exempi_enabled),
205204
' Tracker support: @0@'.format(tracker_enabled),
205+
' Wayland support: @0@'.format(cc.has_header('gdk/gdkwayland.h', dependencies: gtk)),
206206
'',
207207
' nemo-extension documentation: @0@'.format(gtkdoc_enabled),
208208
' nemo-extension introspection: @0@'.format(true),

0 commit comments

Comments
 (0)