From b086277611780b54f1fedb97540616e6ff554e60 Mon Sep 17 00:00:00 2001
From: Daniel Stolarski <daniel.stolarski@gmail.com>
Date: Wed, 17 Jun 2020 14:31:42 +0700
Subject: gis/qmapshack: Updated for version 1.15.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 gis/qmapshack/QPainterPath.patch   | 22 ++++++++++++++++++++++
 gis/qmapshack/qmapshack.SlackBuild | 10 ++++++----
 gis/qmapshack/qmapshack.info       |  6 +++---
 3 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 gis/qmapshack/QPainterPath.patch

(limited to 'gis')

diff --git a/gis/qmapshack/QPainterPath.patch b/gis/qmapshack/QPainterPath.patch
new file mode 100644
index 0000000000..7290f76f09
--- /dev/null
+++ b/gis/qmapshack/QPainterPath.patch
@@ -0,0 +1,22 @@
+diff -Naur qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.h qmapshack-V_1.15.0_X/src/qmapshack/helpers/CDraw.h
+--- qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.h	2020-06-14 12:22:49.000000000 +0200
++++ qmapshack-V_1.15.0_X/src/qmapshack/helpers/CDraw.h	2020-06-14 20:55:16.675484111 +0200
+@@ -21,6 +21,7 @@
+ #define CPAINTER_H
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPolygonF>
+ #include <QRectF>
+ 
+diff -Naur qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.h qmapshack-V_1.15.0_X/src/qmaptool/helpers/CDraw.h
+--- qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.h	2020-06-14 12:22:49.000000000 +0200
++++ qmapshack-V_1.15.0_X/src/qmaptool/helpers/CDraw.h	2020-06-14 20:54:50.688816110 +0200
+@@ -21,6 +21,7 @@
+ #define CPAINTER_H
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPolygonF>
+ #include <QRectF>
+ 
diff --git a/gis/qmapshack/qmapshack.SlackBuild b/gis/qmapshack/qmapshack.SlackBuild
index e239b42f8a..c3f68f3c8e 100644
--- a/gis/qmapshack/qmapshack.SlackBuild
+++ b/gis/qmapshack/qmapshack.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for qmapshack
-# Copyright 2015 Daniel Stolarski <daniel.stolarski@gmail.com>
+# Copyright 2015-2020 Daniel Stolarski <daniel.stolarski@gmail.com>
 #
 # This program is free software. It comes without any warranty, to
 # the extent permitted by applicable law. You can redistribute it
@@ -10,7 +10,7 @@
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 
 PRGNAM=qmapshack
-VERSION=${VERSION:-1.14.1}
+VERSION=${VERSION:-1.15.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,10 +46,13 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-V_${VERSION}
 tar xvf $CWD/${PRGNAM}-${VERSION}.tar.gz
 cd ${PRGNAM}-V_${VERSION}
 
+# Fix missing header file
+patch -p1 < $CWD/QPainterPath.patch
+
 # Apply patches provided in the source tree
 patch -p1 < FindPROJ4.patch
 patch -p1 < FindQuaZip5.patch
@@ -65,7 +68,6 @@ find -L . \
 mkdir -p build
 cd build
   cmake \
-    -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/gis/qmapshack/qmapshack.info b/gis/qmapshack/qmapshack.info
index eb2f92663d..eef938a955 100644
--- a/gis/qmapshack/qmapshack.info
+++ b/gis/qmapshack/qmapshack.info
@@ -1,10 +1,10 @@
 PRGNAM="qmapshack"
-VERSION="1.14.1"
+VERSION="1.15.0"
 HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/Maproom/qmapshack/archive/V_1.14.1/qmapshack-1.14.1.tar.gz"
-MD5SUM_x86_64="5f8cff76565f49ea7fb8ef63a13ffc0b"
+DOWNLOAD_x86_64="https://github.com/Maproom/qmapshack/archive/V_1.15.0/qmapshack-1.15.0.tar.gz"
+MD5SUM_x86_64="c9f9dc0d2c317b8bf3d36bdff2b3e762"
 REQUIRES="gdal qt5-webkit routino quazip-qt5"
 MAINTAINER="Daniel Stolarski"
 EMAIL="daniel.stolarski@gmail.com"
-- 
cgit v1.2.3