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@gentoo.org>

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 (file)
index 0000000..d54422b
--- /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 b998c164e0c0596ae5e0f37e60ee475d401a6aeb..6eed24c615043619df67dea8ec54c53a42f62691 100644 (file)
--- 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 )