[gtk/gtk-3-24: 1/2] Drop the mir backend

From: Matthias Clasen <matthiasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk/gtk-3-24: 1/2] Drop the mir backend
Date: Mon, 9 Sep 2019 20:02:23 +0000 (UTC)

commit 31a57fe389b82ba708cedf00848740e4df55d5d0
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Sun Aug 25 22:23:22 2019 +0200

    Drop the mir backend
    
    It depends on libcontent-hub-glib which was dropped from Ubuntu in mid 2017:
    https://bugs.launchpad.net/ubuntu/+source/content-hub/+bug/1712874
    
    It was patched downstream to still build until it was disabled at the beginning
    of 2018: https://launchpad.net/ubuntu/+source/gtk+3.0/3.22.28-1ubuntu3
    
    This likely means no one has built gtk with mir in 2 years, and there is no plan
    to change that, so just remove it.

 Makefile.am                      |    6 +-
 configure.ac                     |   37 +-
 docs/reference/gtk/Makefile.am   |    1 -
 docs/reference/gtk/building.sgml |    9 +-
 docs/reference/gtk/gtk-docs.sgml |    1 -
 docs/reference/gtk/meson.build   |    1 -
 docs/reference/gtk/mir.xml       |   35 -
 docs/reference/gtk/running.sgml  |    5 -
 gdk/Makefile.am                  |    6 +-
 gdk/gdkdisplaymanager.c          |    7 -
 gdk/meson.build                  |    2 +-
 gdk/mir/Makefile.am              |   45 -
 gdk/mir/gdkmir-debug.c           |  548 ---------
 gdk/mir/gdkmir-private.h         |  141 ---
 gdk/mir/gdkmir.h                 |   52 -
 gdk/mir/gdkmircursor.c           |  176 ---
 gdk/mir/gdkmirdevicemanager.c    |  125 --
 gdk/mir/gdkmirdisplay.c          | 1182 ------------------
 gdk/mir/gdkmireventsource.c      |  838 -------------
 gdk/mir/gdkmirglcontext.c        |  178 ---
 gdk/mir/gdkmirkeyboard.c         |  164 ---
 gdk/mir/gdkmirkeymap.c           |  476 --------
 gdk/mir/gdkmirpointer.c          |  247 ----
 gdk/mir/gdkmirscreen.c           | 1141 -----------------
 gdk/mir/gdkmirwindow.c           |   52 -
 gdk/mir/gdkmirwindowimpl.c       | 2499 --------------------------------------
 gdk/mir/meson.build              |    1 -
 gtk/gtktooltip.c                 |    3 -
 gtk/gtkwindow.c                  |    9 -
 meson.build                      |    3 +-
 meson_options.txt                |    2 -
 po-properties/POTFILES.in        |    2 -
 po/POTFILES.in                   |    2 -
 33 files changed, 8 insertions(+), 7988 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e1978fc3bb..8439fb88dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,11 +42,11 @@ MAINTAINERCLEANFILES = \
 
 
 ## Copy .pc files to target-specific names
-gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc 
gtk+-mir-3.0.pc: gtk+-3.0.pc
+gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc: gtk+-3.0.pc
        rm -f $@ && \
        cp gtk+-3.0.pc $@
 
-gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc gdk-mir-3.0.pc: 
gdk-3.0.pc
+gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc: gdk-3.0.pc
        rm -f $@ && \
        cp gdk-3.0.pc $@
 
@@ -67,14 +67,12 @@ DISTCLEANFILES = \
        gtk+-quartz-3.0.pc              \
        gtk+-broadway-3.0.pc            \
        gtk+-wayland-3.0.pc             \
-       gtk+-mir-3.0.pc                 \
        gdk-3.0.pc                      \
        gdk-x11-3.0.pc                  \
        gdk-win32-3.0.pc                \
        gdk-quartz-3.0.pc               \
        gdk-broadway-3.0.pc             \
        gdk-wayland-3.0.pc              \
-       gdk-mir-3.0.pc                  \
        gail-3.0.pc                     \
        config.lt
 
diff --git a/configure.ac b/configure.ac
index 6acd65e9b1..8ad9ab252d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,8 +62,6 @@ m4_define([gdk_pixbuf_required_version], [2.30.0])
 m4_define([introspection_required_version], [1.39.0])
 m4_define([wayland_required_version], [1.9.91])
 m4_define([wayland_protocols_required_version], [1.14])
-m4_define([mirclient_required_version], [0.22.0])
-m4_define([mircookie_required_version], [0.17.0])
 m4_define([epoxy_required_version], [1.4])
 m4_define([cloudproviders_required_version], [0.2.5])
 m4_define([sysprof_required_version], [3.33.2])
@@ -344,11 +342,6 @@ AC_ARG_ENABLE(wayland-backend,
               [AS_HELP_STRING([--enable-wayland-backend],
                               [enable the wayland gdk backend])],
                              [backend_set=yes])
