AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-09 18:30:08 +00:00
Code Issues Projects Releases Wiki Activity

build: Don't require bleeding-edge wayland-protocols

Browse Source 
The 1.32 wayland-protocols release is not in distribution
builds yet, so a hard dependency on it is not helpful.
This commit is contained in:
Matthias Clasen 2023-07-30 11:08:11 +03:00
parent 7f946eff01
commit 327c93066d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/wayland/gdktoplevel-wayland.c
View File

@ -620,9 +620,11 @@ xdg_toplevel_configure (void *data,
pending_state |= (GDK_TOPLEVEL_STATE_TILED | pending_state |= (GDK_TOPLEVEL_STATE_TILED |
GDK_TOPLEVEL_STATE_LEFT_TILED); GDK_TOPLEVEL_STATE_LEFT_TILED);
break; break;
#ifdef HAVE_TOPLEVEL_STATE_SUSPENDED
case XDG_TOPLEVEL_STATE_SUSPENDED: case XDG_TOPLEVEL_STATE_SUSPENDED:
pending_state |= GDK_TOPLEVEL_STATE_SUSPENDED; pending_state |= GDK_TOPLEVEL_STATE_SUSPENDED;
break; break;
#endif
default: default:
/* Unknown state */ /* Unknown state */
break; break;

6
meson.build
View File

@ -18,7 +18,7 @@ harfbuzz_req = '>= 2.6.0'
fribidi_req = '>= 1.0.6' fribidi_req = '>= 1.0.6'
cairo_req = '>= 1.14.0' cairo_req = '>= 1.14.0'
gdk_pixbuf_req = '>= 2.30.0' gdk_pixbuf_req = '>= 2.30.0'
wayland_proto_req = '>= 1.32' wayland_proto_req = '>= 1.31'
wayland_req = '>= 1.21.0' wayland_req = '>= 1.21.0'
graphene_req = '>= 1.10.0' graphene_req = '>= 1.10.0'
epoxy_req = '>= 1.4' epoxy_req = '>= 1.4'
@ -483,6 +483,10 @@ if wayland_enabled
'xkbcommon @0@'.format(xkbcommon_req), 'xkbcommon @0@'.format(xkbcommon_req),
'wayland-egl', 'wayland-egl',
] ]
if wlprotocolsdep.version().version_compare('>=1.32')
cdata.set('HAVE_TOPLEVEL_STATE_SUSPENDED', 1)
endif
endif endif
x11_pkgs = [] x11_pkgs = []