[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/files/, sci-geosciences/merkaartor/

[Andreas Sturmlechner]

commit:     343a18a34ce2e4b099d519556e8ca58c875cbdad
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  1 17:40:37 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul  1 17:51:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343a18a3

sci-geosciences/merkaartor: Fix build with exiv2-0.27.1

Closes: https://bugs.gentoo.org/689098
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch    | 12 ++++++++++++
 sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild       |  1 +
 2 files changed, 13 insertions(+)

diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch
new file mode 100644
index 00000000000..d54422be14e
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch
@@ -0,0 +1,12 @@
+--- a/src/Docks/GeoImageDock.h	2016-09-06 00:29:45.000000000 +0200
++++ b/src/Docks/GeoImageDock.h	2019-07-01 19:20:43.450789475 +0200
+@@ -7,8 +7,7 @@
+ #include <QDockWidget>
+ #include <QMouseEvent>
+ #include <QShortcut>
+-#include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <QDrag>
+ 
+ class ImageView;

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
index b998c164e0c..6eed24c6150 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
@@ -42,6 +42,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826
 	"${FILESDIR}"/${P}-desktopfile.patch
 	"${FILESDIR}"/${P}-webengine{1,2,3}.patch
+	"${FILESDIR}"/${P}-exiv2-0.27.1.patch # bug 689098
 )
 
 DOCS=( AUTHORS CHANGELOG )