Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/
Date: Sun, 15 Sep 2019 23:47:30
Message-Id: 1568589362.f40350f459b1d6c6e2715031cb59bf22720d3fd8.asturm@gentoo
1 commit: f40350f459b1d6c6e2715031cb59bf22720d3fd8
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 15 23:15:50 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 15 23:16:02 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40350f4
7
8 media-gfx/ufraw: Fix build with >=media-libs/exiv2-0.27.1
9
10 Closes: https://bugs.gentoo.org/688540
11 Package-Manager: Portage-2.3.76, Repoman-2.3.17
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch | 9 +++++----
15 1 file changed, 5 insertions(+), 4 deletions(-)
16
17 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
18 index b5b4140fff8..2cd888ebc09 100644
19 --- a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
20 +++ b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
21 @@ -1,6 +1,6 @@
22 ---- a/ufraw_exiv2.cc 2015-06-16 05:58:38.000000000 +0200
23 -+++ b/ufraw_exiv2.cc 2018-12-29 22:51:23.291894430 +0100
24 -@@ -15,9 +15,7 @@
25 +--- a/ufraw_exiv2.cc
26 ++++ b/ufraw_exiv2.cc
27 +@@ -15,9 +15,8 @@
28 #include "ufraw.h"
29
30 #ifdef HAVE_EXIV2
31 @@ -8,10 +8,11 @@
32 -#include <exiv2/easyaccess.hpp>
33 -#include <exiv2/exif.hpp>
34 +#include <exiv2/exiv2.hpp>
35 ++#include <iostream>
36 #include <sstream>
37 #include <cassert>
38
39 -@@ -67,7 +65,11 @@
40 +@@ -67,7 +66,11 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf)
41 if (exifData.empty()) {
42 std::string error(uf->filename);
43 error += ": No Exif data found in the file";