From acd610b56f77bc6cfc4e48a73786408b867c1118 Mon Sep 17 00:00:00 2001
From: David Spencer
Date: Sun, 5 Jun 2016 10:57:58 +0100
Subject: misc/merkaartor: Updated for version 0.18.2.

Signed-off-by: David Spencer <baildon.research@googlemail.com>
---
 misc/merkaartor/gcc47.patch           | 11 -----------
 misc/merkaartor/merkaartor.SlackBuild | 21 +++++++++------------
 misc/merkaartor/merkaartor.info       |  8 ++++----
 3 files changed, 13 insertions(+), 27 deletions(-)
 delete mode 100644 misc/merkaartor/gcc47.patch

diff --git a/misc/merkaartor/gcc47.patch b/misc/merkaartor/gcc47.patch
deleted file mode 100644
index a790fab781..0000000000
--- a/misc/merkaartor/gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur merkaartor-0.17.2.orig/3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp merkaartor-0.17.2/3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
---- merkaartor-0.17.2.orig/3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp	2011-02-10 13:00:35.000000000 +0100
-+++ merkaartor-0.17.2/3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp	2012-09-19 14:26:39.538277883 +0200
-@@ -57,6 +57,7 @@
- #endif
- #if defined(Q_OS_UNIX)
- #include <time.h>
-+#include <unistd.h>
- #endif
- 
- namespace QtLP_Private {
diff --git a/misc/merkaartor/merkaartor.SlackBuild b/misc/merkaartor/merkaartor.SlackBuild
index 6253e96f9c..21655c5d14 100644
--- a/misc/merkaartor/merkaartor.SlackBuild
+++ b/misc/merkaartor/merkaartor.SlackBuild
@@ -5,8 +5,8 @@
 # Written by otzy_007 (oz@oprod.net)
 
 PRGNAM=merkaartor
-VERSION=${VERSION:-0.17.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.18.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -42,23 +42,20 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Build fix for gcc-4.7.x
-patch -p1 < $CWD/gcc47.patch
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -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
 
 qmake \
     QMAKE_CFLAGS="$SLKCFLAGS" \
-    QMAKE_CXXFLAGS="$SLKCFLAGS -fpermissive" \
+    QMAKE_CXXFLAGS="$SLKCFLAGS" \
     NODEBUG=1 \
     PREFIX=/usr \
     DOCDIR=/usr/doc/$PRGNAM-$VERSION \
@@ -72,7 +69,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS CHANGELOG HACKING LICENSE LICENSE.rtf INSTALL \
+  AUTHORS CHANGELOG CREDITS HACKING INSTALL LICENSE LICENSE.rtf TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/misc/merkaartor/merkaartor.info b/misc/merkaartor/merkaartor.info
index 8172adc463..222414b326 100644
--- a/misc/merkaartor/merkaartor.info
+++ b/misc/merkaartor/merkaartor.info
@@ -1,10 +1,10 @@
 PRGNAM="merkaartor"
-VERSION="0.17.2"
+VERSION="0.18.2"
 HOMEPAGE="http://www.merkaartor.be"
-DOWNLOAD="http://merkaartor.be/attachments/download/253/merkaartor-0.17.2.tar.bz2"
-MD5SUM="44c49f73efa589a455bb9d3d0a284d09"
+DOWNLOAD="https://github.com/openstreetmap/merkaartor/archive/0.18.2/merkaartor-0.18.2.tar.gz"
+MD5SUM="20bbcc08ae0b36819a73f7754a44c5fe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="gdal"
 MAINTAINER="otzy_007"
 EMAIL="oz@oprod.net"
-- 
cgit v1.2.3