[arch-commits] Commit in merkaartor/repos/community-x86_64 (5 files)
Balló György
bgyorgy at archlinux.org
Mon Mar 9 02:28:01 UTC 2020
Date: Monday, March 9, 2020 @ 02:28:01
Author: bgyorgy
Revision: 592734
archrelease: copy trunk to community-x86_64
Added:
merkaartor/repos/community-x86_64/PKGBUILD
(from rev 592733, merkaartor/trunk/PKGBUILD)
merkaartor/repos/community-x86_64/gpsd-3.20.patch
(from rev 592733, merkaartor/trunk/gpsd-3.20.patch)
merkaartor/repos/community-x86_64/merkaartor.appdata.xml
(from rev 592733, merkaartor/trunk/merkaartor.appdata.xml)
Deleted:
merkaartor/repos/community-x86_64/PKGBUILD
merkaartor/repos/community-x86_64/merkaartor.appdata.xml
------------------------+
PKGBUILD | 74 ++++++++++++++++++++++------------------
gpsd-3.20.patch | 52 ++++++++++++++++++++++++++++
merkaartor.appdata.xml | 86 +++++++++++++++++++++++------------------------
3 files changed, 136 insertions(+), 76 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-09 02:27:57 UTC (rev 592733)
+++ PKGBUILD 2020-03-09 02:28:01 UTC (rev 592734)
@@ -1,33 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Gaetan Bisson <bisson at 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=1
-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=("$pkgname-$pkgver.tar.gz::https://github.com/openstreetmap/$pkgname/archive/$pkgver.tar.gz"
- merkaartor.appdata.xml)
-sha256sums=('16e790507a5bb54e4b3c09ea063ebb095a4b014ce8ba937b771706d4c940976a'
- '9602378a7ee703653770a71062598e081d4d18d3cfb628e982a592f41b6fe33d')
-
-build() {
- cd $pkgname-$pkgver
- lrelease src/src.pro
- qmake Merkaartor.pro PREFIX=/usr GPSDLIB=1 GEOIMAGE=1 USEWEBENGINE=0 \
- QMAKE_CXXFLAGS="$CXXFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make INSTALL_ROOT="$pkgdir" install
- install -Dm644 ../merkaartor.appdata.xml "$pkgdir/usr/share/metainfo/merkaartor.appdata.xml"
-}
Copied: merkaartor/repos/community-x86_64/PKGBUILD (from rev 592733, merkaartor/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-09 02:28:01 UTC (rev 592734)
@@ -0,0 +1,41 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Gaetan Bisson <bisson at 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=2
+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=("$pkgname-$pkgver.tar.gz::https://github.com/openstreetmap/$pkgname/archive/$pkgver.tar.gz"
+ gpsd-3.20.patch
+ merkaartor.appdata.xml)
+sha256sums=('16e790507a5bb54e4b3c09ea063ebb095a4b014ce8ba937b771706d4c940976a'
+ '6a19357c21e895e48775d0017d953e1d3b53b2cb795861d08984da3a4788005d'
+ '9602378a7ee703653770a71062598e081d4d18d3cfb628e982a592f41b6fe33d')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # Fix build with gpsd 3.20
+ # https://github.com/openstreetmap/merkaartor/issues/204
+ patch -Np1 -i ../gpsd-3.20.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
+ install -Dm644 ../merkaartor.appdata.xml "$pkgdir/usr/share/metainfo/merkaartor.appdata.xml"
+}
Copied: merkaartor/repos/community-x86_64/gpsd-3.20.patch (from rev 592733, merkaartor/trunk/gpsd-3.20.patch)
===================================================================
--- gpsd-3.20.patch (rev 0)
+++ gpsd-3.20.patch 2020-03-09 02:28:01 UTC (rev 592734)
@@ -0,0 +1,52 @@
+From 13b358fa7899bb34e277b32a4c0d92833050f2c6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos at 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?= <krakonos at 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,
Deleted: merkaartor.appdata.xml
===================================================================
--- merkaartor.appdata.xml 2020-03-09 02:27:57 UTC (rev 592733)
+++ merkaartor.appdata.xml 2020-03-09 02:28:01 UTC (rev 592734)
@@ -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>merkaartor at openstreetmap.org</update_contact>
- <translation type="qt">merkaartor</translation>
-</component>
Copied: merkaartor/repos/community-x86_64/merkaartor.appdata.xml (from rev 592733, merkaartor/trunk/merkaartor.appdata.xml)
===================================================================
--- merkaartor.appdata.xml (rev 0)
+++ merkaartor.appdata.xml 2020-03-09 02:28:01 UTC (rev 592734)
@@ -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>merkaartor at openstreetmap.org</update_contact>
+ <translation type="qt">merkaartor</translation>
+</component>
More information about the arch-commits
mailing list