[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/, sci-geosciences/merkaartor/files/

2020-06-14 Thread Andreas Sturmlechner 
commit: 7eb1bf48e02f7e48c4ff82c0e4274b49246f247d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 14 20:32:00 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 14 21:51:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eb1bf48

sci-geosciences/merkaartor: Fix build with Qt 5.15

Closes: https://bugs.gentoo.org/727914
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/merkaartor-0.18.4-qt-5.15.patch  | 29 ++
 .../merkaartor/merkaartor-0.18.4.ebuild|  5 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch 
b/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch
new file mode 100644
index 000..e14cda8b5bd
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch
@@ -0,0 +1,29 @@
+From e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 14 Jun 2020 22:19:24 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ src/Features/Feature.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/Features/Feature.h b/src/Features/Feature.h
+index 52fd3044..f466a5a9 100644
+--- a/src/Features/Feature.h
 b/src/Features/Feature.h
+@@ -8,8 +8,10 @@ class Feature;
+ #include "MapView.h"
+ #include "FeaturePainter.h"
+ 
+-#include 
+ #include 
++#include 
++#include 
++#include 
+ 
+ #define CAST_FEATURE(x) (dynamic_cast(x))
+ #define CAST_NODE(x) (dynamic_cast(x))
+-- 
+2.27.0
+

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild 
b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
index e5d0a17a126..360d580f309 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
@@ -39,7 +39,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch # bug 621826
+   "${FILESDIR}"/${P}-qt-5.15.patch # bug 727914
+)
 
 DOCS=( AUTHORS CHANGELOG )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/, sci-geosciences/merkaartor/files/

2018-12-29 Thread Andreas Sturmlechner 
commit: 18930bc543d1582937aab1b70294d7721595ea66
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 29 23:25:10 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 29 23:52:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18930bc5

sci-geosciences/merkaartor: Patch for USE webengine; drop Qt5WebKit

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/merkaartor-0.18.3-webengine1.patch   | 186 +
 .../files/merkaartor-0.18.3-webengine2.patch   |  35 
 .../files/merkaartor-0.18.3-webengine3.patch   | 135 +++
 .../merkaartor/merkaartor-0.18.3-r4.ebuild |   6 +-
 4 files changed, 360 insertions(+), 2 deletions(-)

diff --git 
a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch 
b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch
new file mode 100644
index 000..5f4f605ce5b
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch
@@ -0,0 +1,186 @@
+From df515ecf4e6ce1a249af299840e82126c68fcf91 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= 
+Date: Mon, 26 Sep 2016 13:02:57 +0200
+Subject: [PATCH] Updated QWeb to QWebView.
+
+---
+ src/Layers/LicenseDisplayDialog.ui  |  6 +++---
+ src/QMapControl/browserimagemanager.cpp | 20 +---
+ src/QMapControl/browserimagemanager.h   | 17 ++---
+ src/src.pro |  2 +-
+ 4 files changed, 19 insertions(+), 26 deletions(-)
+
+diff --git a/src/Layers/LicenseDisplayDialog.ui 
b/src/Layers/LicenseDisplayDialog.ui
+index 103816c6..3dabd130 100755
+--- a/src/Layers/LicenseDisplayDialog.ui
 b/src/Layers/LicenseDisplayDialog.ui
+@@ -15,7 +15,7 @@
+   
+   
+
+-
++
+  
+   
+about:blank
+@@ -41,9 +41,9 @@
+  
+  
+   
+-   QWebView
++   QWebEngineView
+QWidget
+-   QtWebKit/QWebView
++   QWebEngineView
+   
+  
+  
+diff --git a/src/QMapControl/browserimagemanager.cpp 
b/src/QMapControl/browserimagemanager.cpp
+index 468cf2b6..4021d40f 100644
+--- a/src/QMapControl/browserimagemanager.cpp
 b/src/QMapControl/browserimagemanager.cpp