-AC_ARG_ENABLE(mir-backend,
-              [AS_HELP_STRING([--enable-mir-backend],
-                              [enable the Mir gdk backend])],
-                             [backend_set=yes])
-
 AC_ARG_ENABLE(cloudproviders,
               [AS_HELP_STRING([--enable-cloudproviders],
                               [enable libcloudproviders integration])],
@@ -366,7 +359,6 @@ if test -z "$backend_set"; then
   else
     enable_x11_backend=yes
     enable_wayland_backend=maybe
-    enable_mir_backend=no
   fi
 fi
 
@@ -479,30 +471,6 @@ else
   AM_CONDITIONAL(USE_WAYLAND, false)
 fi
 
-MIR_DEPENDENCIES="mirclient >= mirclient_required_version mircookie >= mircookie_required_version 
libcontent-hub-glib"
-if test "$enable_mir_backend" = "maybe" ; then
-  PKG_CHECK_EXISTS($MIR_DEPENDENCIES, [have_mir_deps=yes], [have_mir_deps=no])
-  AC_MSG_CHECKING([for MIR_DEPENDENCIES])
-  if test "$have_mir_deps" = "no" ; then
-    enable_mir_backend=no
-  else
-    enable_mir_backend=yes
-  fi
-  AC_MSG_RESULT($enable_mir_backend)
-fi
-
-if test "$enable_mir_backend" = "yes"; then
-  cairo_backends="$cairo_backends cairo"
-  GDK_BACKENDS="$GDK_BACKENDS mir"
-  GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_WINDOWING_MIR"
-  MIR_PACKAGES="$MIR_DEPENDENCIES"
-
-  AM_CONDITIONAL(USE_MIR, true)
-else
-  AM_CONDITIONAL(USE_MIR, false)
-fi
-
 # strip leading space
 GDK_BACKENDS=${GDK_BACKENDS#* }
 
@@ -1349,7 +1317,7 @@ CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
 GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version 
cairo-gobject >= cairo_required_version"
-GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= 
epoxy_required_version $CLOUDPROVIDER_PACKAGES $PROFILER_PACKAGES fribidi >= fribidi_required_version"
+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends epoxy >= 
epoxy_required_version $CLOUDPROVIDER_PACKAGES $PROFILER_PACKAGES fribidi >= fribidi_required_version"
 
 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
@@ -1383,7 +1351,7 @@ fi
 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
 
 GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= 
cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi

= fribidi_required_version"

+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES epoxy >= epoxy_required_version fribidi >= 
fribidi_required_version"
 if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
   GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
 fi
@@ -1970,7 +1938,6 @@ gdk/win32/rc/Makefile
 gdk/win32/rc/gdk.rc
 gdk/quartz/Makefile
 gdk/wayland/Makefile
-gdk/mir/Makefile
 gdk/gdkversionmacros.h
 gtk/Makefile
 gtk/makefile.msc
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 4e20337d7d..fabfbcd931 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -307,7 +307,6 @@ content_files =                                     \
        migrating-GtkStyleContext.xml           \
        migrating-smclient-GtkApplication.xml   \
        migrating-unique-GtkApplication.xml     \
-       mir.xml                                 \
        osx.sgml                                \
        overview.xml                            \
        question_index.sgml                     \
diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
index eb4232bbba..02e3347c1d 100644
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -407,11 +407,6 @@ How to compile GTK+ itself
             <arg choice="plain">--disable-wayland-backend</arg>
           </group>
           <sbr/>
-          <group>
-            <arg choice="plain">--enable-mir-backend</arg>
-            <arg choice="plain">--disable-mir-backend</arg>
-          </group>
-          <sbr/>
           <group>
             <arg choice="plain">--enable-introspection=[no/auto/yes]</arg>
           </group>
@@ -609,9 +604,7 @@ How to compile GTK+ itself
           <systemitem>--enable-broadway-backend</systemitem>,
           <systemitem>--disable-broadway-backend</systemitem>,
           <systemitem>--enable-wayland-backend</systemitem>,
-          <systemitem>--disable-wayland-backend</systemitem>
-          <systemitem>--enable-mir-backend</systemitem>, and
-          <systemitem>--disable-mir-backend</systemitem></title>
+          <systemitem>--disable-wayland-backend</systemitem></title>
 
         <para>
           Enables specific backends for GDK.  If none of these options
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index eba4cc1bb7..e4f4952353 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -437,7 +437,6 @@
     <xi:include href="osx.sgml" />
     <xi:include href="broadway.xml" />
     <xi:include href="wayland.xml" />
-    <xi:include href="mir.xml" />
   </part>
 
   <xi:include href="glossary.xml" />
diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index a49235cb1e..d3f55b442c 100644
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -395,7 +395,6 @@ content_files = [
   'gtk-query-immodules-3.0.xml',
   'gtk-query-settings.xml',
   'gtk-update-icon-cache.xml',
-  'mir.xml',
   'osx.sgml',
   'overview.xml',
   'resources.sgml',
diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml
index 5e04460ae8..520a12d42d 100644
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -508,11 +508,6 @@ nevertheless.
         <listitem><para>Selects the Wayland backend for connecting to Wayland display 
servers</para></listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term>mir</term>
-        <listitem><para>Selects the Mir backend for connecting to Mir display servers</para></listitem>
-      </varlistentry>
-
     </variablelist>
     Since 3.10, this environment variable can contain a comma-separated list
     of backend names, which are tried in order. The list may also contain
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 6373e26a26..a53391c5d1 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -13,7 +13,7 @@ INTROSPECTION_COMPILER_ARGS = \
 
 SUBDIRS = $(GDK_BACKENDS) .
 
-DIST_SUBDIRS = win32 x11 quartz broadway wayland mir
+DIST_SUBDIRS = win32 x11 quartz broadway wayland
 
 CLEANFILES =
 
@@ -240,10 +240,6 @@ if USE_WAYLAND
 libgdk_3_la_LIBADD += wayland/libgdk-wayland.la
 endif
 
-if USE_MIR
-libgdk_3_la_LIBADD += mir/libgdk-mir.la
-endif
-
 if HAVE_INTROSPECTION
 
 introspection_files =          \
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index d87ed133ae..24f8ea09f6 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -60,10 +60,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 d56803486d..fd234917cc 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -258,7 +258,7 @@ endif
 
 gdk_backends = []
 gdk_backends_gen_headers = []  # non-public generated headers
-foreach backend : ['broadway', 'quartz', 'wayland', 'win32', 'x11', 'mir']
+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/gtk/gtktooltip.c b/gtk/gtktooltip.c
index e5fc5dbdaa..c3a1598210 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -42,9 +42,6 @@
 #ifdef GDK_WINDOWING_WAYLAND
 #include "wayland/gdkwayland.h"
 #endif
-#ifdef GDK_WINDOWING_MIR
-#include "mir/gdkmir.h"
-#endif
 
 
 /**
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 62a7cb7686..7e548ed187 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -85,10 +85,6 @@
 #include "broadway/gdkbroadway.h"
 #endif
 
-#ifdef GDK_WINDOWING_MIR
-#include "mir/gdkmir.h"
-#endif
-
 /**
  * SECTION:gtkwindow
  * @title: GtkWindow
@@ -6123,11 +6119,6 @@ gtk_window_should_use_csd (GtkWindow *window)
     }
 #endif
 
-#ifdef GDK_WINDOWING_MIR
-  if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
-    return TRUE;
-#endif
-
 #ifdef GDK_WINDOWING_WIN32
   if (g_strcmp0 (csd_env, "0") != 0 &&
       GDK_IS_WIN32_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
diff --git a/meson.build b/meson.build
index 4eac3397c5..5957b4bed3 100644
--- a/meson.build
+++ b/meson.build
@@ -131,7 +131,6 @@ wayland_enabled        = get_option('wayland_backend')
 broadway_enabled       = get_option('broadway_backend')
 quartz_enabled         = get_option('quartz_backend')
 win32_enabled          = get_option('win32_backend')
-mir_enabled            = get_option('mir_backend')
 
 os_unix   = false
 os_linux  = false
@@ -911,7 +910,7 @@ gdk_pcs = ['gdk-3.0.pc']
 
 pkg_targets = ''
 disabled_backends = []
-foreach backend: [ 'broadway', 'quartz', 'wayland', 'win32', 'x11', 'mir']
+foreach backend: [ 'broadway', 'quartz', 'wayland', 'win32', 'x11']
   if get_variable('@0@_enabled'.format(backend))
     gtk_pcs += ['gtk+-@0 -3 0 pc'.format(backend)]
     gdk_pcs += ['gdk-@0 -3 0 pc'.format(backend)]
diff --git a/meson_options.txt b/meson_options.txt
index 4e51f9e6fc..7544389345 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,8 +9,6 @@ option('win32_backend', type: 'boolean', value: true,
   description : 'Enable the Windows gdk backend (only when building on Windows)')
 option('quartz_backend', type: 'boolean', value: true,
   description : 'Enable the macOS gdk backend (only when building on macOS)')
-option('mir_backend', type: 'boolean', value: false,
-  description : 'Enable the Mir gdk backend')
 
 # Optional dependencies
 option('xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
diff --git a/po-properties/POTFILES.in b/po-properties/POTFILES.in
index 780733bf36..68ac89e2ef 100644
--- a/po-properties/POTFILES.in
+++ b/po-properties/POTFILES.in
@@ -14,8 +14,6 @@ gdk/gdkscreen.c
 gdk/gdkseat.c
 gdk/gdkwindow.c
 gdk/keyname-table.h
-gdk/mir/gdkmirglcontext.c
-gdk/mir/gdkmirwindowimpl.c
 gdk/quartz/gdkglcontext-quartz.c
 gdk/wayland/gdkglcontext-wayland.c
 gdk/win32/gdkglcontext-win32.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2f8849d986..f8bab66c22 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,8 +14,6 @@ gdk/gdkscreen.c
 gdk/gdkseat.c
 gdk/gdkwindow.c
 gdk/keyname-table.h
-gdk/mir/gdkmirglcontext.c
-gdk/mir/gdkmirwindowimpl.c
 gdk/quartz/gdkglcontext-quartz.c
 gdk/wayland/gdkglcontext-wayland.c
 gdk/win32/gdkglcontext-win32.c

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]