aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stolarski <daniel.stolarski@gmail.com>2019-07-20 09:27:39 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-07-20 09:27:39 +0700
commit9920a1ad6333236274a00fd4aa1c633c9e6911f0 (patch)
tree7f29caa20a621fb7278ebe5f8f29d2945f4adbc5
parent43caa708c074200f92c582822936a533e63d451f (diff)
gis/qmapshack: Fix build.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--gis/qmapshack/README2
-rw-r--r--gis/qmapshack/qmapshack.SlackBuild6
-rw-r--r--gis/qmapshack/qmapshack.info2
3 files changed, 4 insertions, 6 deletions
diff --git a/gis/qmapshack/README b/gis/qmapshack/README
index 873626e22de3b..3c20bb1593f4b 100644
--- a/gis/qmapshack/README
+++ b/gis/qmapshack/README
@@ -5,5 +5,3 @@ edit your GPX tracks.
QMapShack is the successor of QLandkarteGT.
Note: Linux 32bit versions is no longer supported.
-Note 2: Starting with qmapshack 1.13.0, proj needs to be rebuilt
-using cmake in order to be found during configuration.
diff --git a/gis/qmapshack/qmapshack.SlackBuild b/gis/qmapshack/qmapshack.SlackBuild
index 6c259396d844b..e4b7fc87cafcf 100644
--- a/gis/qmapshack/qmapshack.SlackBuild
+++ b/gis/qmapshack/qmapshack.SlackBuild
@@ -11,7 +11,7 @@
PRGNAM=qmapshack
VERSION=${VERSION:-1.13.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -56,8 +56,8 @@ 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 {} \;
-# QuaZip path issue. thx to pAcAs for the hint Obsolete with V. 1.13.0
-#whereis quazip |grep -qE "/include/\<quazip\>" && sed -i 's!quazip5!quazip!g' cmake/Modules/FindQuaZip.cmake
+# Qmapshack expects proj to provide package information files created by cmake, the proj version on slackbuilds.org, however, is built using autotools, thus the config script fails. Again, thx to pAcAs for the hint.
+cat $CWD/FindPROJ4.cmake > cmake/Modules/FindPROJ4.cmake
mkdir -p build
cd build
diff --git a/gis/qmapshack/qmapshack.info b/gis/qmapshack/qmapshack.info
index 68b8893f7516b..6f494d2bb4672 100644
--- a/gis/qmapshack/qmapshack.info
+++ b/gis/qmapshack/qmapshack.info
@@ -5,6 +5,6 @@ DOWNLOAD="UNSUPPORTED"
MD5SUM=""
DOWNLOAD_x86_64="https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.13.0.tar.gz"
MD5SUM_x86_64="68eacea307dd95562ca160a7c721da72"
-REQUIRES="gdal qt5-webkit routino quazip-qt5 %README%"
+REQUIRES="gdal qt5-webkit routino quazip-qt5"
MAINTAINER="Daniel Stolarski"
EMAIL="daniel.stolarski@gmail.com"