From nobody Fri Jun 17 05:26:39 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 98DC285B8E5; Fri, 17 Jun 2022 05:26:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPSFq3qwJz3LQR; Fri, 17 Jun 2022 05:26:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655443599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o4zcZSnMp/oeDDhpfeVMnXSoEQeOJ1kwcein+EHUVEc=; b=hvgaKe/xFVVzOLtrISMNNeWnpVOOM7EDQa3x5C0GhfnznNvh1iQYgKYHlAM6CEAIwcFDP9 Gy2EpQ/gFUNVIdXisUeAor6c9ZYQYOGQcB20wHIWZzHdhNLl/uj5NpwOOB8nSmTngDmuSw wjWJtVXO22X0n+cLPrxAvD4OF3at5H/PK9bQP9MRQ5yR6ffppgMfbepaKOi4Okaku3/N+T 7aT+8rwmuo0WMkn6FXxFY/OUTGA3BDsbsEQ56uLdeAd6glvfD7nYZyebp+6lvfD4xECs5l tikQ3gLgjI5tC+0MCIzVpYXcpBV2v/1oU4ZoLpx/itglqFoC2MeWWF3CoqL6fA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5B73A19D82; Fri, 17 Jun 2022 05:26:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25H5QdqZ061551; Fri, 17 Jun 2022 05:26:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25H5QdBF061550; Fri, 17 Jun 2022 05:26:39 GMT (envelope-from git) Date: Fri, 17 Jun 2022 05:26:39 GMT Message-Id: <202206170526.25H5QdBF061550@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: b796796f0222 - main - astro/merkaartor: Fix about-dialog and terminology List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b796796f022213e8cd30660d82c77789823700b1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655443599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o4zcZSnMp/oeDDhpfeVMnXSoEQeOJ1kwcein+EHUVEc=; b=IZPvUE8a9WZMi1wzrDicXMoGxCCuEps0Z9Dw2pQWqTRZTcsKGuJdiE3qZGTKzDkQuqO9sV pL2QHCpcGzvjjWhjXQ2B853+ZfQSV0GLEhvkonX//gh6LcECAKnpL0ANGrukclEm9S+qLd 1AXn0fLC1gPzFJXujekgVyP1CMVtKewWepNgd+UgSLViy8/GKsBcRBJkpi1yp/C7yWFRq6 Vevg43OTGapjWbdzFcfacclKHysa6hkA0HXUHg3d/OKdOx9XTpcdbw5OjSOF5MyVFxOEOz Wnbp9YO1Rt0MJfWv41jahx7JLDNDf2PZ9HY5VPMt21mxQYAz8B9xG2kTXurKYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655443599; a=rsa-sha256; cv=none; b=LdQAd4aQ7wmjIszdwaloMAAMei7h88XmiXXQc4C/MyhDwHvRu+drD8DOhO4yLdoURSYYdw ut1KSKVOL5gFlBC9OJrLdhK1mcWUtYqi1uhKrXf1DDnjiaMtQRUz4xzLC3HsyH3KNWsGUy /KLib04dVLc3F89XDwjmCgNP9rcDbv19sMj/ccEukled4g9j23FBSGKy8MDDryQOm9FfMT 3yFbPCd0kv71U1gUHxscmNB3cpq5sHJuz3nMpIyZ90XOXPt4s1DIiywxsv0vKxzJ2OtQ8c cFmqTE9pGNIFjMUSHngGGbWkbG9aA5inMxuewkmOcgtG5y3DJ+ZW4DBwfjVQmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=b796796f022213e8cd30660d82c77789823700b1 commit b796796f022213e8cd30660d82c77789823700b1 Author: Oliver Heesakkers AuthorDate: 2022-06-16 16:38:30 +0000 Commit: Fernando Apesteguía CommitDate: 2022-06-17 05:24:06 +0000 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) --- astro/merkaartor/Makefile | 2 +- astro/merkaartor/files/patch-src_Config.pri | 16 +++ .../files/patch-src_ImportExport_ImportOSM.cpp | 21 ++++ .../merkaartor/files/patch-src_Sync_DirtyList.cpp | 128 +++++++++++++++++++++ .../files/patch-src_Sync_DirtyListExecutorOSC.cpp | 74 ++++++++++++ 5 files changed, 240 insertions(+), 1 deletion(-) 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);