From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 15 Sep 2019 23:15:50 +0000 (+0200)
Subject: media-gfx/ufraw: Fix build with >=media-libs/exiv2-0.27.1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f40350f459b1d6c6e2715031cb59bf22720d3fd8;p=gentoo.git

media-gfx/ufraw: Fix build with >=media-libs/exiv2-0.27.1

Closes: https://bugs.gentoo.org/688540
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---

diff --git a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
index b5b4140fff8e..2cd888ebc096 100644
--- a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
+++ b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
@@ -1,6 +1,6 @@
---- a/ufraw_exiv2.cc	2015-06-16 05:58:38.000000000 +0200
-+++ b/ufraw_exiv2.cc	2018-12-29 22:51:23.291894430 +0100
-@@ -15,9 +15,7 @@
+--- a/ufraw_exiv2.cc
++++ b/ufraw_exiv2.cc
+@@ -15,9 +15,8 @@
  #include "ufraw.h"
  
  #ifdef HAVE_EXIV2
@@ -8,10 +8,11 @@
 -#include <exiv2/easyaccess.hpp>
 -#include <exiv2/exif.hpp>
 +#include <exiv2/exiv2.hpp>
++#include <iostream>
  #include <sstream>
  #include <cassert>
  
-@@ -67,7 +65,11 @@
+@@ -67,7 +66,11 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf)
          if (exifData.empty()) {
              std::string error(uf->filename);
              error += ": No Exif data found in the file";