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

[Balló György]

    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
===================================================================
--- PKGBUILD	2019-06-19 02:52:36 UTC (rev 482287)
+++ PKGBUILD	2019-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
 }