File shotwell-Adapt-to-gexiv2-changes.patch of Package shotwell

Overview Repositories Revisions Requests Users Attributes Meta

File shotwell-Adapt-to-gexiv2-changes.patch of Package shotwell (Revision 615c98b5d12ff52c57c22d82819ad6aa)

Currently displaying revision 615c98b5d12ff52c57c22d82819ad6aa , Show latest

From c6443546beaec0aacbef7b6c092b4472a1f48f7b Mon Sep 17 00:00:00 2001
From: Jens Georg <mail@jensge.org>
Date: Sun, 18 Nov 2018 11:40:29 +0100
Subject: [PATCH] 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(-)

Index: shotwell-0.30.1/meson.build
===================================================================
--- shotwell-0.30.1.orig/meson.build	2019-01-15 23:43:06.621485513 +0100
+++ shotwell-0.30.1/meson.build	2019-01-15 23:43:20.777702862 +0100
@@ -52,7 +52,7 @@ gstreamer = dependency('gstreamer-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)
Index: shotwell-0.30.1/src/photos/PhotoMetadata.vala
===================================================================
--- shotwell-0.30.1.orig/src/photos/PhotoMetadata.vala	2019-01-15 23:43:06.621485513 +0100
+++ shotwell-0.30.1/src/photos/PhotoMetadata.vala	2019-01-15 23:43:20.777702862 +0100
@@ -276,8 +276,8 @@ public class PhotoMetadata : MediaMetada
         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 : MediaMetada
         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());
     }
     
Index: shotwell-0.30.1/vapi/libexif.vapi
===================================================================
--- shotwell-0.30.1.orig/vapi/libexif.vapi	2019-01-15 23:43:06.621485513 +0100
+++ shotwell-0.30.1/vapi/libexif.vapi	2019-01-15 23:43:20.777702862 +0100
@@ -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);

Places

File shotwell-Adapt-to-gexiv2-changes.patch of Package shotwell (Revision 615c98b5d12ff52c57c22d82819ad6aa)

Places