[gnome-continuous] Update the g-c-c patch to remove the Printers panel

[Emmanuele Bassi <ebassi src gnome org>]

commit 43af0b324367241ac20392495c3dd493b86696dc
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Apr 18 15:19:52 2018 +0100

    Update the g-c-c patch to remove the Printers panel

 patches/gnome-control-center-remove-panels.patch |   32 ++++++++++++++++-----
 1 files changed, 24 insertions(+), 8 deletions(-)
---
diff --git a/patches/gnome-control-center-remove-panels.patch 
b/patches/gnome-control-center-remove-panels.patch
index 0d9faab..20d2965 100644
--- a/patches/gnome-control-center-remove-panels.patch
+++ b/patches/gnome-control-center-remove-panels.patch
@@ -1,21 +1,28 @@
-From 23e9d18fe81552cf88652bc91886cf9cbb27c7f1 Mon Sep 17 00:00:00 2001
+From b0c7216aeb1e85b163c2db7f722e12b393bdb1e9 Mon Sep 17 00:00:00 2001
 From: Emmanuele Bassi <ebassi gnome org>
 Date: Tue, 23 Jan 2018 09:55:46 +0000
 Subject: [PATCH] Drop Printers panel
 
 The printers panel has a hard requirement on Samba, which is not
 available on the Yocto base we use for Continuous.
+
+v3:
+  - Drop printer tests
+
+v2:
+  - Port to Meson
 ---
  meson.build             | 20 --------------------
  panels/meson.build      |  1 -
  shell/cc-panel-loader.c |  2 --
- 3 files changed, 23 deletions(-)
+ tests/meson.build       |  1 -
+ 4 files changed, 24 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index cd3e9c0db..d271de1ef 100644
+index a2d484442..bd2294f46 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -125,26 +125,6 @@ common_deps = [
+@@ -124,26 +124,6 @@ common_deps = [
    dependency('gtk+-3.0', version: '>= 3.22.20')
  ]
  
@@ -43,7 +50,7 @@ index cd3e9c0db..d271de1ef 100644
  enable_cheese = get_option('cheese')
  if enable_cheese
 diff --git a/panels/meson.build b/panels/meson.build
-index 048980927..3c56f4de2 100644
+index 37a343642..d2d037352 100644
 --- a/panels/meson.build
 +++ b/panels/meson.build
 @@ -11,7 +11,6 @@ panels = [
@@ -55,7 +62,7 @@ index 048980927..3c56f4de2 100644
    'region',
    'search',
 diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
-index 675833c12..b83ee59e1 100644
+index 55492ef98..d221ede47 100644
 --- a/shell/cc-panel-loader.c
 +++ b/shell/cc-panel-loader.c
 @@ -48,7 +48,6 @@ extern GType cc_wifi_panel_get_type (void);
@@ -66,7 +73,7 @@ index 675833c12..b83ee59e1 100644
  extern GType cc_privacy_panel_get_type (void);
  extern GType cc_region_panel_get_type (void);
  extern GType cc_search_panel_get_type (void);
-@@ -93,7 +92,6 @@ static struct {
+@@ -96,7 +95,6 @@ static struct {
    PANEL_TYPE("notifications",    cc_notifications_panel_get_type),
    PANEL_TYPE("online-accounts",  cc_goa_panel_get_type          ),
    PANEL_TYPE("power",            cc_power_panel_get_type        ),
@@ -74,6 +81,15 @@ index 675833c12..b83ee59e1 100644
    PANEL_TYPE("privacy",          cc_privacy_panel_get_type      ),
    PANEL_TYPE("region",           cc_region_panel_get_type       ),
    PANEL_TYPE("search",           cc_search_panel_get_type       ),
+diff --git a/tests/meson.build b/tests/meson.build
+index 49229a305..c59f05cda 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -1,4 +1,3 @@
+ subdir('common')
+ subdir('datetime')
+-subdir('printers')
+ subdir('info')
 -- 
-2.14.3
+2.17.0