[gnome-control-center/wip/carlosg/calibrator-gtk: 32/32] build: Drop all references to clutter-gtk

[Robert Ancell <rancell src gnome org>]

commit 31cd58bc5183626a7c737831184c0c52552fe6b6
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Oct 11 00:41:59 2018 +0200

    build: Drop all references to clutter-gtk
    
    It's currently just added whenever cheese is enabled, however that should
    be already an indirect dependency. There is no need for it to explicitly
    to be explicitly linked here.
    
    And same goes for CI Docker files, the dependency will be indirectly
    installed through cheese anyway.

 build-aux/ci/Dockerfile.arm64v8.fedora.rawhide | 2 +-
 build-aux/ci/Dockerfile.fedora.rawhide         | 2 +-
 build-aux/ci/Dockerfile.ppc64le.fedora.rawhide | 2 +-
 meson.build                                    | 6 +-----
 4 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/build-aux/ci/Dockerfile.arm64v8.fedora.rawhide b/build-aux/ci/Dockerfile.arm64v8.fedora.rawhide
index ed3acdbe8..10342b9e0 100644
--- a/build-aux/ci/Dockerfile.arm64v8.fedora.rawhide
+++ b/build-aux/ci/Dockerfile.arm64v8.fedora.rawhide
@@ -10,7 +10,7 @@ ADD x86_64_qemu-aarch64-static.tar.gz /usr/bin
 RUN dnf -y --nogpgcheck upgrade && \
     dnf -y install \
                    @c-development @development-tools clang \
-                   accountsservice-devel cheese-libs-devel chrpath clutter-gtk-devel colord-devel  \
+                   accountsservice-devel cheese-libs-devel chrpath colord-devel  \
                    colord-gtk-devel cups-devel desktop-file-utils docbook-style-xsl gdk-pixbuf2-devel \
                    gettext git glib2-devel gnome-bluetooth-libs-devel gnome-desktop3-devel \
                    gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel \
diff --git a/build-aux/ci/Dockerfile.fedora.rawhide b/build-aux/ci/Dockerfile.fedora.rawhide
index 30dd1afa9..97e470483 100644
--- a/build-aux/ci/Dockerfile.fedora.rawhide
+++ b/build-aux/ci/Dockerfile.fedora.rawhide
@@ -8,7 +8,7 @@ LABEL description="Docker image to run CI for GNOME Settings."
 RUN dnf -y --nogpgcheck upgrade && \
     dnf -y install \
                    @c-development @development-tools clang \
-                   accountsservice-devel cheese-libs-devel chrpath clutter-gtk-devel colord-devel  \
+                   accountsservice-devel cheese-libs-devel chrpath colord-devel  \
                    colord-gtk-devel cups-devel desktop-file-utils docbook-style-xsl gdk-pixbuf2-devel \
                    gettext git glib2-devel gnome-bluetooth-libs-devel gnome-desktop3-devel \
                    gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel \
diff --git a/build-aux/ci/Dockerfile.ppc64le.fedora.rawhide b/build-aux/ci/Dockerfile.ppc64le.fedora.rawhide
index f6d9d0602..85f48e9ec 100644
--- a/build-aux/ci/Dockerfile.ppc64le.fedora.rawhide
+++ b/build-aux/ci/Dockerfile.ppc64le.fedora.rawhide
@@ -10,7 +10,7 @@ ADD x86_64_qemu-ppc64le-static.tar.gz /usr/bin
 RUN dnf -y --nogpgcheck upgrade && \
     dnf -y install \
                    @c-development @development-tools clang \
-                   accountsservice-devel cheese-libs-devel chrpath clutter-gtk-devel colord-devel  \
+                   accountsservice-devel cheese-libs-devel chrpath colord-devel  \
                    colord-gtk-devel cups-devel desktop-file-utils docbook-style-xsl gdk-pixbuf2-devel \
                    gettext git glib2-devel gnome-bluetooth-libs-devel gnome-desktop3-devel \
                    gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel \
diff --git a/meson.build b/meson.build
index e9e5f7c70..9d8ee3ab3 100644
--- a/meson.build
+++ b/meson.build
@@ -100,7 +100,6 @@ goa_req_version = '>= 3.25.3'
 pulse_req_version = '>= 2.0'
 
 accounts_dep = dependency('accountsservice', version: '>= 0.6.39')
-clutter_gtk_dep = dependency('clutter-gtk-1.0', required: false)
 colord_dep = dependency('colord', version: '>= 0.1.34')
 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.23.0')
 gio_dep = dependency('gio-2.0')
@@ -151,10 +150,7 @@ endforeach
 # Optional dependency for the user accounts panel
 enable_cheese = get_option('cheese')
 if enable_cheese
-  assert(clutter_gtk_dep.found(), 'cheese support requested, but clutter-gtk library is not available. Use 
-Dcheese=false to build without it.')
-
   cheese_deps = [
-    clutter_gtk_dep,
     dependency('cheese', version: '>= 3.28.0'),
     dependency('cheese-gtk', version: '>= 3.5.91')
   ]
@@ -277,4 +273,4 @@ output += '     NetworkManager (Network panel) ............. ' + host_is_linux.t
 output += '     Wacom (Wacom tablet panel) ................. ' + host_is_linux_not_s390.to_string() + '\n'
 output += '     Wayland .................................... ' + enable_wayland.to_string() + '\n'
 
-message(output)
\ No newline at end of file
+message(output)