1 |
commit: 8f6a858f3f76ab3d0ba8acda28f2981d24cceeda |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 29 11:40:31 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 29 13:31:43 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f6a858f |
7 |
|
8 |
media-gfx/luminance-hdr: Fix build with exiv2-0.27 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/673728 |
11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
.../files/luminance-hdr-2.5.1-exiv2-0.27.patch | 25 ++++++++++++++++++++++ |
15 |
.../luminance-hdr/luminance-hdr-2.5.1-r1.ebuild | 3 ++- |
16 |
2 files changed, 27 insertions(+), 1 deletion(-) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..7b52c883e40 |
21 |
--- /dev/null |
22 |
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch |
23 |
@@ -0,0 +1,25 @@ |
24 |
+From e733c24baf0c87e0b3c45351ff916c5f3a652826 Mon Sep 17 00:00:00 2001 |
25 |
+From: Benitoite <kd6kxr@×××××.com> |
26 |
+Date: Sun, 16 Dec 2018 22:18:37 -0800 |
27 |
+Subject: [PATCH] Define EXIV2_TEST_VERSION by including exiv2.hpp |
28 |
+ |
29 |
+AppleClang 10 did not allow compilation without exiv2/exiv2.hpp or exiv2/version.hpp |
30 |
+Also, version.hpp says use exiv2.hpp |
31 |
+ |
32 |
+* 2018-12-29 asturm@g.o: Backported to 2.5.1 |
33 |
+--- |
34 |
+ src/TransplantExif/TransplantExifDialog.cpp | 1 + |
35 |
+ 1 file changed, 1 insertion(+) |
36 |
+ |
37 |
+diff --git a/src/TransplantExif/TransplantExifDialog.cpp b/src/TransplantExif/TransplantExifDialog.cpp |
38 |
+index c38a51e4..1fac2e0f 100644 |
39 |
+--- a/src/TransplantExif/TransplantExifDialog.cpp |
40 |
++++ b/src/TransplantExif/TransplantExifDialog.cpp |
41 |
+@@ -26,6 +26,7 @@ |
42 |
+ #include <QFileInfo> |
43 |
+ #include <image.hpp> |
44 |
+ #include <exif.hpp> |
45 |
++#include <exiv2/exiv2.hpp> |
46 |
+ |
47 |
+ #include "Common/global.h" |
48 |
+ #include "Common/config.h" |
49 |
|
50 |
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 |
51 |
index 39c345486d1..e8bae1039b5 100644 |
52 |
--- a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild |
53 |
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild |
54 |
@@ -1,4 +1,4 @@ |
55 |
-# Copyright 1999-2018 Gentoo Foundation |
56 |
+# Copyright 1999-2018 Gentoo Authors |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
|
59 |
EAPI=6 |
60 |
@@ -50,6 +50,7 @@ PATCHES=( |
61 |
"${FILESDIR}"/${PN}-2.5.1-docs.patch |
62 |
"${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch |
63 |
"${FILESDIR}"/${PN}-2.5.1-fits-automagic.patch |
64 |
+ "${FILESDIR}"/${PN}-2.5.1-exiv2-0.27.patch |
65 |
) |
66 |
|
67 |
pkg_pretend() { |