astro/merkaartor: Fix about-dialog and terminology

 * Get rid of the `git describe` lines
 * Include terminology fix[1]

[1] https://github.com/openstreetmap/merkaartor/pull/260

PR:	264641
Reported by:	dev2@heesakkers.info (maintainer)

5 files changed, 240 insertions, 1 deletions

diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 3157e57b481c..8aca54c4089c 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	merkaartor
 PORTVERSION=	0.19.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro
 
 MAINTAINER=	dev2@heesakkers.info
diff --git a/astro/merkaartor/files/patch-src_Config.pri b/astro/merkaartor/files/patch-src_Config.pri
new file mode 100644
index 000000000000..3ba0292b5963
--- /dev/null
+++ b/astro/merkaartor/files/patch-src_Config.pri
@@ -0,0 +1,16 @@
+--- src/Config.pri.orig	2022-06-11 16:26:36 UTC
++++ src/Config.pri
+@@ -1,11 +1,7 @@
+ # see http://merkaartor.be/wiki/merkaartor/Compiling
+ 
+-REVISION = $$system( git describe --tags )
+-VERSION = $$system( git describe --tags HEAD | sed "'s/-g.*//;s/-/./g'" )
+-isEmpty( REVISION ) {
+-	REVISION = $$system(head -n 3 ../CHANGELOG | tail -n 1 | sed "'s/^v//'")
+-	VERSION = $$REVISION
+-}
++REVISION = $$system(head -n 3 ../CHANGELOG | tail -n 1 | sed "'s/^v//'")
++VERSION = $$REVISION
+ 
+ ARCH=""
+ BITS=""
diff --git a/astro/merkaartor/files/patch-src_ImportExport_ImportOSM.cpp b/astro/merkaartor/files/patch-src_ImportExport_ImportOSM.cpp
new file mode 100644
index 000000000000..87fa2577c714
--- /dev/null
+++ b/astro/merkaartor/files/patch-src_ImportExport_ImportOSM.cpp
@@ -0,0 +1,21 @@
+--- src/ImportExport/ImportOSM.cpp.orig	2022-06-11 16:30:43 UTC
++++ src/ImportExport/ImportOSM.cpp
+@@ -541,9 +541,9 @@ bool importOSM(QWidget* aParent, QIODevice& File, Docu
+         }
+ 
+         if (EmptyFeature.size()) {
+-            if (QMessageBox::warning(aParent,QApplication::translate("Downloader","Empty roads/relations detected"),
++            if (QMessageBox::warning(aParent,QApplication::translate("Downloader","Empty ways/relations detected"),
+                     QApplication::translate("Downloader",
+-                    "Empty roads/relations are probably errors.\n"
++                    "Empty ways/relations are probably errors.\n"
+                     "Do you want to mark them for deletion?"),
+                     QMessageBox::Ok | QMessageBox::Cancel,
+                     QMessageBox::Cancel
+@@ -590,6 +590,3 @@ bool importOSM(QWidget* aParent, QByteArray& Content, 
+     File.open(QIODevice::ReadOnly);
+     return importOSM(aParent, File, theDocument, theLayer, theDownloader);
+ }
+-
+-
+-
diff --git a/astro/merkaartor/files/patch-src_Sync_DirtyList.cpp b/astro/merkaartor/files/patch-src_Sync_DirtyList.cpp
new file mode 100644
index 000000000000..23a07477e7d8
--- /dev/null
+++ b/astro/merkaartor/files/patch-src_Sync_DirtyList.cpp
@@ -0,0 +1,128 @@
+--- src/Sync/DirtyList.cpp.orig	2022-06-11 16:32:14 UTC
++++ src/Sync/DirtyList.cpp
+@@ -342,7 +342,7 @@ bool DirtyListDescriber::showChanges(QWidget* aParent)
+ 
+ bool DirtyListDescriber::addRoad(Way* R)
+ {
+-    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD road %1").arg(R->id().numId) + userName(R), theListWidget);
++    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD way %1").arg(R->id().numId) + userName(R), theListWidget);
+     it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
+     ++glbAdded;
+     ++glbWaysAdded;
+@@ -351,7 +351,7 @@ bool DirtyListDescriber::addRoad(Way* R)
+ 
+ bool DirtyListDescriber::addPoint(Node* Pt)
+ {
+-    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD trackpoint %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
++    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD node %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
+     it->setData(Qt::UserRole, QVariant::fromValue(Pt->id()));
+     ++glbAdded;
+     ++glbNodesAdded;
+@@ -369,7 +369,7 @@ bool DirtyListDescriber::addRelation(Relation* R)
+ 
+ bool DirtyListDescriber::updatePoint(Node* Pt)
+ {
+-    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE trackpoint %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
++    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE node %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
+     it->setData(Qt::UserRole, QVariant::fromValue(Pt->id()));
+     ++glbUpdated;
+     ++glbNodesUpdated;
+@@ -387,7 +387,7 @@ bool DirtyListDescriber::updateRelation(Relation* R)
+ 
+ bool DirtyListDescriber::updateRoad(Way* R)
+ {
+-    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE road %1").arg(R->id().numId) + userName(R), theListWidget);
++    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE way %1").arg(R->id().numId) + userName(R), theListWidget);
+     it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
+     ++glbUpdated;
+     ++glbWaysUpdated;
+@@ -396,7 +396,7 @@ bool DirtyListDescriber::updateRoad(Way* R)
+ 
+ bool DirtyListDescriber::erasePoint(Node* Pt)
+ {
+-    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE trackpoint %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
++    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE node %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
+     it->setData(Qt::UserRole, QVariant::fromValue(Pt->id()));
+     ++glbDeleted;
+     ++glbNodesDeleted;
+@@ -405,7 +405,7 @@ bool DirtyListDescriber::erasePoint(Node* Pt)
+ 
+ bool DirtyListDescriber::eraseRoad(Way* R)
+ {
+-    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE road %1").arg(R->id().numId) + userName(R), theListWidget);
++    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE way %1").arg(R->id().numId) + userName(R), theListWidget);
+     it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
+     ++glbDeleted;
+     ++glbWaysDeleted;
+@@ -593,9 +593,9 @@ bool DirtyListExecutor::addRoad(Way *R)
+ {
+     Progress->setValue(++Done);
+ 
+-    qDebug() << QString("ADD road %1").arg(R->id().numId);
++    qDebug() << QString("ADD way %1").arg(R->id().numId);
+ 
+-    Progress->setLabelText(tr("ADD road %1").arg(R->id().numId) + userName(R));
++    Progress->setLabelText(tr("ADD way %1").arg(R->id().numId) + userName(R));
+     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
+ 
+     QString DataIn, DataOut;
+@@ -627,9 +627,9 @@ bool DirtyListExecutor::addPoint(Node* Pt)
+ {
+     Progress->setValue(++Done);
+ 
+-    qDebug() << QString("ADD trackpoint %1").arg(Pt->id().numId);
++    qDebug() << QString("ADD node %1").arg(Pt->id().numId);
+ 
+-    Progress->setLabelText(tr("ADD trackpoint %1").arg(Pt->id().numId) + userName(Pt));
++    Progress->setLabelText(tr("ADD node %1").arg(Pt->id().numId) + userName(Pt));
+     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
+ 
+     QString DataIn, DataOut;
+@@ -693,9 +693,9 @@ bool DirtyListExecutor::updateRoad(Way* R)
+ {
+     Progress->setValue(++Done);
+ 
+-    qDebug() << QString("UPDATE road %1").arg(R->id().numId);
++    qDebug() << QString("UPDATE way %1").arg(R->id().numId);
+ 
+-    Progress->setLabelText(tr("UPDATE road %1").arg(R->id().numId) + userName(R));
++    Progress->setLabelText(tr("UPDATE way %1").arg(R->id().numId) + userName(R));
+     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
+     QString URL = theDownloader->getURLToUpdate("way",stripToOSMId(R->id()));
+     QString DataIn, DataOut;
+@@ -724,9 +724,9 @@ bool DirtyListExecutor::updatePoint(Node* Pt)
+ {
+     Progress->setValue(++Done);
+ 
+-    qDebug() << QString("UPDATE trackpoint %1").arg(Pt->id().numId);
++    qDebug() << QString("UPDATE node %1").arg(Pt->id().numId);
+ 
+-    Progress->setLabelText(tr("UPDATE trackpoint %1").arg(Pt->id().numId) + userName(Pt));
++    Progress->setLabelText(tr("UPDATE node %1").arg(Pt->id().numId) + userName(Pt));
+     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
+ //	QString URL("/api/0.3/node/%1");
+ //	URL = URL.arg(stripToOSMId(Pt->id()));
+@@ -757,9 +757,9 @@ bool DirtyListExecutor::erasePoint(Node *Pt)
+ {
+     Progress->setValue(++Done);
+ 
+-    qDebug() << QString("REMOVE trackpoint %1").arg(Pt->id().numId);
++    qDebug() << QString("REMOVE node %1").arg(Pt->id().numId);
+ 
+-    Progress->setLabelText(tr("REMOVE trackpoint %1").arg(Pt->id().numId) + userName(Pt));
++    Progress->setLabelText(tr("REMOVE node %1").arg(Pt->id().numId) + userName(Pt));
+     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
+ //	QString URL("/api/0.3/node/%1");
+ //	URL = URL.arg(stripToOSMId(Pt->id()));
+@@ -784,9 +784,9 @@ bool DirtyListExecutor::eraseRoad(Way *R)
+ {
+     Progress->setValue(++Done);
+ 
+-    qDebug() << QString("REMOVE road %1").arg(R->id().numId);
++    qDebug() << QString("REMOVE way %1").arg(R->id().numId);
+ 
+-    Progress->setLabelText(tr("REMOVE road %1").arg(R->id().numId) + userName(R));
++    Progress->setLabelText(tr("REMOVE way %1").arg(R->id().numId) + userName(R));
+     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
+ //	QString URL("/api/0.3/way/%1");
+ //	URL = URL.arg(stripToOSMId(R->id()));
diff --git a/astro/merkaartor/files/patch-src_Sync_DirtyListExecutorOSC.cpp b/astro/merkaartor/files/patch-src_Sync_DirtyListExecutorOSC.cpp
new file mode 100644
index 000000000000..27abc23d99d8
--- /dev/null
+++ b/astro/merkaartor/files/patch-src_Sync_DirtyListExecutorOSC.cpp
@@ -0,0 +1,74 @@
+--- src/Sync/DirtyListExecutorOSC.cpp.orig	2022-06-11 16:33:19 UTC
++++ src/Sync/DirtyListExecutorOSC.cpp
+@@ -368,9 +368,9 @@ bool DirtyListExecutorOSC::addRoad(Way *F)
+ {
+     Progress->setValue(++Done);
+ 
+-    qDebug() << QString("ADD road %1").arg(F->id().numId);
++    qDebug() << QString("ADD way %1").arg(F->id().numId);
+ 
+-    Progress->setLabelText(tr("ADD road %1").arg(F->id().numId) + userName(F));
++    Progress->setLabelText(tr("ADD way %1").arg(F->id().numId) + userName(F));
+     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
+ 
+     OscCreate(F);
+@@ -383,9 +383,9 @@ bool DirtyListExecutorOSC::addPoint(Node* F)
+ {
+     Progress->setValue(++Done);
+ 
+-    qDebug() << QString("ADD trackpoint %1").arg(F->id().numId);
++    qDebug() << QString("ADD node %1").arg(F->id().numId);
+ 
+-    Progress->setLabelText(tr("ADD trackpoint %1").arg(F->id().numId) + userName(F));
++    Progress->setLabelText(tr("ADD node %1").arg(F->id().numId) + userName(F));
+     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
+ 
+     OscCreate(F);
+@@ -414,9 +414,9 @@ bool DirtyListExecutorOSC::updateRoad(Way* F)
+ {
+     Progress->setValue(++Done);
+ 
+-    qDebug() << QString("UPDATE road %1").arg(F->id().numId);
++    qDebug() << QString("UPDATE way %1").arg(F->id().numId);
+ 
+-    Progress->setLabelText(tr("UPDATE road %1").arg(F->id().numId) + userName(F));
++    Progress->setLabelText(tr("UPDATE way %1").arg(F->id().numId) + userName(F));
+     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
+ 
+     OscModify(F);
+@@ -428,9 +428,9 @@ bool DirtyListExecutorOSC::updatePoint(Node* F)
+ {
+     Progress->setValue(++Done);
+ 
+-    qDebug() << QString("UPDATE trackpoint %1").arg(F->id().numId);
++    qDebug() << QString("UPDATE node %1").arg(F->id().numId);
+ 
+-    Progress->setLabelText(tr("UPDATE trackpoint %1").arg(F->id().numId) + userName(F));
++    Progress->setLabelText(tr("UPDATE node %1").arg(F->id().numId) + userName(F));
+     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
+ 
+     OscModify(F);
+@@ -442,9 +442,9 @@ bool DirtyListExecutorOSC::erasePoint(Node *F)
+ {
+     Progress->setValue(++Done);
+ 
+-    qDebug() << QString("REMOVE trackpoint %1").arg(F->id().numId);
++    qDebug() << QString("REMOVE node %1").arg(F->id().numId);
+ 
+-    Progress->setLabelText(tr("REMOVE trackpoint %1").arg(F->id().numId) + userName(F));
++    Progress->setLabelText(tr("REMOVE node %1").arg(F->id().numId) + userName(F));
+     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
+ 
+     OscDelete(F);
+@@ -456,9 +456,9 @@ bool DirtyListExecutorOSC::eraseRoad(Way *F)
+ {
+     Progress->setValue(++Done);
+ 
+-    qDebug() << QString("REMOVE road %1").arg(F->id().numId);
++    qDebug() << QString("REMOVE way %1").arg(F->id().numId);
+ 
+-    Progress->setLabelText(tr("REMOVE road %1").arg(F->id().numId) + userName(F));
++    Progress->setLabelText(tr("REMOVE way %1").arg(F->id().numId) + userName(F));
+     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
+ 
+     OscDelete(F);