[arch-commits] Commit in merkaartor/trunk (PKGBUILD)

2020-08-05 Thread Antonio Rojas via arch-commits 
Date: Wednesday, August 5, 2020 @ 12:39:39
  Author: arojas
Revision: 669417

gpsd 3.21 rebuild

Modified:
  merkaartor/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-05 12:28:49 UTC (rev 669416)
+++ PKGBUILD2020-08-05 12:39:39 UTC (rev 669417)
@@ -6,7 +6,7 @@
 
 pkgname=merkaartor
 pkgver=0.18.4
-pkgrel=3
+pkgrel=4
 pkgdesc='OpenStreetMap editor'
 arch=(x86_64)
 url='http://merkaartor.be/'

[arch-commits] Commit in merkaartor/trunk (PKGBUILD gpsd-3.20.patch)

2020-03-08 Thread Balló György via arch-commits 
Date: Monday, March 9, 2020 @ 02:27:57
  Author: bgyorgy
Revision: 592733

upgpkg: merkaartor 0.18.4-2: Fix build with gpsd 3.20

Added:
  merkaartor/trunk/gpsd-3.20.patch
Modified:
  merkaartor/trunk/PKGBUILD

-+
 PKGBUILD|   14 +++---
 gpsd-3.20.patch |   52 
 2 files changed, 63 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-09 02:13:00 UTC (rev 592732)
+++ PKGBUILD2020-03-09 02:27:57 UTC (rev 592733)
@@ -6,7 +6,7 @@
 
 pkgname=merkaartor
 pkgver=0.18.4
-pkgrel=1
+pkgrel=2
 pkgdesc='OpenStreetMap editor'
 arch=('x86_64')
 url='http://merkaartor.be/'
@@ -14,15 +14,23 @@
 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 USEWEBENGINE=0 \
-QMAKE_CXXFLAGS="$CXXFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
+  qmake Merkaartor.pro PREFIX=/usr GPSDLIB=1 GEOIMAGE=1
   make
 }
 

Added: gpsd-3.20.patch
===
--- gpsd-3.20.patch (rev 0)
+++ gpsd-3.20.patch 2020-03-09 02:27:57 UTC (rev 592733)
@@ -0,0 +1,52 @@
+From 13b358fa7899bb34e277b32a4c0d92833050f2c6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= 
+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?= 
+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,

[arch-commits] Commit in merkaartor/trunk (PKGBUILD)

2019-07-20 Thread Antonio Rojas via arch-commits 
Date: Saturday, July 20, 2019 @ 08:33:16
  Author: arojas
Revision: 492248

gpsd 3.19 rebuild

Modified:
  merkaartor/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-20 08:29:41 UTC (rev 492247)
+++ PKGBUILD2019-07-20 08:33:16 UTC (rev 492248)
@@ -6,7 +6,7 @@
 
 pkgname=merkaartor
 pkgver=0.18.3
-pkgrel=8
+pkgrel=9
 pkgdesc='OpenStreetMap editor'
 arch=('x86_64')
 url='http://merkaartor.be/'

[arch-commits] Commit in merkaartor/trunk (PKGBUILD)

2019-06-18 Thread Balló György via arch-commits 
Date: Wednesday, June 19, 2019 @ 03:01:22
  Author: bgyorgy
Revision: 482288

upgpkg: merkaartor 0.18.3-8

Rebuild for gdal 3.0.0

Modified:
  merkaartor/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-19 02:52:36 UTC (rev 482287)
+++ PKGBUILD2019-06-19 03:01:22 UTC (rev 482288)
@@ -6,7 +6,7 @@
 
 pkgname=merkaartor
 pkgver=0.18.3
-pkgrel=7
+pkgrel=8
 pkgdesc='OpenStreetMap editor'
 arch=('x86_64')
 url='http://merkaartor.be/'
@@ -26,12 +26,14 @@
   cd $pkgname-$pkgver
   patch -Np1 -i ../nowebkit.patch
   patch -p1 -i ../merkaartor-exiv2-0.27.1.patch # Fix build with exiv2 0.27.1
