From d6c86638a72edbb7f1ef1c57b0b4e25ed33b6741 Mon Sep 17 00:00:00 2001
From: Andrew Clemons <andrew.clemons@gmail.com>
Date: Sat, 19 Feb 2022 23:49:48 +1300
Subject: gis/qmapshack: Updated for version 1.16.1.

Fix build on 15.0.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 gis/qmapshack/QPainterPath.patch   |  22 ----------------------
 gis/qmapshack/proj.patch.gz        | Bin 0 -> 2343 bytes
 gis/qmapshack/qmapshack.SlackBuild |  16 ++++++----------
 gis/qmapshack/qmapshack.info       |   6 +++---
 4 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 gis/qmapshack/QPainterPath.patch
 create mode 100644 gis/qmapshack/proj.patch.gz

(limited to 'gis/qmapshack')

diff --git a/gis/qmapshack/QPainterPath.patch b/gis/qmapshack/QPainterPath.patch
deleted file mode 100644
index 7290f76f09c1..000000000000
--- a/gis/qmapshack/QPainterPath.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/proj.patch.gz b/gis/qmapshack/proj.patch.gz
new file mode 100644
index 000000000000..4d67d373faa5
Binary files /dev/null and b/gis/qmapshack/proj.patch.gz differ
diff --git a/gis/qmapshack/qmapshack.SlackBuild b/gis/qmapshack/qmapshack.SlackBuild
index 26d740c4e0f3..197c0d1b7776 100644
--- a/gis/qmapshack/qmapshack.SlackBuild
+++ b/gis/qmapshack/qmapshack.SlackBuild
@@ -12,7 +12,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=qmapshack
-VERSION=${VERSION:-1.15.2}
+VERSION=${VERSION:-1.16.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -57,16 +57,12 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-V_${VERSION}
-tar xvf $CWD/${PRGNAM}-${VERSION}.tar.gz
+tar xvf $CWD/${PRGNAM}-V_${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
-
+# cmake / autotools problem in proj package if proj switches to cmake in
+# future, cmake should be able to find proj here.
+# thanks debian maintainers
+zcat $CWD/proj.patch.gz | patch -p1
 chown -R root:root .
 
 find -L . \
diff --git a/gis/qmapshack/qmapshack.info b/gis/qmapshack/qmapshack.info
index 79b620b0a714..0dfb13a29d8a 100644
--- a/gis/qmapshack/qmapshack.info
+++ b/gis/qmapshack/qmapshack.info
@@ -1,10 +1,10 @@
 PRGNAM="qmapshack"
-VERSION="1.15.2"
+VERSION="1.16.1"
 HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/Maproom/qmapshack/archive/V_1.15.2/qmapshack-1.15.2.tar.gz"
-MD5SUM_x86_64="5fcf9e5d31fb0abe8d5ce442ba516b30"
+DOWNLOAD_x86_64="https://github.com/Maproom/qmapshack/archive/V_1.16.1/qmapshack-V_1.16.1.tar.gz"
+MD5SUM_x86_64="7520305c2309af093cf873130d599ee9"
 REQUIRES="gdal routino"
 MAINTAINER="Daniel Stolarski"
 EMAIL="daniel.stolarski@gmail.com"
-- 
cgit v1.2.3