Date: Monday, July 6, 2020 @ 15:10:22 Author: bgyorgy Revision: 658027
upgpkg: merkaartor 0.18.4-3: Fix build with Qt 5.15 Added: merkaartor/trunk/0001-Add-AppStream-metadata.patch merkaartor/trunk/qt-5.15.patch Modified: merkaartor/trunk/PKGBUILD Deleted: merkaartor/trunk/merkaartor.appdata.xml -----------------------------------+ 0001-Add-AppStream-metadata.patch | 86 ++++++++++++++++++++++++++++++++++++ PKGBUILD | 26 +++++++--- merkaartor.appdata.xml | 43 ------------------ qt-5.15.patch | 26 ++++++++++ 4 files changed, 129 insertions(+), 52 deletions(-) Added: 0001-Add-AppStream-metadata.patch =================================================================== --- 0001-Add-AppStream-metadata.patch (rev 0) +++ 0001-Add-AppStream-metadata.patch 2020-07-06 15:10:22 UTC (rev 658027) @@ -0,0 +1,86 @@ +From ce84944113745eaafb26783d765f92551da9a712 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> +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>[email protected]</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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-07-06 15:09:53 UTC (rev 658026) +++ PKGBUILD 2020-07-06 15:10:22 UTC (rev 658027) @@ -6,25 +6,34 @@ pkgname=merkaartor pkgver=0.18.4 -pkgrel=2 +pkgrel=3 pkgdesc='OpenStreetMap editor' -arch=('x86_64') +arch=(x86_64) url='http://merkaartor.be/' -license=('GPL2') -depends=('exiv2' 'gdal' 'gpsd' 'hicolor-icon-theme' 'qt5-svg') -makedepends=('qt5-tools') -source=("$pkgname-$pkgver.tar.gz::https://github.com/openstreetmap/$pkgname/archive/$pkgver.tar.gz"; +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 - merkaartor.appdata.xml) + 0001-Add-AppStream-metadata.patch) sha256sums=('16e790507a5bb54e4b3c09ea063ebb095a4b014ce8ba937b771706d4c940976a' + 'e8466ebecbb9336ade8363b9badcf43d0c2b7f54d0fdad8b053c072aa3dce44e' '6a19357c21e895e48775d0017d953e1d3b53b2cb795861d08984da3a4788005d' - '9602378a7ee703653770a71062598e081d4d18d3cfb628e982a592f41b6fe33d') + '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() { @@ -37,5 +46,4 @@ package() { cd $pkgname-$pkgver make INSTALL_ROOT="$pkgdir" install - install -Dm644 ../merkaartor.appdata.xml "$pkgdir/usr/share/metainfo/merkaartor.appdata.xml" } Deleted: merkaartor.appdata.xml =================================================================== --- merkaartor.appdata.xml 2020-07-06 15:09:53 UTC (rev 658026) +++ merkaartor.appdata.xml 2020-07-06 15:10:22 UTC (rev 658027) @@ -1,43 +0,0 @@ -<?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>[email protected]</update_contact> - <translation type="qt">merkaartor</translation> -</component> Added: qt-5.15.patch =================================================================== --- qt-5.15.patch (rev 0) +++ qt-5.15.patch 2020-07-06 15:10:22 UTC (rev 658027) @@ -0,0 +1,26 @@ +From e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +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 <[email protected]> +--- + 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))
