diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile index 5b46c8d56bf6..9a8907d05914 100644 --- a/astro/merkaartor/Makefile +++ b/astro/merkaartor/Makefile @@ -1,63 +1,38 @@ PORTNAME= merkaartor -PORTVERSION= 0.19.0 -PORTREVISION= 35 +PORTVERSION= 0.20.0 CATEGORIES= astro -MAINTAINER= dev2@heesakkers.info +MAINTAINER= makc@FreeBSD.org COMMENT= Openstreetmap mapping program WWW= http://merkaartor.be/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgdal.so:graphics/gdal \ libproj.so:graphics/proj \ - libquazip1-qt5.so:archivers/quazip@qt5 + libexiv2.so:graphics/exiv2 \ + libprotobuf.so:devel/protobuf \ + libproxy.so:net/libproxy -USES= compiler:c++11-lang gnome pkgconfig qmake qt:5 sqlite:3 +USES= cmake compiler:c++17-lang gnome pkgconfig qt:6 USE_GITHUB= yes GH_ACCOUNT= openstreetmap USE_LDCONFIG= yes -QMAKE_ARGS= SYSTEM_QUAZIP=1 -USE_QT= buildtools:build \ - concurrent core gui imageformats network printsupport svg \ - webengine widgets xml +USE_QT= 5compat base networkauth svg webengine \ + imageformats:run \ + tools:build -OPTIONS_DEFINE= DEBUG GEOIMAGE NLS PROTOBUF ZBAR -OPTIONS_DEFAULT= GEOIMAGE - -GEOIMAGE_DESC= Enable geotagged images (needs exiv2) -GEOIMAGE_QMAKE_ON= GEOIMAGE=1 -GEOIMAGE_LIB_DEPENDS= libexiv2.so:graphics/exiv2 - -PROTOBUF_DESC= Protobuf Binary Format support -PROTOBUF_QMAKE_ON= PROTOBUF=1 -PROTOBUF_LIB_DEPENDS= libprotobuf.so:devel/protobuf - -ZBAR_DESC= Read barcodes from walking papers (BROKEN) -ZBAR_QMAKE_ON= ZBAR=1 -ZBAR_LIB_DEPENDS= libzbar.so:graphics/zbar -# graphics/zbar needs to be built with Qt support (and needs a Qt5 version) -ZBAR_BROKEN= Does not build with option ZBAR selected - -DEBUG_QMAKE_OFF= NODEBUG=1 RELEASE=1 - -NLS_USES= qt:5 -NLS_USE= QT=linguisttools:build +CMAKE_ON= LIBPROXY WEBENGINE +OPTIONS_DEFINE= NLS OPTIONS_SUB= yes -pre-build-NLS-on: - @cd ${WRKSRC}/translations && ${LRELEASE} ../src/src.pro - -pre-build-PROTOBUF-on: - @cd ${WRKSRC}/src/ImportExport && ${LOCALBASE}/bin/protoc --cpp_out=. \ - fileformat.proto osmformat.proto - -post-install-NLS-on: - @${MKDIR} ${STAGEDIR}${DATADIR}/translations - @(cd ${WRKSRC}/translations && ${COPYTREE_SHARE} "merkaartor_*.qm" \ - ${STAGEDIR}${DATADIR}/translations) +# ZBAR_DESC= Read barcodes from walking papers (BROKEN) +# ZBAR_CMAKE_ON= ZBAR +# ZBAR_LIB_DEPENDS= libzbar.so:graphics/zbar +# # graphics/zbar needs to be built with Qt6 support +# ZBAR_BROKEN= Does not build with option ZBAR selected .include diff --git a/astro/merkaartor/distinfo b/astro/merkaartor/distinfo index b2cd7a2bc700..10fd1bbd781f 100644 --- a/astro/merkaartor/distinfo +++ b/astro/merkaartor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1631386062 -SHA256 (openstreetmap-merkaartor-0.19.0_GH0.tar.gz) = f538d1eb380005cbd5d047070b276da59c58bb7ff47218e20a080b893d0ba457 -SIZE (openstreetmap-merkaartor-0.19.0_GH0.tar.gz) = 5665947 +TIMESTAMP = 1784025686 +SHA256 (openstreetmap-merkaartor-0.20.0_GH0.tar.gz) = 31b73a9d50cb6366a7c15ab36e030467ffe9f7de2be38bad5f3832314d4a5751 +SIZE (openstreetmap-merkaartor-0.20.0_GH0.tar.gz) = 5592116 diff --git a/astro/merkaartor/files/patch-CMakeLists.txt b/astro/merkaartor/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..4c7565ab1e3c --- /dev/null +++ b/astro/merkaartor/files/patch-CMakeLists.txt @@ -0,0 +1,70 @@ +--- CMakeLists.txt.orig 2024-09-07 06:21:01 UTC ++++ CMakeLists.txt +@@ -414,26 +414,30 @@ interfaces/IMapAdapter.h + + ) + ++if (UNIX) ++ include(GNUInstallDirs) ++endif() ++ + if (NOT APPLE) +-install( FILES ${CMAKE_SOURCE_DIR}/src/org.merkaartor.merkaartor.desktop DESTINATION share/applications ) +-install( FILES ${CMAKE_SOURCE_DIR}/src/org.merkaartor.merkaartor.appdata.xml DESTINATION share/metainfo ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/8x8/merkaartor.png DESTINATION share/icons/hicolor/8x8/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/16x16/merkaartor.png DESTINATION share/icons/hicolor/16x16/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/22x22/merkaartor.png DESTINATION share/icons/hicolor/22x22/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/24x24/merkaartor.png DESTINATION share/icons/hicolor/24x24/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/32x32/merkaartor.png DESTINATION share/icons/hicolor/32x32/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/36x36/merkaartor.png DESTINATION share/icons/hicolor/36x36/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/40x40/merkaartor.png DESTINATION share/icons/hicolor/40x40/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/42x42/merkaartor.png DESTINATION share/icons/hicolor/42x42/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/48x48/merkaartor.png DESTINATION share/icons/hicolor/48x48/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/64x64/merkaartor.png DESTINATION share/icons/hicolor/64x64/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/72x72/merkaartor.png DESTINATION share/icons/hicolor/72x72/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/80x80/merkaartor.png DESTINATION share/icons/hicolor/80x80/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/96x96/merkaartor.png DESTINATION share/icons/hicolor/96x96/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/128x128/merkaartor.png DESTINATION share/icons/hicolor/128x128/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/192x192/merkaartor.png DESTINATION share/icons/hicolor/192x192/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/256x256/merkaartor.png DESTINATION share/icons/hicolor/256x256/apps ) +-install( FILES ${CMAKE_SOURCE_DIR}/Icons/512x512/merkaartor.png DESTINATION share/icons/hicolor/512x512/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/src/org.merkaartor.merkaartor.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications ) ++install( FILES ${CMAKE_SOURCE_DIR}/src/org.merkaartor.merkaartor.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/8x8/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/8x8/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/16x16/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/16x16/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/22x22/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/22x22/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/24x24/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/24x24/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/32x32/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/32x32/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/36x36/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/36x36/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/40x40/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/40x40/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/42x42/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/42x42/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/48x48/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/64x64/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/72x72/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/72x72/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/80x80/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/80x80/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/96x96/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/96x96/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/128x128/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/192x192/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/192x192/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/256x256/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/256x256/apps ) ++install( FILES ${CMAKE_SOURCE_DIR}/Icons/512x512/merkaartor.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/512x512/apps ) + endif() + + set(MERKAARTOR_SHARE_FILES +@@ -443,7 +447,7 @@ set(MERKAARTOR_SHARE_FILES + ${CMAKE_SOURCE_DIR}/share/WmsServersList.xml + ) + +-install( FILES ${MERKAARTOR_SHARE_FILES} DESTINATION share/merkaartor) ++install( FILES ${MERKAARTOR_SHARE_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/merkaartor) + set_source_files_properties(${MEKAARTOR_SHARE_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") + + set(TS_FILES +@@ -469,7 +473,7 @@ qt_add_translation(QM_FILES + qt_add_translation(QM_FILES + ${TS_FILES} + ) +-install( FILES ${QM_FILES} DESTINATION share/merkaartor/translations ) ++install( FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/merkaartor/translations ) + + find_program(LUPDATE lupdate) + add_custom_target(update-translations COMMAND ${LUPDATE} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/plugins -source-language en -target-language en -ts ${CMAKE_SOURCE_DIR}/translations/merkaartor_en.ts) diff --git a/astro/merkaartor/files/patch-src_Config.pri b/astro/merkaartor/files/patch-src_Config.pri deleted file mode 100644 index 3ba0292b5963..000000000000 --- a/astro/merkaartor/files/patch-src_Config.pri +++ /dev/null @@ -1,16 +0,0 @@ ---- 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_Docks_GeoImageDock.cpp b/astro/merkaartor/files/patch-src_Docks_GeoImageDock.cpp deleted file mode 100644 index 498ceed7afb0..000000000000 --- a/astro/merkaartor/files/patch-src_Docks_GeoImageDock.cpp +++ /dev/null @@ -1,38 +0,0 @@ ---- 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()); diff --git a/astro/merkaartor/files/patch-src_ImportExport_ImportOSM.cpp b/astro/merkaartor/files/patch-src_ImportExport_ImportOSM.cpp deleted file mode 100644 index 87fa2577c714..000000000000 --- a/astro/merkaartor/files/patch-src_ImportExport_ImportOSM.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 deleted file mode 100644 index 23a07477e7d8..000000000000 --- a/astro/merkaartor/files/patch-src_Sync_DirtyList.cpp +++ /dev/null @@ -1,128 +0,0 @@ ---- 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 deleted file mode 100644 index 27abc23d99d8..000000000000 --- a/astro/merkaartor/files/patch-src_Sync_DirtyListExecutorOSC.cpp +++ /dev/null @@ -1,74 +0,0 @@ ---- 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); diff --git a/astro/merkaartor/pkg-plist b/astro/merkaartor/pkg-plist index 956eb033475c..92db585773a0 100644 --- a/astro/merkaartor/pkg-plist +++ b/astro/merkaartor/pkg-plist @@ -1,46 +1,45 @@ bin/merkaartor lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.so lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so -lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so share/applications/org.merkaartor.merkaartor.desktop -share/icons/hicolor/22x22/apps/merkaartor.png -share/icons/hicolor/8x8/apps/merkaartor.png -share/icons/hicolor/64x64/apps/merkaartor.png +share/icons/hicolor/128x128/apps/merkaartor.png +share/icons/hicolor/16x16/apps/merkaartor.png share/icons/hicolor/192x192/apps/merkaartor.png -share/icons/hicolor/48x48/apps/merkaartor.png +share/icons/hicolor/22x22/apps/merkaartor.png +share/icons/hicolor/24x24/apps/merkaartor.png share/icons/hicolor/256x256/apps/merkaartor.png -share/icons/hicolor/42x42/apps/merkaartor.png +share/icons/hicolor/32x32/apps/merkaartor.png share/icons/hicolor/36x36/apps/merkaartor.png -share/icons/hicolor/24x24/apps/merkaartor.png +share/icons/hicolor/40x40/apps/merkaartor.png +share/icons/hicolor/42x42/apps/merkaartor.png +share/icons/hicolor/48x48/apps/merkaartor.png +share/icons/hicolor/512x512/apps/merkaartor.png +share/icons/hicolor/64x64/apps/merkaartor.png share/icons/hicolor/72x72/apps/merkaartor.png -share/icons/hicolor/32x32/apps/merkaartor.png -share/icons/hicolor/16x16/apps/merkaartor.png -share/icons/hicolor/96x96/apps/merkaartor.png share/icons/hicolor/80x80/apps/merkaartor.png -share/icons/hicolor/128x128/apps/merkaartor.png -share/icons/hicolor/512x512/apps/merkaartor.png -share/icons/hicolor/40x40/apps/merkaartor.png -share/metainfo/org.merkaartor.merkaartor.appdata.xml +share/icons/hicolor/8x8/apps/merkaartor.png +share/icons/hicolor/96x96/apps/merkaartor.png %%DATADIR%%/BookmarksList.xml %%DATADIR%%/Projections.xml %%DATADIR%%/TmsServersList.xml %%DATADIR%%/WmsServersList.xml %%NLS%%%%DATADIR%%/translations/merkaartor_cs.qm %%NLS%%%%DATADIR%%/translations/merkaartor_de.qm %%NLS%%%%DATADIR%%/translations/merkaartor_en.qm %%NLS%%%%DATADIR%%/translations/merkaartor_es.qm %%NLS%%%%DATADIR%%/translations/merkaartor_fi.qm %%NLS%%%%DATADIR%%/translations/merkaartor_fr.qm %%NLS%%%%DATADIR%%/translations/merkaartor_hr.qm %%NLS%%%%DATADIR%%/translations/merkaartor_hu.qm %%NLS%%%%DATADIR%%/translations/merkaartor_id_ID.qm %%NLS%%%%DATADIR%%/translations/merkaartor_it.qm %%NLS%%%%DATADIR%%/translations/merkaartor_ja.qm %%NLS%%%%DATADIR%%/translations/merkaartor_nl.qm %%NLS%%%%DATADIR%%/translations/merkaartor_pl.qm %%NLS%%%%DATADIR%%/translations/merkaartor_pt_BR.qm %%NLS%%%%DATADIR%%/translations/merkaartor_ru.qm %%NLS%%%%DATADIR%%/translations/merkaartor_sv.qm %%NLS%%%%DATADIR%%/translations/merkaartor_uk.qm %%NLS%%%%DATADIR%%/translations/merkaartor_zh_TW.qm +share/metainfo/org.merkaartor.merkaartor.appdata.xml