[shotwell] Adapt to gexiv2 master

[Jens Georg <jensgeorg src gnome org>]

commit c6443546beaec0aacbef7b6c092b4472a1f48f7b
Author: Jens Georg <mail jensge org>
Date:   Sun Nov 18 11:40:29 2018 +0100

    Adapt to gexiv2 master

 flatpak/org.gnome.Shotwell.json | 7 ++++---
 meson.build                     | 2 +-
 src/photos/PhotoMetadata.vala   | 8 ++++----
 vapi/libexif.vapi               | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/flatpak/org.gnome.Shotwell.json b/flatpak/org.gnome.Shotwell.json
index 5e442944..22565bf1 100644
--- a/flatpak/org.gnome.Shotwell.json
+++ b/flatpak/org.gnome.Shotwell.json
@@ -135,13 +135,14 @@
         },
         {
             "name" : "gexiv2",
+            "buildsystem" : "meson",
             "cleanup" : [
                 "/lib/girepository-1.0",
                 "/share/gir-1.0"
             ],
             "config-opts" : [
-                "--without-python2-girdir",
-                "--without-python3-girdir"
+                "-Dpython2-girdir=no",
+                "-Dpython3-girdir=no"
             ],
             "build-options" : {
                 "env" : {
@@ -226,4 +227,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/meson.build b/meson.build
index db99fd62..b589be74 100644
--- a/meson.build
+++ b/meson.build
@@ -49,7 +49,7 @@ gstreamer = dependency('gstreamer-1.0', version : '>= 1.0')
 gstreamer_pbu = dependency('gstreamer-pbutils-1.0', version : '>= 1.0')
 gphoto2 = dependency('libgphoto2', version : '>= 2.5.0')
 gudev = dependency('gudev-1.0', version : '>= 145', required: false)
-gexiv2 = dependency('gexiv2', version: '>= 0.10.4')
+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)
diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
index 80018c2d..5c7b3261 100644
--- a/src/photos/PhotoMetadata.vala
+++ b/src/photos/PhotoMetadata.vala
@@ -276,8 +276,8 @@ public class PhotoMetadata : MediaMetadata {
         exiv2 = new GExiv2.Metadata();
         exif = null;
         
-        exiv2.open_buf(buffer, length);
-        exif = Exif.Data.new_from_data(buffer, length);
+        exiv2.open_buf(buffer[0:length]);
+        exif = Exif.Data.new_from_data(buffer[0:length]);
         source_name = "<memory buffer %d bytes>".printf(length);
     }
     
@@ -285,8 +285,8 @@ public class PhotoMetadata : MediaMetadata {
         exiv2 = new GExiv2.Metadata();
         exif = null;
         
-        exiv2.from_app1_segment(buffer.get_data(), (long) buffer.get_size());
-        exif = Exif.Data.new_from_data(buffer.get_data(), buffer.get_size());
+        exiv2.from_app1_segment(buffer.get_data());
+        exif = Exif.Data.new_from_data(buffer.get_data());
         source_name = "<app1 segment %zu bytes>".printf(buffer.get_size());
     }
     
diff --git a/vapi/libexif.vapi b/vapi/libexif.vapi
index 61ab36eb..5a02cfaf 100644
--- a/vapi/libexif.vapi
+++ b/vapi/libexif.vapi
@@ -79,7 +79,7 @@ namespace Exif {
         [CCode (cname="exif_data_new")]
         public Data();
         public static Data? new_from_file(string path);
-        public static Data? new_from_data(uint8 *data, size_t count);
+        public static Data? new_from_data([CCode (array_length_pos=1)]uint8[] data);
         public void dump();
         public void fix();
         public void foreach_content(ForeachContentFunc cb, void *user = null);