From e4d69b629400dc98734e498a38f620fb2502be5a Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
Date: Tue, 1 Jan 2019 23:32:59 +0100
Subject: [PATCH] geeqie: rebuild against exiv2-0.27.0_1

[ci skip]
---
 srcpkgs/geeqie/patches/exiv-0.27.patch | 55 ++++++++++++++++++++++++++
 srcpkgs/geeqie/template                |  2 +-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/geeqie/patches/exiv-0.27.patch

diff --git a/srcpkgs/geeqie/patches/exiv-0.27.patch b/srcpkgs/geeqie/patches/exiv-0.27.patch
new file mode 100644
index 00000000000..e724e98af21
--- /dev/null
+++ b/srcpkgs/geeqie/patches/exiv-0.27.patch
@@ -0,0 +1,55 @@
+--- src/exiv2.cc
++++ src/exiv2.cc
+@@ -22,23 +22,29 @@
+ 
+ #ifdef HAVE_EXIV2
+ 
++#include <exiv2/exiv2.hpp>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <exiv2/error.hpp>
+ #include <iostream>
+-
+-// EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
+-#ifndef EXIV2_TEST_VERSION
++#ifdef EXIV2_VERSION
++# ifndef EXIV2_TEST_VERSION
+ # define EXIV2_TEST_VERSION(major,minor,patch) \
+-       ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
++    ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
++# endif
++#else
++# define EXIV2_TEST_VERSION(major,minor,patch) (false)
+ #endif
+ 
+-
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
+ 
++#if EXIV2_TEST_VERSION(0,27,0)
++#define EXV_PACKAGE "exiv2"
++#endif
+ #if !EXIV2_TEST_VERSION(0,17,90)
+ #include <exiv2/tiffparser.hpp>
+ #include <exiv2/tiffcomposite.hpp>
+@@ -358,7 +364,7 @@ public:
+ #endif
+                        Exiv2::Image *image = imageData_->image();
+ 
+-                       if (!image) Exiv2::Error(21);
++                       if (!image) Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
+                        image->setExifData(exifData_);
+                        image->setIptcData(iptcData_);
+ #if EXIV2_TEST_VERSION(0,16,0)
+@@ -378,7 +384,7 @@ public:
+                        sidecar->setXmpData(xmpData_);
+                        sidecar->writeMetadata();
+ #else
+-                       throw Exiv2::Error(3, "xmp");
++                       throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp");
+ #endif
+                        }
+        }
diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 3638a6f6303..e315fad52e4 100644
--- a/srcpkgs/geeqie/template
+++ b/srcpkgs/geeqie/template
@@ -1,7 +1,7 @@
 # Template file for 'geeqie'
 pkgname=geeqie
 version=1.3
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="automake pkg-config intltool glib-devel gtk+3-devel"
 makedepends="gtk+3-devel exiv2-devel lcms2-devel librsvg-devel lua51-devel