aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiancarlo Dessi <slack@giand.it>2023-12-24 18:44:26 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2023-12-24 19:03:31 +0700
commit62791a7772d63488d263114071138efe981fc254 (patch)
treec78ced84a1d442e2edf0a51ee00a86cd9997da47
parent0901df5be887236f4c4b1246db3536364600ffdf (diff)
gis/merkaartor: new maintainer.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--gis/merkaartor/README8
-rw-r--r--gis/merkaartor/merkaartor.SlackBuild25
-rw-r--r--gis/merkaartor/merkaartor.info4
3 files changed, 28 insertions, 9 deletions
diff --git a/gis/merkaartor/README b/gis/merkaartor/README
index 3d3f5f9df087e..a60e99767473a 100644
--- a/gis/merkaartor/README
+++ b/gis/merkaartor/README
@@ -2,3 +2,11 @@ Merkaartor is an openstreetmap mapping program.
Merkaartor focuses on providing a visually pleasing but
performant editing environment for free geographical data.
+
+gpsd is an optional dependency autodetected enabled by default
+if found in the system. You can disable the support by passing
+ GPSD=no ./merkaartor.SlackBuild
+
+The option -DWEBENGINE is set to ON by default. You can disable
+it by passing
+ WEBENGINE=no ./merkaartor.SlackBuild
diff --git a/gis/merkaartor/merkaartor.SlackBuild b/gis/merkaartor/merkaartor.SlackBuild
index 5902d47d731e1..123e5d7e75acc 100644
--- a/gis/merkaartor/merkaartor.SlackBuild
+++ b/gis/merkaartor/merkaartor.SlackBuild
@@ -1,9 +1,10 @@
#!/bin/bash
-# Slackware build script for Merkaartor
+# Slackware build script for merkaartor
# Written by otzy_007 (oz@oprod.net)
# Maintained 2020-2021 by Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Maintained 2023 by Giancarlo Dessi, Cagliari, IT
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -27,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=merkaartor
VERSION=${VERSION:-0.19.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -39,14 +40,19 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
fi
+if [ -x /etc/rc.d/rc.gpsd ] ; then
+ gpsd="-DGPSD=ON" ; [ "${GPSD:-yes}" = "no" ] && gpsd=""
+else
+ gpsd=""
+fi
+
+webengine="-DWEBENGINE=ON" ; [ "${WEBENGINE:-yes}" = "no" ] && webengine=""
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -80,14 +86,19 @@ 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 {} \;
+# fix build failure in current
+if [ -f /usr/lib${LIBDIRSUFFIX}/libexiv2.so.0.28* ] ; then
+ sed -i ./src/Docks/GeoImageDock.cpp -e "s/AutoPtr/UniquePtr/g"
+fi
+
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 \
+ $gpsd \
+ $webengine \
-DCMAKE_BUILD_TYPE=Release ..
make
make install/strip DESTDIR=$PKG
diff --git a/gis/merkaartor/merkaartor.info b/gis/merkaartor/merkaartor.info
index b535d7ef1bfbb..5e426ded214d1 100644
--- a/gis/merkaartor/merkaartor.info
+++ b/gis/merkaartor/merkaartor.info
@@ -6,5 +6,5 @@ MD5SUM="3696fde6c0521182e9e8c51563d68b94"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="gdal"
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
+MAINTAINER="Giancarlo Dessi"
+EMAIL="slack@giand.it"