From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 23 Jun 2019 20:49:38 +0000 (+0200)
Subject: media-gfx/luminance-hdr: Fix build with media-gfx/exiv2-0.27.1
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f8dd13fabfba50f506c36d927e33f40c5a868172;p=gentoo.git

media-gfx/luminance-hdr: Fix build with media-gfx/exiv2-0.27.1

Reported-by: Erich Seifert <eseifert@error-reports.org>
Closes: https://bugs.gentoo.org/688556
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---

diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch
new file mode 100644
index 000000000000..16b5256e935d
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch
@@ -0,0 +1,22 @@
+From 8c3f1571bfa7bb702228bb283e37e58c8b322d5b Mon Sep 17 00:00:00 2001
+From: Benitoite <kd6kxr@gmail.com>
+Date: Fri, 26 Apr 2019 18:07:52 -0700
+Subject: [PATCH] ExifOperations: include exiv2/exiv2.hpp
+
+Because type `AnyError` requires definition in the exiv2 namespace.
+---
+ src/Exif/ExifOperations.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Exif/ExifOperations.cpp b/src/Exif/ExifOperations.cpp
+index 07ca742c..dd3d22a6 100644
+--- a/src/Exif/ExifOperations.cpp
++++ b/src/Exif/ExifOperations.cpp
+@@ -35,6 +35,7 @@
+ #include <boost/assign/list_of.hpp>
+ 
+ #include <exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <image.hpp>
+ 
+ #include "Common/config.h"
\ No newline at end of file
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
index e8bae1039b5b..33c04975b7fb 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,7 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.1-docs.patch
 	"${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch
 	"${FILESDIR}"/${PN}-2.5.1-fits-automagic.patch
-	"${FILESDIR}"/${PN}-2.5.1-exiv2-0.27.patch
+	"${FILESDIR}"/${PN}-2.5.1-exiv2-0.27{,.1}.patch
 )
 
 pkg_pretend() {