From cf3cb88b5b2c2df5f0ec5d4b263b4dfdebcb3fa1 Mon Sep 17 00:00:00 2001
From: "Gustavo B. Schenkel" <gustavo.schenkel@gmail.com>
Date: Sat, 28 Aug 2021 22:59:21 -0300
Subject: gis/merkaartor: Updated for version 0.19.0

Signed-off-by: Gustavo B. Schenkel <gustavo.schenkel@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 gis/merkaartor/merkaartor.SlackBuild | 30 ++++++++++++++++--------------
 gis/merkaartor/merkaartor.info       |  6 +++---
 2 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'gis/merkaartor')

diff --git a/gis/merkaartor/merkaartor.SlackBuild b/gis/merkaartor/merkaartor.SlackBuild
index 77a8b912e8..d435e8dd4e 100644
--- a/gis/merkaartor/merkaartor.SlackBuild
+++ b/gis/merkaartor/merkaartor.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=merkaartor
-VERSION=${VERSION:-0.18.4}
+VERSION=${VERSION:-0.19.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -80,19 +80,21 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make -C translations release
-
-sed -i '13i#include <QPainterPath>' src/Features/Feature.h
-qmake-qt5 \
-    QMAKE_CFLAGS="$SLKCFLAGS" \
-    QMAKE_CXXFLAGS="$SLKCFLAGS -std=c++11" \
-    NODEBUG=1 \
-    PREFIX=/usr \
-    DOCDIR=/usr/doc/$PRGNAM-$VERSION \
-    LIBDIR="/usr/lib${LIBDIRSUFFIX}"
-
-make
-make install INSTALL_ROOT=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/gis/merkaartor/merkaartor.info b/gis/merkaartor/merkaartor.info
index 9e410189cd..b535d7ef1b 100644
--- a/gis/merkaartor/merkaartor.info
+++ b/gis/merkaartor/merkaartor.info
@@ -1,8 +1,8 @@
 PRGNAM="merkaartor"
-VERSION="0.18.4"
+VERSION="0.19.0"
 HOMEPAGE="http://www.merkaartor.be"
-DOWNLOAD="https://github.com/openstreetmap/merkaartor/archive/0.18.4/merkaartor-0.18.4.tar.gz"
-MD5SUM="6669b697105d4e02202fa63d741580d0"
+DOWNLOAD="https://github.com/openstreetmap/merkaartor/archive/0.19.0/merkaartor-0.19.0.tar.gz"
+MD5SUM="3696fde6c0521182e9e8c51563d68b94"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gdal"
-- 
cgit v1.2.3-65-gdbad