+  sed -i 's/GDAL_VERSION_MAJOR == 2/GDAL_VERSION_MAJOR == 3/' 
src/ImportExport/ImportExportGdal.h # Fix build with gdal 3.0.0
 }
 
 build() {
   cd $pkgname-$pkgver
   lrelease src/src.pro
-  qmake Merkaartor.pro PREFIX=/usr GPSDLIB=1 GEOIMAGE=1 USEWEBENGINE=0
+  qmake Merkaartor.pro PREFIX=/usr GPSDLIB=1 GEOIMAGE=1 USEWEBENGINE=0 \
+QMAKE_CXXFLAGS="$CXXFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
   make
 }

[arch-commits] Commit in merkaartor/trunk (PKGBUILD)

2019-05-18 Thread Evangelos Foutras via arch-commits 
Date: Saturday, May 18, 2019 @ 09:22:03
  Author: foutrelis
Revision: 467850

exiv2 0.27 rebuild

Modified:
  merkaartor/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-18 09:20:34 UTC (rev 467849)
+++ PKGBUILD2019-05-18 09:22:03 UTC (rev 467850)
@@ -6,7 +6,7 @@
 
 pkgname=merkaartor
 pkgver=0.18.3
-pkgrel=6
+pkgrel=7
 pkgdesc='OpenStreetMap editor'
 arch=('x86_64')
 url='http://merkaartor.be/'

[arch-commits] Commit in merkaartor/trunk (PKGBUILD merkaartor-exiv2-0.27.1.patch)

2019-05-18 Thread Antonio Rojas via arch-commits 
Date: Saturday, May 18, 2019 @ 09:20:34
  Author: arojas
Revision: 467849

Fix build with exiv2 0.27.1

Added:
  merkaartor/trunk/merkaartor-exiv2-0.27.1.patch
Modified:
  merkaartor/trunk/PKGBUILD

---+
 PKGBUILD  |7 +--
 merkaartor-exiv2-0.27.1.patch |   12 
 2 files changed, 17 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-18 09:14:57 UTC (rev 467848)
+++ PKGBUILD2019-05-18 09:20:34 UTC (rev 467849)
@@ -15,14 +15,17 @@
 makedepends=('qt5-tools')
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/openstreetmap/$pkgname/archive/$pkgver.tar.gz";
 merkaartor.appdata.xml