+@@ -47,9 +47,8 @@ void BrowserWebPage::javaScriptConsoleMessage ( const 
QString & message, int lin
+ //printf("%s\n", s);
+ }
+ 
+-void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg 
)
++void BrowserWebPage::javaScriptAlert ( const QString & msg )
+ {
+-Q_UNUSED(frame)
+ //QMessageBox::information(NULL, tr("Javascript alert"), msg);
+ 
+ if (msg.startsWith("Coord")) {
+@@ -105,8 +104,10 @@ void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, 
const QString & msg )
+ 
+ void BrowserWebPage::launchRequest ( const QUrl & url )
+ {
++qDebug() << "Warning: you are using BrowserWebPage to render background 
imagery. "<<
++"This code is not tested and may not work as expected. If you 
experience issues, please let us know.";
+ sw = sh = 0;
+-mainFrame()->load(url);
++load(url);
+ }
+ 
+ BrowserImageManager* BrowserImageManager::m_BrowserImageManagerInstance = 0;
+@@ -138,8 +139,6 @@ BrowserImageManager::BrowserImageManager(QObject* parent)
+ }
+ 
+ page = new BrowserWebPage();
+-page->setNetworkAccessManager(m_networkManager);
+-page->setViewportSize(QSize(1024, 1024));
+ 
+ connect(page, SIGNAL(loadFinished(bool)), this, 
SLOT(pageLoadFinished(bool)));
+ 
+@@ -220,7 +219,6 @@ void BrowserImageManager::launchRequest()
+ 
+ QUrl u = QUrl( R.url);
+ 
+-page->networkAccessManager()->setProxy(M_PREFS->getProxy(u));
+ page->launchRequest(u);
+ requestActive = true;
+ #ifndef BROWSERIMAGEMANAGER_IS_THREADED
+@@ -246,7 +244,7 @@ void BrowserImageManager::pageLoadFinished(bool ok)
+ qDebug() << "BrowserImageManager::pageLoadFinished: " << " Hash: " << 
R.hash;
+ QPixmap pt(page->sw, page->sh);
+ QPainter P();
+-page->mainFrame()->render(, QRegion(0,0,page->sw,page->sh));
++page->view()->render(, QPoint(), QRegion(0,0,page->sw,page->sh));
+ P.end();
+ 
+ //if (page->sw != BROWSER_TILE_SIZE || page->sh != BROWSER_TILE_SIZE) 
{
+@@ -319,7 +317,7 @@ void BrowserImageManager::loadingQueueEmpty()
+ void BrowserImageManager::abortLoading()
+ {
+ //qDebug() << "BrowserImageManager::abortLoading";
+-page->triggerAction(QWebPage::Stop);
++page->triggerAction(QWebEnginePage::Stop);
+ if (!loadingRequests.isEmpty()) {
+ LoadingRequest R = loadingRequests.dequeue();
+ loadingRequests.clear();
+@@ -331,7 +329,7 @@ void BrowserImageManager::abortLoading()
+ #ifdef BROWSERIMAGEMANAGER_IS_THREADED
+ void BrowserImageManager::run()
+ {
+-page = new BrowserWebPage();
++page = new BrowserWebEnginePage();
+ page->setViewportSize(QSize(1024, 1024));
+ 
+ QTimer theTimer;
+@@ -354,7 +352,7 @@ void

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/, sci-geosciences/merkaartor/files/

2018-08-05 Thread Amy Liffey 
commit: 0553c73ec423b80b07df52b87db616d17a2f00eb
Author: Amy Liffey  gentoo  org>
AuthorDate: Sun Aug  5 15:34:43 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sun Aug  5 15:37:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0553c73e

sci-geosciences/merkaartor: fix plugins path

Closes: https://bugs.gentoo.org/621826
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../merkaartor-0.18.3-sharedir-pluginsdir.patch| 28 +++
 .../merkaartor/merkaartor-0.18.3-r3.ebuild | 91 ++
 2 files changed, 119 insertions(+)

diff --git 
a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch 
b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
new file mode 100644
index 000..46f5964e17c
--- /dev/null
+++ 
b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
@@ -0,0 +1,28 @@
+--- a/src/src.pro  2018-08-05 13:25:02.761849538 +0100
 b/src/src.pro  2018-08-05 13:25:55.935846789 +0100
+@@ -155,8 +155,10 @@
+ isEmpty( LIBDIR ) {
+ LIBDIR = $${PREFIX}/lib${LIB_SUFFIX}
+ }
+-
+-DEFINES += PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
++isEmpty( PLUGINS_DIR ){
++  PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
++}
++DEFINES += PLUGINS_DIR=$${PLUGINS_DIR}
+ 
+ target.path = $${PREFIX}/bin
+ SHARE_DIR = $${PREFIX}/share/merkaartor
+
+--- a/src/src.pro  2018-08-05 16:20:33.759305219 +0100
 b/src/src.pro  2018-08-05 16:20:53.094304220 +0100
+@@ -181,7 +181,7 @@
+ 
+ 
+ 
+-DEFINES += SHARE_DIR=$${SHARE_DIR}
++DEFINES += SHARE_DIR=$${SHARE_DIR_PATH}
+ INSTALLS += target
+ 
+ win32-msvc* {
+

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild 
b/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild
new file mode 100644
index 000..19e627bdad4
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi 
zh_CN zh_TW"
+
+inherit gnome2-utils l10n qmake-utils xdg-utils
+
+DESCRIPTION="Qt based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor;
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug exif gps libproxy"
+
+RDEPEND="
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebkit:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   dev-qt/qtsingleapplication[X,qt5(+)]
+   >=sci-libs/gdal-1.6.0
+   >=sci-libs/proj-4.6
+   sys-libs/zlib
+   exif? ( media-gfx/exiv2:= )
+   gps? ( >=sci-geosciences/gpsd-3.17-r2 )
+   libproxy? ( net-libs/libproxy )
+"
+DEPEND="${RDEPEND}
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+"
+PATCHES=( "${FILESDIR}/${P}-sharedir-pluginsdir.patch" ) # bug 621826
+DOCS=( AUTHORS CHANGELOG )
+
+src_prepare() {
+   default
+
+   my_rm_loc() {
+   sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" 
src/src.pro || die
+   rm "translations/${PN}_${1}.ts" || die
+   }
+
+   if [[ -n "$(l10n_get_locales)" ]]; then
+   l10n_for_each_disabled_locale_do my_rm_loc
+   $(qt5_get_bindir)/lrelease src/src.pro || die
+   fi
+
+   # build system expects to be building from git
+   sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+}
+
+src_configure() {
+   # TRANSDIR_SYSTEM is for bug #385671
+   eqmake5 \
+   PREFIX="${ED%/}/usr" \
+   LIBDIR="${ED%/}/usr/$(get_libdir)" \
+   PLUGINS_DIR="/usr/$(get_libdir)/plugins" \
+   SHARE_DIR_PATH="/usr/share/${PN}" \
+   TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \
+   TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
+   SYSTEM_QTSA=1 \
+   RELEASE=1 \
+   NODEBUG="$(usex debug '0' '1')" \
+   GEOIMAGE="$(usex exif '1' '0')" \
+   GPSDLIB="$(usex gps '1' '0')" \
+   LIBPROXY="$(usex libproxy '1' '0')" \
+   ZBAR=0 \
+   Merkaartor.pro
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   xdg_desktop_database_update
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   xdg_desktop_database_update
+   gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/, sci-geosciences/merkaartor/files/

2017-01-09 Thread Andreas Sturmlechner 
commit: e3932bad801b591782091f231b254c5fa747a825
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan  9 21:17:55 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan  9 22:44:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3932bad

sci-geosciences/merkaartor: Drop old

Gentoo-bug: 454278, 588048

Package-Manager: portage-2.3.0

 sci-geosciences/merkaartor/Manifest|   2 -
 .../merkaartor/files/0.17.2-includes.patch |  11 --
 .../merkaartor/files/0.17.2-libproxy.patch |  12 --
 .../files/merkaartor-0.18.1-system-libs.patch  |  43 -
 .../merkaartor-0.18.2-fix-qtgui-include.patch  |  40 
 .../files/merkaartor-0.18.2-geoimagedock.patch |  34 
 ...kaartor-0.18.2-gpsdata-handling-gpsd-3.12.patch |  32 
 .../merkaartor/files/merkaartor-gdal-2-fix.patch   | 212 -
 .../merkaartor/merkaartor-0.18.1-r2.ebuild |  91 -
 .../merkaartor/merkaartor-0.18.2.ebuild| 135 -
 10 files changed, 612 deletions(-)

diff --git a/sci-geosciences/merkaartor/Manifest 
b/sci-geosciences/merkaartor/Manifest
index c012668..1319f52 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,3 +1 @@
-DIST merkaartor-0.18.1.tar.gz 6459640 SHA256 
e9fa5e30e6392c9224f73e9bb7d17b66c4eb6c023633eb2af0cf58ba8acf684f SHA512 
5ccb2aca7463cd3b31790b0f231cd18f4499b38ec3eb14c3600bdaae880194a71aaf63a2c2f814af6277b1b07fd618b4393309aa5ded375940bd464d1e77d71d
 WHIRLPOOL 
fde10a93510c123f2e1065ad745c3abc7860892c55ed615e75214dd172bfbec1da6f254377cc2d6e0f1df6f9d0680d0f7878ba3224651f5b09c590c335211d9c
-DIST merkaartor-0.18.2.tar.gz 6267866 SHA256 
9e04d554ebc4fd0dd6d0cdf4e50a38135f34ded68f5dfd8cb295e20bf508 SHA512 
577dd88e522eb3f9c21d3588358137dc9419a4d3961299a2162f7edb07e2b95a46d87022b57f0ea190bf9d76a2b1d2aada61c03e952e29c432e250e4686d594d
 WHIRLPOOL 
00ae2547625442697d74084ea939e8d5ca588aeed3d67d82e2239ebfe2bd33703ad51871c4e4e38353c2692eb14a63664af5eddbeed2c6862b20122d0f5fbb0d
 DIST merkaartor-0.18.3.tar.gz 7104234 SHA256 
d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947 SHA512 
b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915
 WHIRLPOOL 
6013770bfbde1360afc8106bc3ba250228e5c864483efa402033055ab0376c41b661ac188783b79a639ecb1404e38d28dc554923dc5fd17c24cefd3e192d

diff --git a/sci-geosciences/merkaartor/files/0.17.2-includes.patch 
b/sci-geosciences/merkaartor/files/0.17.2-includes.patch
deleted file mode 100644
index 2458aec..
--- a/sci-geosciences/merkaartor/files/0.17.2-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN merkaartor-0.17.2.old/src/MainWindow.cpp 
merkaartor-0.17.2/src/MainWindow.cpp
 merkaartor-0.17.2.old/src/MainWindow.cpp   2011-06-09 22:01:46.624543619 
+0200
-+++ merkaartor-0.17.2/src/MainWindow.cpp   2011-06-09 22:02:27.891027716 
+0200
-@@ -92,6 +92,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 

diff --git a/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch 
b/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch
deleted file mode 100644
index d5fdf70..
--- a/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN merkaartor-0.17.2.old//src/Preferences/MerkaartorPreferences.h 
merkaartor-0.17.2/src/Preferences/MerkaartorPreferences.h
 merkaartor-0.17.2.old//src/Preferences/MerkaartorPreferences.h 
2011-06-10 17:26:49.0 +0200
-+++ merkaartor-0.17.2/src/Preferences/MerkaartorPreferences.h  2011-06-10 
17:29:46.0 +0200
-@@ -21,7 +21,7 @@
- #include 
- 
- #ifdef USE_LIBPROXY
--#include 
-+#include 
- #endif
- 
- #include "Maps/Coord.h"

diff --git 
a/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch 
b/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch
deleted file mode 100644
index 5295573..
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e4cda9c42c049577caf126e8849c4b9eba62b31b Mon Sep 17 00:00:00 2001
-From: Nikoli 
-Date: Thu, 10 Oct 2013 16:28:02 +0400
-Subject: [PATCH] Support for building with system qtsingleapplication and
- quazip
-

- INSTALL | 1 +
- src/src.pro | 6 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/INSTALL b/INSTALL
-index a828c17..022e8d0 100644
 a/INSTALL
-+++ b/INSTALL
-@@ -33,6 +33,7 @@ TRANSDIR_MERKAARTOR=   - where will the Merkaartor 
translations be installed
- TRANSDIR_SYSTEM=- where your global Qt translation 
directory is
- NODEBUG=1 - release target
- NOUSEWEBKIT   - disable use of WebKit (Yahoo adapter)
-+SYSTEM_QTSA   - use system copy of qtsingleapplication 
instead of internal
- 
- see

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/, sci-geosciences/merkaartor/files/

2016-03-14 Thread Sam Jorna 
commit: c11ac51e227efd10368dbd4b0aa450aa20d46dc9
Author: Sam Jorna (wraeth)  gentoo  org>
AuthorDate: Mon Mar 14 20:29:37 2016 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Mon Mar 14 23:20:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c11ac51e

sci-geosciences/merkaartor: bump to 0.18.2

Bump to version 0.18.2, add conditional support for qt5, add
REQUIRED_USE, fix build system expecting to build from git, fix
installation paths, fix broken includes. Original ebuild based on
0.18.1-r1 by Malte E. per bug.

Gentoo-bug: 555362
Package-Manager: portage-2.2.28

 sci-geosciences/merkaartor/Manifest|   1 +
 .../merkaartor-0.18.2-fix-qtgui-include.patch  |  40 ++
 .../files/merkaartor-0.18.2-geoimagedock.patch |  34 ++
 ...kaartor-0.18.2-gpsdata-handling-gpsd-3.12.patch |  32 +
 .../merkaartor/merkaartor-0.18.2.ebuild| 134 +
 5 files changed, 241 insertions(+)

diff --git a/sci-geosciences/merkaartor/Manifest 
b/sci-geosciences/merkaartor/Manifest
index 1b431ef..f3b45f6 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,2 +1,3 @@
 DIST merkaartor-0.17.2.tar.bz2 7138991 SHA256 
425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a SHA512 
3718131d855ad6ea17537c7879a3249f25f6f5aaaf00e2e59df10c5497a628f0877f85129a209d11dc969b5771598f9989cc6ca3a972dab4c3eaef507784d4ed
 WHIRLPOOL 
22a07736e7da44d3799831352d0e9d323143f228dcf7693b6f90fe101a8a04c74c2c5186db15723902b7dd8aadd93a78547e4622b5238ceb7074027e987b8487
 DIST merkaartor-0.18.1.tar.gz 6459640 SHA256 
e9fa5e30e6392c9224f73e9bb7d17b66c4eb6c023633eb2af0cf58ba8acf684f SHA512 
5ccb2aca7463cd3b31790b0f231cd18f4499b38ec3eb14c3600bdaae880194a71aaf63a2c2f814af6277b1b07fd618b4393309aa5ded375940bd464d1e77d71d
 WHIRLPOOL 
fde10a93510c123f2e1065ad745c3abc7860892c55ed615e75214dd172bfbec1da6f254377cc2d6e0f1df6f9d0680d0f7878ba3224651f5b09c590c335211d9c
+DIST merkaartor-0.18.2.tar.gz 6267866 SHA256 
9e04d554ebc4fd0dd6d0cdf4e50a38135f34ded68f5dfd8cb295e20bf508 SHA512 
577dd88e522eb3f9c21d3588358137dc9419a4d3961299a2162f7edb07e2b95a46d87022b57f0ea190bf9d76a2b1d2aada61c03e952e29c432e250e4686d594d
 WHIRLPOOL 
00ae2547625442697d74084ea939e8d5ca588aeed3d67d82e2239ebfe2bd33703ad51871c4e4e38353c2692eb14a63664af5eddbeed2c6862b20122d0f5fbb0d

diff --git 
a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-fix-qtgui-include.patch 
b/sci-geosciences/merkaartor/files/merkaartor-0.18.2-fix-qtgui-include.patch
new file mode 100644
index 000..4bbd129
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.2-fix-qtgui-include.patch
@@ -0,0 +1,40 @@
+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 
+ #endif
+ 
+-#include 
+-#include 
+-#include 
++#include 
++#include 
++#include 
+ #include 
+-#include 
+-#include 
+-#include 
++#include 
++#include 
++#include 
+ #include 
+ 
+ #include 
+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 
+-#include 
++#include 
+ #include 
+-#include 
++#include 
+ #include 
+ #include 
+ 

diff --git 
a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-geoimagedock.patch 
b/sci-geosciences/merkaartor/files/merkaartor-0.18.2-geoimagedock.patch
new file mode 100644
index 000..8ca40f8
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.2-geoimagedock.patch
@@ -0,0 +1,34 @@
+diff --git a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp
+index c05d09f..5cd3a98 100644
+--- a/src/Docks/GeoImageDock.cpp
 b/src/Docks/GeoImageDock.cpp
+@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
+ 
+ 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(const QString & 
file)
+ 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;
+diff --git a/src/Docks/GeoImageDock.h b/src/Docks/GeoImageDock.h
+index ab7bbf6..3153219 100644
+--- a/src/Docks/GeoImageDock.h
 b/src/Docks/GeoImageDock.h
+@@ -9,6 +9,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ class ImageView;
+ 

diff --git 
a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-gpsdata-handling-gpsd-3.12.patch
 
b/sci-geosciences/merkaartor/files/merkaartor-0.18.2-gpsdata-handling-gpsd-3.12.patch
new file mode 100644
index 000..ee1052c
--- /dev/null
+++