Date: Saturday, January 9, 2021 @ 10:26:34 Author: arojas Revision: 815335
archrelease: copy trunk to community-staging-x86_64 Added: merkaartor/repos/community-staging-x86_64/ merkaartor/repos/community-staging-x86_64/0001-Add-AppStream-metadata.patch (from rev 815334, merkaartor/trunk/0001-Add-AppStream-metadata.patch) merkaartor/repos/community-staging-x86_64/PKGBUILD (from rev 815334, merkaartor/trunk/PKGBUILD) merkaartor/repos/community-staging-x86_64/gpsd-3.20.patch (from rev 815334, merkaartor/trunk/gpsd-3.20.patch) merkaartor/repos/community-staging-x86_64/qt-5.15.patch (from rev 815334, merkaartor/trunk/qt-5.15.patch) -----------------------------------+ 0001-Add-AppStream-metadata.patch | 86 ++++++++++++++++++++++++++++++++++++ PKGBUILD | 49 ++++++++++++++++++++ gpsd-3.20.patch | 52 +++++++++++++++++++++ qt-5.15.patch | 26 ++++++++++ 4 files changed, 213 insertions(+) Copied: merkaartor/repos/community-staging-x86_64/0001-Add-AppStream-metadata.patch (from rev 815334, merkaartor/trunk/0001-Add-AppStream-metadata.patch) =================================================================== --- community-staging-x86_64/0001-Add-AppStream-metadata.patch (rev 0) +++ community-staging-x86_64/0001-Add-AppStream-metadata.patch 2021-01-09 10:26:34 UTC (rev 815335) @@ -0,0 +1,86 @@ +From ce84944113745eaafb26783d765f92551da9a712 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +Date: Mon, 6 Jul 2020 16:45:27 +0200 +Subject: [PATCH] Add AppStream metadata + +--- + src/org.merkaartor.merkaartor.appdata.xml | 43 +++++++++++++++++++++++ + src/src.pro | 5 ++- + 2 files changed, 47 insertions(+), 1 deletion(-) + create mode 100644 src/org.merkaartor.merkaartor.appdata.xml + +diff --git a/src/org.merkaartor.merkaartor.appdata.xml b/src/org.merkaartor.merkaartor.appdata.xml +new file mode 100644 +index 00000000..83e51f82 +--- /dev/null ++++ b/src/org.merkaartor.merkaartor.appdata.xml +@@ -0,0 +1,43 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<component type="desktop-application"> ++ <id>org.merkaartor.merkaartor</id> ++ <launchable type="desktop-id">org.merkaartor.merkaartor.desktop</launchable> ++ <name>Merkaartor</name> ++ <summary>OpenStreetMap editor</summary> ++ <metadata_license>CC0-1.0</metadata_license> ++ <project_license>GPL-2.0</project_license> ++ <description> ++ <p>Merkaartor is a map editor for OpenStreetMap.org, the free editable map of the whole world. Features:</p> ++ <ul> ++ <li>Download from and upload to the OpenStreetMap server</li> ++ <li>Open .osm and .gpx files</li> ++ <li>Create and move trackpoints, ways, and areas</li> ++ <li>Add tags, delete features</li> ++ <li>Reverse, split and join ways</li> ++ <li>Visualize some leisure/landuse areas and road types</li> ++ <li>Displaying GPS information</li> ++ </ul> ++ </description> ++ <screenshots> ++ <screenshot type="default"> ++ <caption>Merkaartor 0.15.3 with Mapnik style</caption> ++ <image>https://wiki.openstreetmap.org/w/images/0/04/Merkaartor_0.15.3.png</image> ++ </screenshot> ++ <screenshot> ++ <caption>Merkaartor 0.15.3 with Maxspeed style</caption> ++ <image>https://wiki.openstreetmap.org/w/images/b/b4/Merkaartor_0.15.3_maxspeed.png</image> ++ </screenshot> ++ <screenshot> ++ <caption>Merkaartor 0.15.3 showing the fully localized GUI</caption> ++ <image>https://wiki.openstreetmap.org/w/images/4/48/Merkaartor_0.15.3_i18n.png</image> ++ </screenshot> ++ <screenshot> ++ <caption>Merkaartor 0.15.3 with WMS background and semi-transparent map layer</caption> ++ <image>https://wiki.openstreetmap.org/w/images/c/c9/Merkaartor_0.15.3_wms.png</image> ++ </screenshot> ++ </screenshots> ++ <url type="bugtracker">https://github.com/openstreetmap/merkaartor/issues</url> ++ <url type="homepage">http://merkaartor.be/</url> ++ <update_contact>merkaar...@openstreetmap.org</update_contact> ++ <translation type="qt">merkaartor</translation> ++</component> +diff --git a/src/src.pro b/src/src.pro +index b5c3ba8d..090daddb 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -288,6 +288,8 @@ contains(SANITIZE, 2) { + } + + unix:!macx { ++ appdata.path = $${PREFIX}/share/metainfo ++ appdata.files = org.merkaartor.merkaartor.appdata.xml + desktop.path = $${PREFIX}/share/applications + desktop.files = org.merkaartor.merkaartor.desktop + desktopicon8x8.path = $${PREFIX}/share/icons/hicolor/8x8/apps/ +@@ -324,7 +326,8 @@ unix:!macx { + desktopicon256x256.files = $$PWD/../Icons/256x256/merkaartor.png + desktopicon512x512.path = $${PREFIX}/share/icons/hicolor/512x512/apps/ + desktopicon512x512.files = $$PWD/../Icons/512x512/merkaartor.png +- INSTALLS += desktop \ ++ INSTALLS += appdata \ ++ desktop \ + desktopicon8x8 \ + desktopicon16x16 \ + desktopicon22x22 \ +-- +2.27.0 + Copied: merkaartor/repos/community-staging-x86_64/PKGBUILD (from rev 815334, merkaartor/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2021-01-09 10:26:34 UTC (rev 815335) @@ -0,0 +1,49 @@ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Michael Kanis <mkanis gmx de> +# Contributor: Paulo Freire <paulofreire gmail com> +# Contributor: Brice Maron <brice bmaron net> + +pkgname=merkaartor +pkgver=0.18.4 +pkgrel=5 +pkgdesc='OpenStreetMap editor' +arch=(x86_64) +url='http://merkaartor.be/' +license=(GPL2) +depends=(exiv2 gdal gpsd hicolor-icon-theme qt5-svg) +makedepends=(qt5-tools) +source=("https://github.com/openstreetmap/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz" + qt-5.15.patch + gpsd-3.20.patch + 0001-Add-AppStream-metadata.patch) +sha256sums=('16e790507a5bb54e4b3c09ea063ebb095a4b014ce8ba937b771706d4c940976a' + 'e8466ebecbb9336ade8363b9badcf43d0c2b7f54d0fdad8b053c072aa3dce44e' + '6a19357c21e895e48775d0017d953e1d3b53b2cb795861d08984da3a4788005d' + 'f8e2a77c53a063349e48bc64a60a4ee22297020b2fa65ef0021b2a7105fa89e8') + +prepare() { + cd $pkgname-$pkgver + + # Fix build with gpsd 3.20 + # https://github.com/openstreetmap/merkaartor/issues/204 + patch -Np1 -i ../gpsd-3.20.patch + + # Fix build with Qt 5.15 + patch -Np1 -i ../qt-5.15.patch + + # Add AppStream metadata + patch -Np1 -i ../0001-Add-AppStream-metadata.patch +} + +build() { + cd $pkgname-$pkgver + lrelease src/src.pro + qmake Merkaartor.pro PREFIX=/usr GPSDLIB=1 GEOIMAGE=1 + make +} + +package() { + cd $pkgname-$pkgver + make INSTALL_ROOT="$pkgdir" install +} Copied: merkaartor/repos/community-staging-x86_64/gpsd-3.20.patch (from rev 815334, merkaartor/trunk/gpsd-3.20.patch) =================================================================== --- community-staging-x86_64/gpsd-3.20.patch (rev 0) +++ community-staging-x86_64/gpsd-3.20.patch 2021-01-09 10:26:34 UTC (rev 815335) @@ -0,0 +1,52 @@ +From 13b358fa7899bb34e277b32a4c0d92833050f2c6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krako...@krakonos.org> +Date: Tue, 14 Jan 2020 09:20:00 +0100 +Subject: [PATCH 1/2] Added a condition to use the new timespec_t on gpsd APIs + >= 9 + +--- + src/GPS/qgpsdevice.cpp | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/GPS/qgpsdevice.cpp b/src/GPS/qgpsdevice.cpp +index f8d1a0cf..cb727d2d 100644 +--- a/src/GPS/qgpsdevice.cpp ++++ b/src/GPS/qgpsdevice.cpp +@@ -1052,8 +1052,13 @@ void QGPSDDevice::onDataAvailable() + qreal Heading = gpsdata->fix.track; + if (!__isnan(Heading)) + setHeading(Heading); +- if (gpsdata->fix.time) +- cur_datetime = QDateTime::fromTime_t(gpsdata->fix.time); ++#if GPSD_API_MAJOR_VERSION >= 9 ++#define FIX_TIME fix.time.tv_sec ++#else ++#define FIX_TIME fix.time ++#endif ++ if (gpsdata->FIX_TIME) ++ cur_datetime = QDateTime::fromTime_t(gpsdata->FIX_TIME); + emit updatePosition(gpsdata->fix.latitude, + gpsdata->fix.longitude, + cur_datetime, + +From 1b76301ed7719f9ec137fd77f69b5702d8be94ab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krako...@krakonos.org> +Date: Tue, 14 Jan 2020 10:34:09 +0100 +Subject: [PATCH 2/2] Added undef to FIX_TIME after end of its scope. + +--- + src/GPS/qgpsdevice.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/GPS/qgpsdevice.cpp b/src/GPS/qgpsdevice.cpp +index cb727d2d..93605047 100644 +--- a/src/GPS/qgpsdevice.cpp ++++ b/src/GPS/qgpsdevice.cpp +@@ -1059,6 +1059,7 @@ void QGPSDDevice::onDataAvailable() + #endif + if (gpsdata->FIX_TIME) + cur_datetime = QDateTime::fromTime_t(gpsdata->FIX_TIME); ++#undef FIX_TIME + emit updatePosition(gpsdata->fix.latitude, + gpsdata->fix.longitude, + cur_datetime, Copied: merkaartor/repos/community-staging-x86_64/qt-5.15.patch (from rev 815334, merkaartor/trunk/qt-5.15.patch) =================================================================== --- community-staging-x86_64/qt-5.15.patch (rev 0) +++ community-staging-x86_64/qt-5.15.patch 2021-01-09 10:26:34 UTC (rev 815335) @@ -0,0 +1,26 @@ +From e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <ast...@gentoo.org> +Date: Sun, 14 Jun 2020 22:19:24 +0200 +Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include) + +Signed-off-by: Andreas Sturmlechner <ast...@gentoo.org> +--- + src/Features/Feature.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/Features/Feature.h b/src/Features/Feature.h +index 52fd3044..f466a5a9 100644 +--- a/src/Features/Feature.h ++++ b/src/Features/Feature.h +@@ -8,8 +8,10 @@ class Feature; + #include "MapView.h" + #include "FeaturePainter.h" + +-#include <QtCore/QString> + #include <QList> ++#include <QPainter> ++#include <QPainterPath> ++#include <QString> + + #define CAST_FEATURE(x) (dynamic_cast<Feature*>(x)) + #define CAST_NODE(x) (dynamic_cast<Node*>(x))