-nowebkit.patch)
+nowebkit.patch
+merkaartor-exiv2-0.27.1.patch)
 sha256sums=('d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947'
 '4082cae211a5480501abb95c302608c45363cc3152a70746a3f41f57c4252df6'
-'f976a3bb6bcd0f0ef8723dcc8597f5ae9789c93143e7ef47f24f43c67913129b')
+'f976a3bb6bcd0f0ef8723dcc8597f5ae9789c93143e7ef47f24f43c67913129b'
+'4627728ba02a35fc678c05e801e2499f069f4273af8dbb246040e5dc6f61d487')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../nowebkit.patch
+  patch -p1 -i ../merkaartor-exiv2-0.27.1.patch # Fix build with exiv2 0.27.1
 }
 
 build() {

Added: merkaartor-exiv2-0.27.1.patch
===
--- merkaartor-exiv2-0.27.1.patch   (rev 0)
+++ merkaartor-exiv2-0.27.1.patch   2019-05-18 09:20:34 UTC (rev 467849)
@@ -0,0 +1,12 @@
+--- merkaartor-0.18.3/src/Docks/GeoImageDock.h.orig2019-05-18 
09:17:08.759836141 +
 merkaartor-0.18.3/src/Docks/GeoImageDock.h 2019-05-18 09:17:23.353374620 
+
+@@ -7,8 +7,7 @@
+ #include 
+ #include 
+ #include 
+-#include 
+-#include 
++#include 
+ #include 
+ 
+ class ImageView;

[arch-commits] Commit in merkaartor/trunk (PKGBUILD)

2018-10-11 Thread Antonio Rojas via arch-commits 
Date: Thursday, October 11, 2018 @ 11:08:48
  Author: arojas
Revision: 392407

gpsd 3.18 rebuild

Modified:
  merkaartor/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-11 11:07:58 UTC (rev 392406)
+++ PKGBUILD2018-10-11 11:08:48 UTC (rev 392407)
@@ -6,7 +6,7 @@
 
 pkgname=merkaartor
 pkgver=0.18.3
-pkgrel=4
+pkgrel=5
 pkgdesc='OpenStreetMap editor'
 arch=('x86_64')
 url='http://merkaartor.be/'

[arch-commits] Commit in merkaartor/trunk (PKGBUILD)

2018-09-12 Thread Antonio Rojas via arch-commits 
Date: Wednesday, September 12, 2018 @ 20:55:11
  Author: arojas
Revision: 379984

gpsd 3.17 rebuild

Modified:
  merkaartor/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-12 20:51:43 UTC (rev 379983)
+++ PKGBUILD2018-09-12 20:55:11 UTC (rev 379984)
@@ -6,7 +6,7 @@
 
 pkgname=merkaartor
 pkgver=0.18.3
-pkgrel=3
+pkgrel=4
 pkgdesc='OpenStreetMap editor'
 arch=('x86_64')
 url='http://merkaartor.be/'

[arch-commits] Commit in merkaartor/trunk (PKGBUILD)

2018-05-19 Thread Jelle van der Waa via arch-commits 
Date: Saturday, May 19, 2018 @ 15:08:26
  Author: jelle
Revision: 324654

upgpkg: merkaartor 0.18.3-3

proj 5.0.1 rebuild

Modified:
  merkaartor/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-19 15:08:24 UTC (rev 324653)
+++ PKGBUILD2018-05-19 15:08:26 UTC (rev 324654)
@@ -7,7 +7,7 @@
 
 pkgname=merkaartor
 pkgver=0.18.3
-pkgrel=2
+pkgrel=3
 pkgdesc='OpenStreetMap editor'
 arch=('x86_64')
 url='http://merkaartor.be/'

[arch-commits] Commit in merkaartor/trunk (PKGBUILD)

2017-07-15 Thread Balló György 
Date: Saturday, July 15, 2017 @ 22:09:35
  Author: bgyorgy
Revision: 245269

upgpkg: merkaartor 0.18.3-2

exiv2 0.26 rebuild

Modified:
  merkaartor/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-15 22:08:38 UTC (rev 245268)
+++ PKGBUILD2017-07-15 22:09:35 UTC (rev 245269)
@@ -7,7 +7,7 @@
 
 pkgname=merkaartor
 pkgver=0.18.3
-pkgrel=1
+pkgrel=2
 pkgdesc='OpenStreetMap editor'
 arch=('i686' 'x86_64')
 url='http://merkaartor.be/'

[arch-commits] Commit in merkaartor/trunk (PKGBUILD)

2016-10-06 Thread Balló György 
Date: Thursday, October 6, 2016 @ 17:16:28
  Author: bgyorgy
Revision: 191504

upgpkg: merkaartor 0.18.3-1

Update to new version

Modified:
  merkaartor/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-06 16:54:34 UTC (rev 191503)
+++ PKGBUILD2016-10-06 17:16:28 UTC (rev 191504)
@@ -6,9 +6,8 @@
 # Contributor: Brice Maron 
 
 pkgname=merkaartor
-pkgver=0.18.2
-_pkgver=0.18.3-rc1
-pkgrel=2
+pkgver=0.18.3
+pkgrel=1
 pkgdesc='OpenStreetMap editor'
 arch=('i686' 'x86_64')
 url='http://merkaartor.be/'
@@ -15,11 +14,11 @@
 license=('GPL2')
 depends=('exiv2' 'gdal' 'gpsd' 'hicolor-icon-theme' 'qt5-svg' 'qt5-webkit')
 makedepends=('qt5-tools')
-source=("$pkgname-$_pkgver.tar.gz::https://github.com/openstreetmap/$pkgname/archive/$_pkgver.tar.gz";)
-sha256sums=('57492ed2459d4d2dd25282562daf550d480be6351b35887d56e9b51909ce2014')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/openstreetmap/$pkgname/archive/$pkgver.tar.gz";)
+sha256sums=('d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947')
 
 build() {
-  cd $pkgname-$_pkgver
+  cd $pkgname-$pkgver
   lrelease src/src.pro
   qmake Merkaartor.pro PREFIX=/usr GPSDLIB=1 GEOIMAGE=1
   make
@@ -26,6 +25,6 @@
 }
 
 package() {
-  cd $pkgname-$_pkgver
+  cd $pkgname-$pkgver
   make INSTALL_ROOT="$pkgdir" install
 }