Update to 0.18.2 and unmark BROKEN.

0.18.2 was released a while ago, and includes support for GDAL 2.0. Other
noteworthy changes:
- Set LICENSE_FILE.
- Use quazip from ports instead of building a bundled copy.
- Switch to using Qt5 instead of Qt4.

PR:		205675
Approved by:	Oliver Heesakkers <dev2@heesakkers.info> (maintainer)
MFH:		2015Q4

3 files changed, 70 insertions, 0 deletions

diff --git a/astro/merkaartor/files/patch-git_a6f3d9f2 b/astro/merkaartor/files/patch-git_a6f3d9f2
new file mode 100644
index 000000000000..77e396699414
--- /dev/null
+++ b/astro/merkaartor/files/patch-git_a6f3d9f2
@@ -0,0 +1,22 @@
+From a6f3d9f2133e3656b9c63441c600a7219b54450c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
+Date: Mon, 27 Jul 2015 11:01:52 +0200
+Subject: [PATCH] Fixed version info in tarballs.
+
+--- src/Config.pri.orig	2015-07-19 14:50:09 UTC
++++ src/Config.pri
+@@ -1,7 +1,12 @@
+ # see http://merkaartor.be/wiki/merkaartor/Compiling
+ 
+-REVISION = $$system(git describe --tags)
+-VERSION = $$system(git describe --tags | sed "'s/-g.*//;s/-/./g'")
++REVISION = $$system(git describe --tags 2> /dev/null)
++VERSION = $$system(git describe --tags 2> /dev/null | sed "'s/-g.*//;s/-/./g'")
++isEmpty( REVISION ) {
++	REVISION = $$system(head -n 1 ../CHANGELOG | sed "'s/^v//'")
++	VERSION = $$REVISION
++}
++
+ ARCH=""
+ BITS=""
+ win32 {
diff --git a/astro/merkaartor/files/patch-git_e6d015a9 b/astro/merkaartor/files/patch-git_e6d015a9
new file mode 100644
index 000000000000..36f389ea6c86
--- /dev/null
+++ b/astro/merkaartor/files/patch-git_e6d015a9
@@ -0,0 +1,36 @@
+commit e6d015a953a163f174e09a9b50c9bb8bc19593e4
+Author: Ladislav Láska <krakonos@krakonos.org>
+Date:   Mon Jul 27 14:22:37 2015 +0200
+
+    Fixed compilation issues with GEOIMAGE=1 and Qt5.
+
+--- src/Docks/GeoImageDock.cpp.orig	2015-07-19 14:50:09 UTC
++++ src/Docks/GeoImageDock.cpp
+@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringLis
+ 
+     Exiv2::Image::AutoPtr image;
+     Exiv2::ExifData exifData;
+-    bool positionValid = FALSE;
++    bool positionValid = false;
+ 
+     Layer *theLayer;
+     if (photoLayer == NULL) {
+@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(
+     double lat = 0.0, lon = 0.0;
+     Exiv2::Image::AutoPtr image;
+     Exiv2::ExifData exifData;
+-    bool positionValid = FALSE;
++    bool positionValid = false;
+ 
+     if (!QFile::exists(file)) {
+         return pos;
+--- src/Docks/GeoImageDock.h.orig	2015-07-19 14:50:09 UTC
++++ src/Docks/GeoImageDock.h
+@@ -9,6 +9,7 @@
+ #include <QtWidgets/QShortcut>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <QDrag>
+ 
+ class ImageView;
+ 
diff --git a/astro/merkaartor/files/patch-src_src.pro b/astro/merkaartor/files/patch-src_src.pro
new file mode 100644
index 000000000000..28afade9d899
--- /dev/null
+++ b/astro/merkaartor/files/patch-src_src.pro
@@ -0,0 +1,12 @@
+Link against the right library name for archivers/quazip-qt5.
+--- src/src.pro.orig	2015-12-28 22:27:47 UTC
++++ src/src.pro
+@@ -15,7 +15,7 @@ isEmpty(SYSTEM_QUAZIP) {
+   DEFINES += QUAZIP_STATIC
+   include(../3rdparty/quazip-0.7/quazip.pri)
+ } else {
+-  LIBS += -lquazip
++  LIBS += -lquazip5
+ }
+ 
+ #Qt Version