git: b6555cf39dd1 - main - astro/merkaartor: make compatible with exiv2 0.28

The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b6555cf39dd1d05fe12e581950b36d9d6038722f

commit b6555cf39dd1d05fe12e581950b36d9d6038722f
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2023-07-02 14:00:58 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2023-07-09 22:08:09 +0000

    astro/merkaartor: make compatible with exiv2 0.28
    
    PR:             272311
---
 astro/merkaartor/Makefile                          |  2 +-
 .../files/patch-src_Docks_GeoImageDock.cpp         | 38 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 815ed9425877..a36ac1d643dc 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	merkaartor
 PORTVERSION=	0.19.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	astro
 
 MAINTAINER=	dev2@heesakkers.info
diff --git a/astro/merkaartor/files/patch-src_Docks_GeoImageDock.cpp b/astro/merkaartor/files/patch-src_Docks_GeoImageDock.cpp
new file mode 100644
index 000000000000..498ceed7afb0
--- /dev/null
+++ b/astro/merkaartor/files/patch-src_Docks_GeoImageDock.cpp
@@ -0,0 +1,38 @@
+--- src/Docks/GeoImageDock.cpp.orig	2021-08-27 12:34:31 UTC
++++ src/Docks/GeoImageDock.cpp
+@@ -456,7 +456,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
+     Document *theDocument = Main->document();
+     MapView *theView = Main->view();
+ 
+-    Exiv2::Image::AutoPtr image;
++    Exiv2::Image::UniquePtr image;
+     Exiv2::ExifData exifData;
+     bool positionValid = false;
+ 
+@@ -868,7 +868,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;
++        Exiv2::Image::UniquePtr imageIn, imageOut;
+         Exiv2::ExifData exifData;
+         try {
+             imageIn = Exiv2::ImageFactory::open(usedTrackPoints.at(index).filename.toStdString());
+@@ -892,7 +892,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString 
+ {
+     Coord pos;
+     double lat = 0.0, lon = 0.0;
+-    Exiv2::Image::AutoPtr image;
++    Exiv2::Image::UniquePtr image;
+     Exiv2::ExifData exifData;
+     bool positionValid = false;
+ 
+@@ -932,7 +932,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString 
+ 
+ void GeoImageDock::addGeoDataToImage(Coord position, const QString & file)
+ {
+-    Exiv2::Image::AutoPtr image;
++    Exiv2::Image::UniquePtr image;
+ 
+     try {
+         image = Exiv2::ImageFactory::open(file.toStdString());