[gtk+] Drop the mir backend

[Matthias Clasen <matthiasc src gnome org>]

commit fd25a8cdf23577c4b3de6703a57f6996796c858c
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Feb 5 07:46:01 2018 +0100

    Drop the mir backend
    
    Mir is in the process of switching over to the Wayland protocol,
    so we don't need to maintain a separate backend, going forward.

 gdk/gdkdisplaymanager.c       |    7 -
 gdk/meson.build               |    3 +-
 gdk/mir/gdkmir-debug.c        |  548 ------------
 gdk/mir/gdkmir-private.h      |  143 ---
 gdk/mir/gdkmir.h              |   52 --
 gdk/mir/gdkmircursor.c        |  166 ----
 gdk/mir/gdkmirdevicemanager.c |  125 ---
 gdk/mir/gdkmirdisplay.c       |  832 ------------------
 gdk/mir/gdkmireventsource.c   |  835 ------------------
 gdk/mir/gdkmirglcontext.c     |  228 -----
 gdk/mir/gdkmirkeyboard.c      |  162 ----
 gdk/mir/gdkmirkeymap.c        |  476 ----------
 gdk/mir/gdkmirpointer.c       |  243 -----
 gdk/mir/gdkmirscreen.c        |  709 ---------------
 gdk/mir/gdkmirwindow.c        |   52 --
 gdk/mir/gdkmirwindowimpl.c    | 1948 -----------------------------------------
 gdk/mir/meson.build           |   31 -
 meson.build                   |   22 +-
 meson_options.txt             |    2 -
 19 files changed, 4 insertions(+), 6580 deletions(-)
---
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 40289b9..4ff88a5 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -59,10 +59,6 @@
 #include "wayland/gdkprivate-wayland.h"
 #endif
 
