[mutter] wayland: Drop xdg-shell v6 protocol

[Marge Bot <marge-bot src gnome org>]

commit 11bc19fbe8c9f3323c668cccda668c3672e7541d
Author: Fernando Monteiro <fr02monteiro gmail com>
Date:   Fri Apr 22 16:35:34 2022 +0100

    wayland: Drop xdg-shell v6 protocol
    
    There is no need to have this protocol as we already
    have support for the xdg-shell stable.
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2207>

 .gitignore                                  |    2 -
 src/meson.build                             |    3 -
 src/wayland/meta-wayland-legacy-xdg-shell.c | 2110 ---------------------------
 src/wayland/meta-wayland-legacy-xdg-shell.h |   53 -
 src/wayland/meta-wayland-surface.c          |    2 -
 src/wayland/meta-wayland-versions.h         |    1 -
 src/wayland/meta-wayland-xdg-foreign.c      |   13 +-
 7 files changed, 4 insertions(+), 2180 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cf5b826c22..a5e7a32697 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,8 +56,6 @@ src/gtk-primary-selection-protocol.c
 src/gtk-primary-selection-server-protocol.h
 src/gtk-shell-protocol.c
 src/gtk-shell-server-protocol.h
-src/xdg-shell-unstable-v*-protocol.c
-src/xdg-shell-unstable-v*-server-protocol.h
 src/pointer-gestures-unstable-v*-protocol.c
 src/pointer-gestures-unstable-v*-server-protocol.h
 src/relative-pointer-unstable-v*-protocol.c
diff --git a/src/meson.build b/src/meson.build
index 767b298c2e..8f7f6f4353 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -579,8 +579,6 @@ if have_wayland
     'wayland/meta-wayland-input-device.h',
     'wayland/meta-wayland-keyboard.c',
     'wayland/meta-wayland-keyboard.h',
-    'wayland/meta-wayland-legacy-xdg-shell.c',
-    'wayland/meta-wayland-legacy-xdg-shell.h',
     'wayland/meta-wayland-outputs.c',
     'wayland/meta-wayland-outputs.h',
     'wayland/meta-wayland-pointer.c',
@@ -923,7 +921,6 @@ if have_wayland
     ['xdg-activation', 'staging', 'v1', ],
     ['xdg-foreign', 'unstable', 'v1', ],
     ['xdg-output', 'unstable', 'v1', ],
-    ['xdg-shell', 'unstable', 'v6', ],
     ['xdg-shell', 'stable', ],
     ['xwayland-keyboard-grab', 'unstable', 'v1', ],
   ]
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index bd6499cf0b..3516ffd84e 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -41,7 +41,6 @@
 #include "wayland/meta-wayland-data-device.h"
 #include "wayland/meta-wayland-gtk-shell.h"
 #include "wayland/meta-wayland-keyboard.h"
-#include "wayland/meta-wayland-legacy-xdg-shell.h"
 #include "wayland/meta-wayland-outputs.h"
 #include "wayland/meta-wayland-pointer.h"
 #include "wayland/meta-wayland-presentation-time-private.h"
@@ -1577,7 +1576,6 @@ void
 meta_wayland_shell_init (MetaWaylandCompositor *compositor)
 {
   meta_wayland_xdg_shell_init (compositor);
-  meta_wayland_legacy_xdg_shell_init (compositor);
   meta_wayland_init_gtk_shell (compositor);
   meta_wayland_init_viewporter (compositor);
 }
diff --git a/src/wayland/meta-wayland-versions.h b/src/wayland/meta-wayland-versions.h
index 8ffb5d9ef6..57d2e15d71 100644
--- a/src/wayland/meta-wayland-versions.h
+++ b/src/wayland/meta-wayland-versions.h
@@ -38,7 +38,6 @@
 #define META_WL_COMPOSITOR_VERSION          5
 #define META_WL_DATA_DEVICE_MANAGER_VERSION 3
 #define META_XDG_WM_BASE_VERSION            4
-#define META_ZXDG_SHELL_V6_VERSION          1
 #define META_WL_SEAT_VERSION                5
 #define META_WL_OUTPUT_VERSION              2
 #define META_XSERVER_VERSION                1
diff --git a/src/wayland/meta-wayland-xdg-foreign.c b/src/wayland/meta-wayland-xdg-foreign.c
index eb480b9967..c29aea243a 100644
--- a/src/wayland/meta-wayland-xdg-foreign.c
+++ b/src/wayland/meta-wayland-xdg-foreign.c
@@ -32,7 +32,6 @@
 #include "wayland/meta-wayland-private.h"
 #include "wayland/meta-wayland-versions.h"
 #include "wayland/meta-wayland-xdg-shell.h"
-#include "wayland/meta-wayland-legacy-xdg-shell.h"
 
 #include "xdg-foreign-unstable-v1-server-protocol.h"
 
@@ -145,9 +144,8 @@ xdg_exporter_export (struct wl_client   *client,
   char *handle;
 
   if (!surface->role ||
-      !meta_wayland_surface_get_window (surface) ||
-      !(META_IS_WAYLAND_XDG_SURFACE (surface->role) ||
-        META_IS_WAYLAND_ZXDG_SURFACE_V6 (surface->role)))
+      !meta_wayland_surface_get_window (surface) || 
+      !META_IS_WAYLAND_XDG_SURFACE (surface->role))
     {
       wl_resource_post_error (resource,
                               WL_DISPLAY_ERROR_INVALID_OBJECT,
@@ -253,8 +251,7 @@ is_valid_child (MetaWaylandSurface *surface)
   if (!surface->role)
     return FALSE;
 
-  if (!META_IS_WAYLAND_XDG_TOPLEVEL (surface->role) &&
-      !META_IS_WAYLAND_ZXDG_TOPLEVEL_V6 (surface->role))
+  if (!META_IS_WAYLAND_XDG_TOPLEVEL (surface->role))
     return FALSE;
 
   if (!meta_wayland_surface_get_window (surface))
@@ -385,9 +382,7 @@ xdg_importer_import (struct wl_client   *client,
                                   xdg_imported_destructor);
 
   exported = g_hash_table_lookup (foreign->exported_surfaces, handle);
-  if (!exported ||
-      (!META_IS_WAYLAND_XDG_SURFACE (exported->surface->role) &&
-       !META_IS_WAYLAND_ZXDG_SURFACE_V6 (exported->surface->role)))
+  if (!exported || !META_IS_WAYLAND_XDG_SURFACE (exported->surface->role))
     {
       zxdg_imported_v1_send_destroyed (xdg_imported_resource);
       return;