[mutter] wayland: Drop wl-shell protocol

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

commit a8bf9d8c6894d8e7618a80b010f5901346fcacd8
Author: Fernando Monteiro <fr02monteiro gmail com>
Date:   Thu Sep 16 21:23:18 2021 +0100

    wayland: Drop wl-shell protocol
    
    This protocol is deprecated since a long time, so remove it.
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2183>

 src/core/window-private.h           |   4 +-
 src/meson.build                     |   2 -
 src/wayland/meta-wayland-surface.c  |   4 +-
 src/wayland/meta-wayland-versions.h |   1 -
 src/wayland/meta-wayland-wl-shell.c | 777 ------------------------------------
 src/wayland/meta-wayland-wl-shell.h |  33 --
 6 files changed, 3 insertions(+), 818 deletions(-)
---
diff --git a/src/core/window-private.h b/src/core/window-private.h
index ccb5b719dd..8305897a47 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -520,8 +520,8 @@ struct _MetaWindow
    * For X11 windows, this matches XGetGeometry of the toplevel.
    *
    * For Wayland windows, the position matches the position of the
-   * surface associated with shell surface (wl_shell_surface, xdg_surface
-   * etc). The size matches the size surface size as displayed in the stage.
+   * surface associated with shell surface (xdg_surface, etc.)
+   * The size matches the size surface size as displayed in the stage.
    */
   MetaRectangle buffer_rect;
 
diff --git a/src/meson.build b/src/meson.build
index 6e043d5e86..ba2ef51555 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -638,8 +638,6 @@ if have_wayland
     'wayland/meta-wayland-viewporter.h',
     'wayland/meta-wayland-window-configuration.c',
     'wayland/meta-wayland-window-configuration.h',
-    'wayland/meta-wayland-wl-shell.c',
-    'wayland/meta-wayland-wl-shell.h',
     'wayland/meta-wayland-xdg-foreign.c',
     'wayland/meta-wayland-xdg-foreign.h',
     'wayland/meta-wayland-xdg-shell.c',
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 58e9f9bde1..5bd0d684d5 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -50,7 +50,6 @@
 #include "wayland/meta-wayland-seat.h"
 #include "wayland/meta-wayland-subsurface.h"
 #include "wayland/meta-wayland-viewporter.h"
-#include "wayland/meta-wayland-wl-shell.h"
 #include "wayland/meta-wayland-xdg-shell.h"
 #include "wayland/meta-window-wayland.h"
 #include "wayland/meta-xwayland-private.h"
@@ -1536,14 +1535,13 @@ meta_wayland_surface_begin_grab_op (MetaWaylandSurface *surface,
  * @compositor: The #MetaWaylandCompositor object
  *
  * Initializes the Wayland interfaces providing features that deal with
- * desktop-specific conundrums, like XDG shell, wl_shell (deprecated), etc.
+ * desktop-specific conundrums, like XDG shell, etc.
  */
 void
 meta_wayland_shell_init (MetaWaylandCompositor *compositor)
 {
   meta_wayland_xdg_shell_init (compositor);
   meta_wayland_legacy_xdg_shell_init (compositor);
-  meta_wayland_wl_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 291a75d3dd..8079543039 100644
--- a/src/wayland/meta-wayland-versions.h
+++ b/src/wayland/meta-wayland-versions.h
@@ -39,7 +39,6 @@
 #define META_WL_DATA_DEVICE_MANAGER_VERSION 3
 #define META_XDG_WM_BASE_VERSION            3
 #define META_ZXDG_SHELL_V6_VERSION          1
-#define META_WL_SHELL_VERSION               1
 #define META_WL_SEAT_VERSION                5
 #define META_WL_OUTPUT_VERSION              2
 #define META_XSERVER_VERSION                1