-#ifdef GDK_WINDOWING_MIR
-#include "mir/gdkmir-private.h"
-#endif
-
 /**
  * SECTION:gdkdisplaymanager
  * @Short_description: Maintains a list of all open GdkDisplays
@@ -276,9 +272,6 @@ static GdkBackend gdk_backends[] = {
 #ifdef GDK_WINDOWING_WAYLAND
   { "wayland",  _gdk_wayland_display_open },
 #endif
-#ifdef GDK_WINDOWING_MIR
-  { "mir",      _gdk_mir_display_open },
-#endif
 #ifdef GDK_WINDOWING_X11
   { "x11",      gdk_x11_display_open },
 #endif
diff --git a/gdk/meson.build b/gdk/meson.build
index 7ddb6d4..e722ee6 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -126,7 +126,6 @@ gdkconfig_cdata.set('GDK_WINDOWING_X11', x11_enabled)
 gdkconfig_cdata.set('GDK_WINDOWING_WAYLAND', wayland_enabled)
 gdkconfig_cdata.set('GDK_WINDOWING_WIN32', win32_enabled)
 gdkconfig_cdata.set('GDK_WINDOWING_BROADWAY', broadway_enabled)
-gdkconfig_cdata.set('GDK_WINDOWING_MIR', mir_enabled)
 gdkconfig_cdata.set('GDK_RENDERING_VULKAN', have_vulkan)
 
 gdkconfig = configure_file(
@@ -192,7 +191,7 @@ endif
 
 gdk_backends = []
 gdk_backends_gen_headers = []  # non-public generated headers
-foreach backend : ['broadway', 'mir', 'quartz', 'wayland', 'win32', 'x11']
+foreach backend : ['broadway', 'quartz', 'wayland', 'win32', 'x11']
   if get_variable('@0@_enabled'.format(backend))
     subdir(backend)
     gdk_deps += get_variable('gdk_@0@_deps'.format(backend))
diff --git a/meson.build b/meson.build
index 2b189db..1b46d3e 100644
--- a/meson.build
+++ b/meson.build
@@ -34,8 +34,6 @@ gdk_pixbuf_req     = '>= 2.30.0'
 introspection_req  = '>= 1.39.0'
 wayland_proto_req  = '>= 1.9'
 wayland_req        = '>= 1.9.91'
-mirclient_req      = '>= 0.22.0'
-mircookie_req      = '>= 0.17.0'
 graphene_req       = '>= 1.5.1'
 epoxy_req          = '>= 1.4'
 cloudproviders_req = '>= 0.2.5'
@@ -92,7 +90,6 @@ gtk_api_version = '4.0'
 x11_enabled            = get_option('enable-x11-backend')
 wayland_enabled        = get_option('enable-wayland-backend')
 broadway_enabled       = get_option('enable-broadway-backend')
-mir_enabled            = get_option('enable-mir-backend')
 quartz_enabled         = get_option('enable-quartz-backend')
 win32_enabled          = get_option('enable-win32-backend')
 cloudproviders_enabled = get_option('enable-cloudproviders')
@@ -364,7 +361,7 @@ cairo_backends = []
 foreach backend: [ ['cairo-xlib', cairo_req, x11_enabled],
                    ['cairo-win32', cairo_req, win32_enabled],
                    ['cairo-quartz', cairo_req, quartz_enabled],
-                   ['cairo', cairo_req, broadway_enabled or wayland_enabled or mir_enabled], ]
+                   ['cairo', cairo_req, broadway_enabled or wayland_enabled], ]
  backend_enabled = backend.get(2)
  cairo_backend_req = backend.get(1)
  cairo_backend = backend.get(0)
@@ -519,19 +516,6 @@ if x11_enabled
   cdata.set('HAVE_RANDR15', xrandr15_dep.found())
 endif
 
-mir_pkgs = []
-if mir_enabled
-  mirclient_dep = dependency('mirclient', version: mirclient_req)
-  mircookie_dep = dependency('mircookie', version: mircookie_req)
-  libcontent_hub_glib_dep = dependency('libcontenthub-glib')
-
-  mir_pkgs = [
-    'mirclient', mirclient_req,
-    'mircookie', mircookie_req,
-    'libcontent-hub-glib',
-  ]
-endif
-
 if broadway_enabled
   pc_gdk_extra_libs += ['-lz']
   backend_immodules += ['broadway']
@@ -653,7 +637,7 @@ pc_gdk_extra_libs += cairo_libs
 gio_pkgname = os_unix ? 'gio-unix-2.0' : 'gio-2.0'
 pkgconf.set('GDK_PRIVATE_PACKAGES',
             ' '.join([ gio_pkgname, glib_req,
-                       'epoxy', epoxy_req ] + x11_pkgs + wayland_pkgs + mir_pkgs + cairo_backends))
+                       'epoxy', epoxy_req ] + x11_pkgs + wayland_pkgs + cairo_backends))
 pkgconf.set('GSK_PRIVATE_PACKAGES', '') # all already in GDK_PRIVATE_PACKAGES
 pangoft2_pkgs = (wayland_enabled or x11_enabled) ? ['pangoft2'] : []
 pkgconf.set('GTK_PRIVATE_PACKAGES', ' '.join(atk_pkgs + pangoft2_pkgs))
@@ -671,7 +655,7 @@ pkg_install_dir = join_paths(get_option('libdir'), 'pkgconfig')
 pkgs = [ 'gtk+-4.0.pc' ]
 
 pkg_targets = ''
-foreach backend: [ 'broadway', 'mir', 'quartz', 'wayland', 'win32', 'x11', ]
+foreach backend: [ 'broadway', 'quartz', 'wayland', 'win32', 'x11', ]
   if get_variable('@0@_enabled'.format(backend))
     pkgs += ['gtk+-@0 -4 0 pc'.format(backend)]
     pkg_targets += ' ' + backend
diff --git a/meson_options.txt b/meson_options.txt
index 5c89e9d..5d98ba5 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,8 +6,6 @@ option('enable-wayland-backend', type: 'boolean', value: 'true',
   description : 'Enable the wayland gdk backend')
 option('enable-broadway-backend', type: 'boolean', value: 'false',
   description : 'Enable the broadway (HTML5) gdk backend')
-option('enable-mir-backend', type: 'boolean', value: 'false',
-  description : 'Enable the Mir gdk backend (UNTESTED, NEEDS WORK)')
 option('enable-win32-backend', type: 'boolean', value: 'false',
   description : 'Enable the Windows gdk backend')
 option('enable-quartz-backend', type: 'boolean', value: 'false',