[gtk: 2/2] Merge branch 'wip/carlosg/xdg-activation' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 7b735b88b4a1d47cdb65e4c23ef5a8dfa70d3ff6
Merge: 4a96e790b1 be4216e051
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon May 3 19:20:18 2021 +0000

    Merge branch 'wip/carlosg/xdg-activation' into 'master'
    
    gdk/wayland: Support the xdg-activation wayland protocol
    
    See merge request GNOME/gtk!3502

 gdk/wayland/gdkapplaunchcontext-wayland.c | 47 ++++++++++++++++++++++++++++++-
 gdk/wayland/gdkdevice-wayland.c           |  2 +-
 gdk/wayland/gdkdisplay-wayland.c          | 12 +++++++-
 gdk/wayland/gdkdisplay-wayland.h          |  3 ++
 gdk/wayland/gdkprivate-wayland.h          |  2 ++
 gdk/wayland/gdksurface-wayland.c          | 16 +++++++++--
 gdk/wayland/meson.build                   |  5 ++++
 meson.build                               |  2 +-
 subprojects/wayland-protocols.wrap        |  4 +--
 9 files changed, 84 insertions(+), 9 deletions(-)
---