x11/merkaartor: version 0.18.2

11 files changed, 69 insertions, 264 deletions

diff --git a/x11/merkaartor/0001-fix-path-to-include-file.patch b/x11/merkaartor/0001-fix-path-to-include-file.patch
new file mode 100644
index 0000000000..2a12289f82
--- /dev/null
+++ b/x11/merkaartor/0001-fix-path-to-include-file.patch
@@ -0,0 +1,53 @@
+From 3c55ed3e490802d4d5e957c1e934435c3d84a425 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran@hawo.net>
+Date: Sun, 19 Jul 2015 17:15:16 +0200
+Subject: [PATCH] fix path to include file
+
+---
+ src/Docks/GeoImageDock.cpp | 12 ++++++------
+ src/Docks/GeoImageDock.h   |  4 ++--
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp
+index c05d09f..6afbfa8 100644
+--- a/src/Docks/GeoImageDock.cpp
++++ b/src/Docks/GeoImageDock.cpp
+@@ -12,13 +12,13 @@
+ #include <zbar/QZBarImage.h>
+ #endif
+ 
+-#include <QtWidgets/QInputDialog>
+-#include <QtWidgets/QMessageBox>
+-#include <QtWidgets/QProgressDialog>
++#include <QtGui/QInputDialog>
++#include <QtGui/QMessageBox>
++#include <QtGui/QProgressDialog>
+ #include <QtGui/QClipboard>
+-#include <QtWidgets/QRadioButton>
+-#include <QtWidgets/QTimeEdit>
+-#include <QtWidgets/QDialogButtonBox>
++#include <QtGui/QRadioButton>
++#include <QtGui/QTimeEdit>
++#include <QtGui/QDialogButtonBox>
+ #include <QFileDialog>
+ 
+ #include <QNetworkAccessManager>
+diff --git a/src/Docks/GeoImageDock.h b/src/Docks/GeoImageDock.h
+index ab7bbf6..a2606b0 100644
+--- a/src/Docks/GeoImageDock.h
++++ b/src/Docks/GeoImageDock.h
+@@ -4,9 +4,9 @@
+ #include "Document.h"
+ 
+ #include <QtGui/QPainter>
+-#include <QtWidgets/QDockWidget>
++#include <QtGui/QDockWidget>
+ #include <QtGui/QMouseEvent>
+-#include <QtWidgets/QShortcut>
++#include <QtGui/QShortcut>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
+ 
+-- 
+2.4.1
+
diff --git a/x11/merkaartor/0002-FIX-Assert-width-0-with-wireframe-with-style.patch b/x11/merkaartor/0002-FIX-Assert-width-0-with-wireframe-with-style.patch
deleted file mode 100644
index 8873e2e811..0000000000
--- a/x11/merkaartor/0002-FIX-Assert-width-0-with-wireframe-with-style.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9059922e1b75c32ac78cc66e10387063790bfa91 Mon Sep 17 00:00:00 2001
-From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
-Date: Fri, 15 Jun 2012 11:11:17 +0200
-Subject: [PATCH 2/8] FIX : Assert "width > 0" with wireframe with style
-
----
- src/Features/Way.cpp | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/Features/Way.cpp b/src/Features/Way.cpp
-index fdbf722..7eea383 100644
---- a/src/Features/Way.cpp
-+++ b/src/Features/Way.cpp
-@@ -382,9 +382,8 @@ void Way::drawSimple(QPainter &P, MapView *theView)
-                 thePen = QPen(thePainter->BackgroundColor,thePainter->BackgroundOffset);
-             else
-                 thePen = QPen(p->SimpleColor,(qreal)p->SimpleWidth/LANEWIDTH);
--        } else
--            if (thePainter->DrawForeground)
--                thePen = QPen(thePainter->ForegroundColor,thePainter->ForegroundOffset);
-+        } else if (thePainter->DrawForeground)
-+                thePen = QPen(thePainter->ForegroundColor,thePainter->ForegroundOffset >= 1 ? thePainter->ForegroundOffset : (qreal)p->SimpleWidth/LANEWIDTH);
-             else
-                 thePen = QPen(p->SimpleColor,(qreal)p->SimpleWidth/LANEWIDTH);
-     }
--- 
-1.8.4.2
-
diff --git a/x11/merkaartor/0003-FIX-secondary-road-simple-color.patch b/x11/merkaartor/0003-FIX-secondary-road-simple-color.patch
deleted file mode 100644
index db878b5c2c..0000000000
--- a/x11/merkaartor/0003-FIX-secondary-road-simple-color.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6aa2974e6aba87154fa1b47935074b6b18eb431b Mon Sep 17 00:00:00 2001
-From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
-Date: Fri, 15 Jun 2012 11:24:23 +0200
-Subject: [PATCH 3/8] FIX : secondary road simple color
-
----
- src/Features/Way.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Features/Way.cpp b/src/Features/Way.cpp
-index 7eea383..ece774b 100644
---- a/src/Features/Way.cpp
-+++ b/src/Features/Way.cpp
-@@ -93,7 +93,7 @@ void WayPrivate::CalculateWidth()
-         SimpleColor = QColor(228, 109, 113);
-     } else if (h == "secondary") {
-         SimpleWidth =  2*LANEWIDTH; // 2 lanes
--        SimpleColor = QColor(253, 191, 252);
-+        SimpleColor = QColor(253, 191, 111);
-     } else if (h == "tertiary") {
-         SimpleWidth =  1.5*LANEWIDTH; // shared middle lane
-         SimpleColor = QColor(255, 229, 33);
--- 
-1.8.4.2
-
diff --git a/x11/merkaartor/0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch b/x11/merkaartor/0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch
deleted file mode 100644
index 99aae1c71b..0000000000
--- a/x11/merkaartor/0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 00fd8331de434ca4f567a81559ddd934113ebf84 Mon Sep 17 00:00:00 2001
-From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
-Date: Fri, 29 Jun 2012 12:42:27 +0200
-Subject: [PATCH 4/8] FIX : libgps20 build fix (from Dirk Stocker)
-
----
- src/GPS/qgpsdevice.cpp | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/src/GPS/qgpsdevice.cpp b/src/GPS/qgpsdevice.cpp
-index de6b220..59d11a1 100644
---- a/src/GPS/qgpsdevice.cpp
-+++ b/src/GPS/qgpsdevice.cpp
-@@ -958,27 +958,33 @@ void QGPSDDevice::run()
-     connect(this,SIGNAL(doStopDevice()),&Forward,SLOT(onStop()));
- //    exec();
-     QEventLoop l;
--
-+#if GPSD_API_MAJOR_VERSION < 5
-     Server = new gpsmm();
-     errno = 0;
-     gpsdata = Server->open(M_PREFS->getGpsdHost().toAscii().data(),QString::number(M_PREFS->getGpsdPort()).toAscii().data());
-     if (!gpsdata) {
--#ifndef Q_OS_WIN32
-+  #ifndef Q_OS_WIN32
-         QString msg( (errno<0) ? gps_errstr(errno) : strerror(errno) );
--#else
-+  #else
-         QString msg( (errno<0) ? "" : strerror(errno) );
--#endif
-+  #endif
-         qDebug() << tr("Unable to connect to %1:%2").arg(M_PREFS->getGpsdHost()).arg(QString::number(M_PREFS->getGpsdPort()))
-                  << ": " << msg;
-         return;
-     }
--
-+#else
-+    Server = new gpsmm(M_PREFS->getGpsdHost().toAscii().data(),QString::number(M_PREFS->getGpsdPort()).toAscii().data());
-+#endif
-     onLinkReady();
-     l.processEvents();
- 
-     forever {
- #if GPSD_API_MAJOR_VERSION > 3
-+#if GPSD_API_MAJOR_VERSION < 5
-         if (Server->waiting())
-+#else
-+        if (Server->waiting(0))
-+#endif
- #endif
-             onDataAvailable();
-         l.processEvents();
-@@ -994,16 +1000,12 @@ void QGPSDDevice::onDataAvailable()
-        if (!gpsdata)
-            return;
-     #else
--       if ( Server->waiting() )
-+       gpsdata = Server->read();
-+       if (!gpsdata)
-            {
--           errno = 0;
--           gpsdata = Server->read();
--           if ( gpsdata == 0 )
--               {
--               QString msg( (errno==0) ? "socket to gpsd was closed" : strerror(errno) );
--               qDebug() << "gpsmm::read() failed: " << msg;
--               return;
--               }
-+           QString msg( (errno==0) ? "socket to gpsd was closed" : strerror(errno) );
-+           qDebug() << "gpsmm::read() failed: " << msg;
-+           return;
-            }
-     #endif
- 
--- 
-1.8.4.2
-
diff --git a/x11/merkaartor/0005-FIX-openSUSE-build.patch b/x11/merkaartor/0005-FIX-openSUSE-build.patch
deleted file mode 100644
index dcdf111572..0000000000
--- a/x11/merkaartor/0005-FIX-openSUSE-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 499458a5b520d8e6951e4f283a93f57c2bb3a106 Mon Sep 17 00:00:00 2001
-From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
-Date: Fri, 29 Jun 2012 12:47:51 +0200
-Subject: [PATCH 5/8] FIX : openSUSE build
-
----
- src/Backend/SpatialiteBackend.cpp | 1 +
- src/Backend/SpatialiteBackend.h   | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/Backend/SpatialiteBackend.cpp b/src/Backend/SpatialiteBackend.cpp
-index a0ac244..85d8257 100644
---- a/src/Backend/SpatialiteBackend.cpp
-+++ b/src/Backend/SpatialiteBackend.cpp
-@@ -266,6 +266,7 @@ void SpatialiteBackend::getFeatureSet(QMap<RenderPriority, QSet<Feature *> > &th
- 
- const QList<Feature *> & SpatialiteBackend::indexFind(const QRectF &vp)
- {
-+    return findResult;
- }
- 
- void SpatialiteBackend::get(const QRectF &bb, QList<Feature *> &theFeatures)
-diff --git a/src/Backend/SpatialiteBackend.h b/src/Backend/SpatialiteBackend.h
-index 55b0f63..1b120bc 100644
---- a/src/Backend/SpatialiteBackend.h
-+++ b/src/Backend/SpatialiteBackend.h
-@@ -74,6 +74,7 @@ public slots:
- protected:
-     bool isTemp;
-     QString theFilename;
-+    QList<Feature*> findResult;
- };
- 
- #endif // SPATIALITEBACKEND_H
--- 
-1.8.4.2
-
diff --git a/x11/merkaartor/0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch b/x11/merkaartor/0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch
deleted file mode 100644
index e86e0b00d7..0000000000
--- a/x11/merkaartor/0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 950109c2fe443b3b60c8e98a0be7914be4301d5d Mon Sep 17 00:00:00 2001
-From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
-Date: Fri, 29 Jun 2012 13:24:27 +0200
-Subject: [PATCH 6/8] FIX : French cadastre parsing issue (fixes #3334)
-
----
- .../background/MCadastreFranceBackground/qadastre/cadastrewrapper.cpp  | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/background/MCadastreFranceBackground/qadastre/cadastrewrapper.cpp b/plugins/background/MCadastreFranceBackground/qadastre/cadastrewrapper.cpp
-index 6abcab6..30e87e2 100644
---- a/plugins/background/MCadastreFranceBackground/qadastre/cadastrewrapper.cpp
-+++ b/plugins/background/MCadastreFranceBackground/qadastre/cadastrewrapper.cpp
-@@ -219,6 +219,7 @@ void CadastreWrapper::networkFinished(QNetworkReply *reply)
-         m_gotCookie = true;
-     } else if (reply->url() == QUrl("http://www.cadastre.gouv.fr/scpc/rechercherPlan.do")) {
-         QString pageData = reply->readAll();
-+        qDebug() << pageData;
-         QWebPage parsedPage(this);
-         QWebFrame *frame = parsedPage.mainFrame();
-         frame->setHtml(pageData);
-@@ -238,7 +239,7 @@ void CadastreWrapper::networkFinished(QNetworkReply *reply)
-         } else {
-             // We may have been successfull, who knows ?
-             QString name = frame->findFirstElement("#ville").attribute("value");
--            QWebElementCollection links = frame->findAllElements(".resultat > .parcelles .view a");
-+            QWebElementCollection links = frame->findAllElements(".resultat > .parcelles a");
-             QRegExp linkRE("c=(\\w+)");
-             foreach (QWebElement link, links) {
-                 QString js = link.attribute("onclick");
--- 
-1.8.4.2
-
diff --git a/x11/merkaartor/0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch b/x11/merkaartor/0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch
deleted file mode 100644
index 676d1728df..0000000000
--- a/x11/merkaartor/0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a95b212a29d3a4d624e5d14a90605a3dd4c9e476 Mon Sep 17 00:00:00 2001
-From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
-Date: Fri, 29 Jun 2012 14:01:48 +0200
-Subject: [PATCH 7/8] FIX : Virtual nodes not highlighted on hover (fixes
- #3333)
-
----
- src/Interactions/Interaction.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/Interactions/Interaction.cpp b/src/Interactions/Interaction.cpp
-index 8d02324..0560f88 100644
---- a/src/Interactions/Interaction.cpp
-+++ b/src/Interactions/Interaction.cpp
-@@ -347,8 +347,7 @@ void FeatureSnapInteraction::paintEvent(QPaintEvent* anEvent, QPainter& thePaint
-         theMain->properties()->highlighted(i)->drawHighlight(thePainter, view());
-     }
- 
--    //FIXME document()->exists necessary?
--    if (LastSnap && document()->exists(LastSnap)) {
-+    if (LastSnap) {
-         LastSnap->drawHover(thePainter, view());
-         view()->setToolTip(LastSnap->toHtml());
-     } else {
--- 
-1.8.4.2
-
diff --git a/x11/merkaartor/0008-FIX-GDAL-crash.patch b/x11/merkaartor/0008-FIX-GDAL-crash.patch
deleted file mode 100644
index ca1016c160..0000000000
--- a/x11/merkaartor/0008-FIX-GDAL-crash.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2d51cab30924999634a43b78e954d1745d5dcd28 Mon Sep 17 00:00:00 2001
-From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
-Date: Thu, 25 Apr 2013 20:10:27 +0200
-Subject: [PATCH 8/8] FIX: GDAL crash
-
----
- src/ImportExport/ImportExportGdal.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/ImportExport/ImportExportGdal.cpp b/src/ImportExport/ImportExportGdal.cpp
-index 7c829f4..2005d25 100644
---- a/src/ImportExport/ImportExportGdal.cpp
-+++ b/src/ImportExport/ImportExportGdal.cpp
-@@ -331,7 +331,8 @@ bool ImportExportGdal::importGDALDataset(OGRDataSource* poDS, Layer* aLayer, boo
-         }
-     }
- 
--    theSrs->Release();
-+    if (theSrs)
-+        theSrs->Release();
-     theSrs = new OGRSpatialReference();
-     theSrs->importFromProj4(sPrj.toLatin1().data());
-     toWGS84 = OGRCreateCoordinateTransformation(theSrs, &wgs84srs);
--- 
-1.8.4.2
-
diff --git a/x11/merkaartor/DETAILS b/x11/merkaartor/DETAILS
index 5303361ad5..6b2149c2b5 100755
--- a/x11/merkaartor/DETAILS
+++ b/x11/merkaartor/DETAILS
@@ -1,9 +1,8 @@
            SPELL=merkaartor
-         VERSION=0.18.1
-    REDMINE_HASH=301
-     SOURCE_HASH=sha512:d45b25ad5a7f19b32ca3e91ad514ef1a8450024bdab9e8c215f60a5ec3fc6332a5cadfcec586a32805c7727d224588b504b01d3023120d55476660a8a394cd45
+         VERSION=0.18.2
+     SOURCE_HASH=sha512:577dd88e522eb3f9c21d3588358137dc9419a4d3961299a2162f7edb07e2b95a46d87022b57f0ea190bf9d76a2b1d2aada61c03e952e29c432e250e4686d594d
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
-   SOURCE_URL[0]=http://www.merkaartor.be/attachments/download/${REDMINE_HASH}/${SOURCE}
+   SOURCE_URL[0]=https://github.com/openstreetmap/merkaartor/archive/${VERSION}.tar.gz
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://www.merkaartor.be"
       LICENSE[0]=GPL
diff --git a/x11/merkaartor/HISTORY b/x11/merkaartor/HISTORY
index 48a45e0a96..4cf0c32ec1 100644
--- a/x11/merkaartor/HISTORY
+++ b/x11/merkaartor/HISTORY
@@ -1,3 +1,15 @@
+2015-07-19 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.18.2
+	* 0002-FIX-Assert-width-0-with-wireframe-with-style.patch,
+	  0003-FIX-secondary-road-simple-color.patch,
+	  0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch,
+	  0005-FIX-openSUSE-build.patch,
+	  0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch,
+	  0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch,
+	  0008-FIX-GDAL-crash.patch: removed
+	* 0001-fix-path-to-include-file.patch, PRE_BUILD: fix compile error
+	  due to wrong paths to includes
+
 2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
 	* DEPENDS: depends -sub CXX gcc (half-automated)
 
diff --git a/x11/merkaartor/PRE_BUILD b/x11/merkaartor/PRE_BUILD
index aa79e48d17..06db156595 100755
--- a/x11/merkaartor/PRE_BUILD
+++ b/x11/merkaartor/PRE_BUILD
@@ -1,9 +1,3 @@
 default_pre_build      &&
 cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SPELL_DIRECTORY}/0002-FIX-Assert-width-0-with-wireframe-with-style.patch         &&
-patch -p1 < ${SPELL_DIRECTORY}/0003-FIX-secondary-road-simple-color.patch                      &&
-patch -p1 < ${SPELL_DIRECTORY}/0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch             &&
-patch -p1 < ${SPELL_DIRECTORY}/0005-FIX-openSUSE-build.patch                                   &&
-patch -p1 < ${SPELL_DIRECTORY}/0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch         &&
-patch -p1 < ${SPELL_DIRECTORY}/0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch &&
-patch -p1 < ${SPELL_DIRECTORY}/0008-FIX-GDAL-crash.patch
+patch -p1 < ${SPELL_DIRECTORY}/0001-fix-path-to-include-file.patch