summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-12-29 12:40:31 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-12-29 14:31:43 +0100
commit8f6a858f3f76ab3d0ba8acda28f2981d24cceeda (patch)
tree6f56721d65d9350573038911eaa03d4a8c571ab4 /media-gfx
parentsys-apps/coreutils: forward arm keyword stable (diff)
downloadgentoo-8f6a858f3f76ab3d0ba8acda28f2981d24cceeda.tar.gz
gentoo-8f6a858f3f76ab3d0ba8acda28f2981d24cceeda.tar.bz2
gentoo-8f6a858f3f76ab3d0ba8acda28f2981d24cceeda.zip
media-gfx/luminance-hdr: Fix build with exiv2-0.27
Closes: https://bugs.gentoo.org/673728 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch25
-rw-r--r--media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild3
2 files changed, 27 insertions, 1 deletions
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch
new file mode 100644
index 00000000000..7b52c883e40
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch
@@ -0,0 +1,25 @@
+From e733c24baf0c87e0b3c45351ff916c5f3a652826 Mon Sep 17 00:00:00 2001
+From: Benitoite <kd6kxr@gmail.com>
+Date: Sun, 16 Dec 2018 22:18:37 -0800
+Subject: [PATCH] Define EXIV2_TEST_VERSION by including exiv2.hpp
+
+AppleClang 10 did not allow compilation without exiv2/exiv2.hpp or exiv2/version.hpp
+Also, version.hpp says use exiv2.hpp
+
+* 2018-12-29 asturm@gentoo.org: Backported to 2.5.1
+---
+ src/TransplantExif/TransplantExifDialog.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/TransplantExif/TransplantExifDialog.cpp b/src/TransplantExif/TransplantExifDialog.cpp
+index c38a51e4..1fac2e0f 100644
+--- a/src/TransplantExif/TransplantExifDialog.cpp
++++ b/src/TransplantExif/TransplantExifDialog.cpp
+@@ -26,6 +26,7 @@
+ #include <QFileInfo>
+ #include <image.hpp>
+ #include <exif.hpp>
++#include <exiv2/exiv2.hpp>
+
+ #include "Common/global.h"
+ #include "Common/config.h"
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 39c345486d1..e8bae1039b5 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 Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -50,6 +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
)
pkg_pretend() {