sci-geosciences/merkaartor: Fix build with >=exiv2-0.28

Closes: https://bugs.gentoo.org/906501
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

2 files changed, 54 insertions, 1 deletions

diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch b/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch
new file mode 100644
index 000000000000..4f98b9a4fa36
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch
@@ -0,0 +1,50 @@
+From 1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
+Date: Sat, 16 Jul 2022 12:41:33 +0200
+Subject: [PATCH] Replaced use of AutoPtr with std::unique_ptr in
+ GeoImageDock.cpp.
+
+---
+ src/Docks/GeoImageDock.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp
+index 02b5cdc0..e2fa1601 100644
+--- a/src/Docks/GeoImageDock.cpp
++++ b/src/Docks/GeoImageDock.cpp
+@@ -457,7 +457,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
+     Document *theDocument = Main->document();
+     MapView *theView = Main->view();
+ 
+-    Exiv2::Image::AutoPtr image;
++    std::unique_ptr<Exiv2::Image> image;
+     Exiv2::ExifData exifData;
+     bool positionValid = false;
+ 
+@@ -869,7 +869,7 @@ void GeoImageDock::saveImage()
+ //    fn = QFileDialog::getSaveFileName(0, "Specify output filename", fn, tr("JPEG Images (*.jpg)"));
+     qDebug() << fn;
+     if (!fn.isEmpty()) {
+-        Exiv2::Image::AutoPtr imageIn, imageOut;
++        std::unique_ptr<Exiv2::Image> imageIn, imageOut;
+         Exiv2::ExifData exifData;
+         try {
+             imageIn = Exiv2::ImageFactory::open(usedTrackPoints.at(index).filename.toStdString());
+@@ -893,7 +893,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString & file)
+ {
+     Coord pos;
+     double lat = 0.0, lon = 0.0;
+-    Exiv2::Image::AutoPtr image;
++    std::unique_ptr<Exiv2::Image> image;
+     Exiv2::ExifData exifData;
+     bool positionValid = false;
+ 
+@@ -933,7 +933,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString & file)
+ 
+ void GeoImageDock::addGeoDataToImage(Coord position, const QString & file)
+ {
+-    Exiv2::Image::AutoPtr image;
++    std::unique_ptr<Exiv2::Image> image;
+ 
+     try {
+         image = Exiv2::ImageFactory::open(file.toStdString());
diff --git a/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
index f0f4b1dbd195..c959fecd8c1c 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
@@ -45,7 +45,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch # downstream, bug 621826
+	"${FILESDIR}"/${P}-exiv2-0.28.patch # upstream git master, bug 906501
+)
 
 DOCS=( AUTHORS CHANGELOG )