From effa9e40457e801577b672dadbcc169fd1ad20a3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 30 Jan 2018 19:24:52 +0100
Subject: gnome3.gexiv2: 0.10.6 → 0.10.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/misc/gexiv2/default.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'pkgs/desktops/gnome-3/misc/gexiv2')

diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
index d0801714a0f9..41040db72ce4 100644
--- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
@@ -1,29 +1,37 @@
-{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3 }:
 
 let
   majorVersion = "0.10";
 in
 stdenv.mkDerivation rec {
   name = "gexiv2-${version}";
-  version = "${majorVersion}.6";
+  version = "${majorVersion}.7";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz";
-    sha256 = "09aqsnpah71p9gx0ap2px2dyanrs7jmkkar6q114n9b7js8qh9qk";
+    sha256 = "1f7312zygw77ml37i5qilhfvmjm59dn753ax71rcb2jm1p76vgcb";
   };
 
+  patches = [
+    # https://bugzilla.gnome.org/show_bug.cgi?id=791941
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=365969;
+      sha256 = "06w744acgnz3hym7sm8c245yzlg05ldkmwgiz3yz4pp6h72brizj";
+    })
+  ];
+
   preConfigure = ''
     patchShebangs .
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glib libtool m4 ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];
+  buildInputs = [ glib ];
   propagatedBuildInputs = [ exiv2 ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/gexiv2;
     description = "GObject wrapper around the Exiv2 photo metadata library";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = gnome3.maintainers;
   };
 }
-- 
cgit 1.4.1


From f8c59e083ab2f70457c0b4f2086100d916a60c77 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 2 Feb 2018 13:21:02 +0100
Subject: gnome3.gexiv2: re-enable bindings

After effa9e40457e801577b672dadbcc169fd1ad20a3, which switched to Meson,
the Vala bindings were not built which broke Shotwell. Enabling Vala
was not enough due to a bug, though, so we have to patch it.
---
 pkgs/desktops/gnome-3/misc/gexiv2/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'pkgs/desktops/gnome-3/misc/gexiv2')

diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
index 41040db72ce4..852ed00ed902 100644
--- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobjectIntrospection, vala }:
 
 let
   majorVersion = "0.10";
@@ -13,18 +13,23 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    # https://bugzilla.gnome.org/show_bug.cgi?id=791941
+    # Darwin compatibility (https://bugzilla.gnome.org/show_bug.cgi?id=791941)
     (fetchurl {
       url = https://bugzilla.gnome.org/attachment.cgi?id=365969;
       sha256 = "06w744acgnz3hym7sm8c245yzlg05ldkmwgiz3yz4pp6h72brizj";
     })
+    # GIR & Vala bindings fix (https://bugzilla.gnome.org/show_bug.cgi?id=792431)
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=366662;
+      sha256 = "1ljb2pap5v9z3zhx69ghfyrbl2b62ck35nyn7h5h410d008lcb4v";
+    })
   ];
 
   preConfigure = ''
     patchShebangs .
   '';
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala ];
   buildInputs = [ glib ];
   propagatedBuildInputs = [ exiv2 ];
 
-- 
cgit 1.4.1