[shotwell] Integrate map support into meson

[Jens Georg <jensgeorg src gnome org>]

commit 6b30d5c01e4e432312a29060e0cbe712e72c3f97
Author: Jens Georg <mail jensge org>
Date:   Wed Apr 18 10:24:41 2018 +0200

    Integrate map support into meson

 data/org.gnome.Shotwell.gresource.xml |  9 +++++++++
 meson.build                           |  6 +++++-
 src/Resources.vala                    | 16 ++++++++--------
 src/meson.build                       |  5 ++++-
 4 files changed, 26 insertions(+), 10 deletions(-)
---
diff --git a/data/org.gnome.Shotwell.gresource.xml b/data/org.gnome.Shotwell.gresource.xml
index 07074b1c..b86dbc38 100644
--- a/data/org.gnome.Shotwell.gresource.xml
+++ b/data/org.gnome.Shotwell.gresource.xml
@@ -35,6 +35,15 @@
       <file preprocess="xml-stripblanks">ui/tags.ui</file>
       <file preprocess="xml-stripblanks">ui/textentrydialog.ui</file>
       <file preprocess="xml-stripblanks">ui/trash.ui</file>
+      <!-- Map icons -->
+      <file>icons/hicolor/scalable/actions/gps-marker-highlighted.svg</file>
+      <file>icons/hicolor/scalable/actions/gps-marker-selected.svg</file>
+      <file>icons/hicolor/scalable/actions/gps-markers-many-highlighted.svg</file>
+      <file>icons/hicolor/scalable/actions/gps-markers-many-selected.svg</file>
+      <file>icons/hicolor/scalable/actions/gps-markers-many.svg</file>
+      <file>icons/hicolor/scalable/actions/gps-marker.svg</file>
+      <file>icons/hicolor/scalable/actions/map-edit-locked.svg</file>
+      <file>icons/hicolor/scalable/actions/map-edit-unlocked.svg</file>
       <!-- Icons -->
       <file>icons/hicolor/scalable/actions/avatar-default-symbolic.svg</file>
       <file>icons/image-missing.png</file>
diff --git a/meson.build b/meson.build
index 795cd918..23ea2a0b 100644
--- a/meson.build
+++ b/meson.build
@@ -53,7 +53,11 @@ gexiv2 = dependency('gexiv2', version: '>= 0.11.0')
 libraw = dependency('libraw', version : '>= 0.13.2')
 libexif = dependency('libexif', version : '>= 0.6.16')
 unity = dependency('unity', required : false)
-
+champlain = dependency('champlain-0.12')
+champlain_gtk = dependency('champlain-gtk-0.12')
+clutter = dependency('clutter-1.0')
+clutter_gtk = dependency('clutter-gtk-1.0')
+ 
 webpdemux = dependency('libwebpdemux')
 webp = dependency('libwebp')
 
diff --git a/src/Resources.vala b/src/Resources.vala
index 0bc5bd8b..616291ab 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -82,14 +82,14 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const int ICON_FILTER_REJECTED_OR_BETTER_FIXED_SIZE = 32;
     public const int ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE = 16;
     public const int ICON_ZOOM_SCALE = 16;
-    public const string ICON_GPS_MARKER = "gps-marker.svg";
-    public const string ICON_GPS_MARKER_HIGHLIGHTED = "gps-marker-highlighted.svg";
-    public const string ICON_GPS_MARKER_SELECTED = "gps-marker-selected.svg";
-    public const string ICON_GPS_GROUP_MARKER = "gps-markers-many.svg";
-    public const string ICON_GPS_GROUP_MARKER_HIGHLIGHTED = "gps-markers-many-highlighted.svg";
-    public const string ICON_GPS_GROUP_MARKER_SELECTED = "gps-markers-many-selected.svg";
-    public const string ICON_MAP_EDIT_LOCKED = "map-edit-locked.svg";
-    public const string ICON_MAP_EDIT_UNLOCKED = "map-edit-unlocked.svg";
+    public const string ICON_GPS_MARKER = "gps-marker";
+    public const string ICON_GPS_MARKER_HIGHLIGHTED = "gps-marker-highlighted";
+    public const string ICON_GPS_MARKER_SELECTED = "gps-marker-selected";
+    public const string ICON_GPS_GROUP_MARKER = "gps-markers-many";
+    public const string ICON_GPS_GROUP_MARKER_HIGHLIGHTED = "gps-markers-many-highlighted";
+    public const string ICON_GPS_GROUP_MARKER_SELECTED = "gps-markers-many-selected";
+    public const string ICON_MAP_EDIT_LOCKED = "map-edit-locked";
+    public const string ICON_MAP_EDIT_UNLOCKED = "map-edit-unlocked";
 
     public const string ICON_CAMERAS = "camera-photo-symbolic";
     public const string ICON_EVENTS = "multiple-events-symbolic";
diff --git a/src/meson.build b/src/meson.build
index b230ccf1..1eed90b5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -41,7 +41,9 @@ endif
 
 shotwell_deps = [gio, gee, sqlite, gtk, sqlite, posix, gphoto2,
                  gstreamer_pbu, gio_unix, gudev, gexiv2, gmodule,
-                 libraw, libexif, sw_plugin, webpdemux, webp, version]
+                 libraw, libexif, sw_plugin, webpdemux, webp, version,
+                 clutter, clutter_gtk, champlain, champlain_gtk]
+
 if unity_available
     shotwell_deps += [unity]
 endif
@@ -185,6 +187,7 @@ executable('shotwell',
             'Box.vala',
             'Photo.vala',
             'Orientation.vala',
+            'MapWidget.vala',
             'BatchImport.vala',
             'Dialogs.vala',
             'Resources.vala',