public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/, sci-geosciences/merkaartor/files/
@ 2016-03-14 23:21 Sam Jorna
  0 siblings, 0 replies; 5+ messages in thread
From: Sam Jorna @ 2016-03-14 23:21 UTC (permalink / raw
  To: gentoo-commits

commit:     c11ac51e227efd10368dbd4b0aa450aa20d46dc9
Author:     Sam Jorna (wraeth) <wraeth <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 20:29:37 2016 +0000
Commit:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 23:20:58 2016 +0000
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 9e04d554ebc4f9999d0dd6d0cdf4e50a38135f34ded68f5dfd8cb295e20bf508 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 0000000..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 <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>
+ 

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 0000000..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 <QtWidgets/QShortcut>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <QDrag>
+ 
+ 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 0000000..ee1052c
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.2-gpsdata-handling-gpsd-3.12.patch
@@ -0,0 +1,32 @@
+From 3f2209970cca8d9b2b977be3eab7587f72f65fbb Mon Sep 17 00:00:00 2001
+From: Bas Couwenberg <sebastic@xs4all.nl>
+Date: Sun, 1 Nov 2015 16:26:15 +0100
+Subject: [PATCH] Fix gpsdata handling for gpsd >= 3.12 (libgps22 |
+ GPSD_API_MAJOR_VERSION 6) #76
+
+---
+ src/GPS/qgpsdevice.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/GPS/qgpsdevice.cpp b/src/GPS/qgpsdevice.cpp
+index 04889f6..b0c146a 100644
+--- a/src/GPS/qgpsdevice.cpp
++++ b/src/GPS/qgpsdevice.cpp
+@@ -1056,10 +1056,17 @@ void QGPSDDevice::onDataAvailable()
+         satArray[i][0] = satArray[i][1] = satArray[i][2] = 0;
+     for (int i=0; i<num_sat; ++i)
+     {
++#if GPSD_API_MAJOR_VERSION > 5
++        int id = gpsdata->skyview[i].PRN;
++        satArray[id][0] = gpsdata->skyview[i].elevation;
++        satArray[id][1] = gpsdata->skyview[i].azimuth;
++        satArray[id][2] = gpsdata->skyview[i].ss;
++#else
+         int id = gpsdata->PRN[i];
+         satArray[id][0] = gpsdata->elevation[i];
+         satArray[id][1] = gpsdata->azimuth[i];
+         satArray[id][2] = gpsdata->ss[i];
++#endif
+     }
+     setNumSatellites(num_sat);
+ 

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
new file mode 100644
index 0000000..e4c7b96
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="ar cs de es et fr hr hu it ja nl pl pt_BR pt ru sk sv uk"
+
+inherit eutils fdo-mime gnome2-utils l10n multilib qmake-utils
+
+DESCRIPTION="A 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 qrcode qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+		dev-qt/qtwebkit:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtprintsupport:5
+	)
+	>=dev-qt/qtsingleapplication-2.6.1[X,qt4?,qt5?]
+	>=sci-libs/gdal-1.6.0
+	>=sci-libs/proj-4.6
+	sys-libs/zlib
+	exif? ( media-gfx/exiv2:= )
+	gps? ( >=sci-geosciences/gpsd-3.13[cxx] )
+	libproxy? ( net-libs/libproxy )
+	qrcode? ( media-gfx/zbar[qt4] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CHANGELOG HACKING )
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
+		rm "translations/${PN}_${1}.ts" || die
+	}
+
+	l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
+
+	if [[ -n "$(l10n_get_locales)" ]]; then
+		l10n_for_each_disabled_locale_do my_rm_loc
+		if use qt4 ; then
+			$(qt4_get_bindir)/lrelease src/src.pro || die
+		else
+			$(qt5_get_bindir)/lrelease src/src.pro || die
+		fi
+	fi
+
+	if use qt4 ; then
+		# fix qtgui include - only for qt4
+		epatch "${FILESDIR}"/"${P}"-fix-qtgui-include.patch
+	fi
+
+	# build system expects to be building from git
+	sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g"
+
+	# Fix gpsdata handling for gpsd >= 3.12
+	# https://github.com/openstreetmap/merkaartor/issues/76
+	epatch "${FILESDIR}"/"${P}"-gpsdata-handling-gpsd-3.12.patch
+
+	epatch "${FILESDIR}/${P}-geoimagedock.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	# TRANSDIR_SYSTEM is for bug #385671
+	if use qt4 ; then
+		eqmake4 \
+		PREFIX="${ED}/usr" \
+		LIBDIR="${ED}/usr/$(get_libdir)" \
+		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/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="$(usex qrcode '1' '0')" \
+		Merkaartor.pro
+	else
+		eqmake5 \
+		PREFIX="${ED}/usr" \
+		LIBDIR="${ED}/usr/$(get_libdir)" \
+		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="$(usex qrcode '1' '0')" \
+		Merkaartor.pro
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/, sci-geosciences/merkaartor/files/
@ 2017-01-09 22:46 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-01-09 22:46 UTC (permalink / raw
  To: gentoo-commits

commit:     e3932bad801b591782091f231b254c5fa747a825
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 21:17:55 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan  9 22:44:56 2017 +0000
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 9e04d554ebc4f9999d0dd6d0cdf4e50a38135f34ded68f5dfd8cb295e20bf508 SHA512 577dd88e522eb3f9c21d3588358137dc9419a4d3961299a2162f7edb07e2b95a46d87022b57f0ea190bf9d76a2b1d2aada61c03e952e29c432e250e4686d594d WHIRLPOOL 00ae2547625442697d74084ea939e8d5ca588aeed3d67d82e2239ebfe2bd33703ad51871c4e4e38353c2692eb14a63664af5eddbeed2c6862b20122d0f5fbb0d
 DIST merkaartor-0.18.3.tar.gz 7104234 SHA256 d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915 WHIRLPOOL 6013770bfbde1360afc8106bc3ba250228e5c864483efa402033055ab0376c41b661ac188783b79a639ecb1404e38d28dc554bbbb923dc5fd17c24cefd3e192d

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..00000000
--- 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 <QtGui/QFileDialog>
- #include <QtGui/QMessageBox>
- #include <QtGui/QMouseEvent>
-+#include <QtNetwork>
- #include <QInputDialog>
- #include <QClipboard>
- #include <QProgressDialog>

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..00000000
--- 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.000000000 +0200
-+++ merkaartor-0.17.2/src/Preferences/MerkaartorPreferences.h	2011-06-10 17:29:46.000000000 +0200
-@@ -21,7 +21,7 @@
- #include <QNetworkProxy>
- 
- #ifdef USE_LIBPROXY
--#include <libproxy/proxy.h>
-+#include <proxy.h>
- #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..00000000
--- 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 <nikoli@gmx.us>
-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=<path>	- where will the Merkaartor translations be installed
- TRANSDIR_SYSTEM=<path>		- 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 http://wiki.openstreetmap.org/wiki/Merkaartor/Compiling for the complete list
- 
-diff --git a/src/src.pro b/src/src.pro
-index f23e05e..ff228b6 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -6,7 +6,11 @@ include (Config.pri)
- #Custom config
- include(Custom.pri)
- 
--include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
-+isEmpty(SYSTEM_QTSA) {
-+  include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
-+} else {
-+  CONFIG += qtsingleapplication
-+}
- include(../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.pri)
- 
- #Qt Version
--- 
-2.0.5
-

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
deleted file mode 100644
index 4bbd129..00000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-fix-qtgui-include.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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>
- 

diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-geoimagedock.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.2-geoimagedock.patch
deleted file mode 100644
index 8ca40f8..00000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-geoimagedock.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 <QtWidgets/QShortcut>
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
-+#include <QDrag>
- 
- 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
deleted file mode 100644
index ee1052c..00000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-gpsdata-handling-gpsd-3.12.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3f2209970cca8d9b2b977be3eab7587f72f65fbb Mon Sep 17 00:00:00 2001
-From: Bas Couwenberg <sebastic@xs4all.nl>
-Date: Sun, 1 Nov 2015 16:26:15 +0100
-Subject: [PATCH] Fix gpsdata handling for gpsd >= 3.12 (libgps22 |
- GPSD_API_MAJOR_VERSION 6) #76
-
----
- src/GPS/qgpsdevice.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/GPS/qgpsdevice.cpp b/src/GPS/qgpsdevice.cpp
-index 04889f6..b0c146a 100644
---- a/src/GPS/qgpsdevice.cpp
-+++ b/src/GPS/qgpsdevice.cpp
-@@ -1056,10 +1056,17 @@ void QGPSDDevice::onDataAvailable()
-         satArray[i][0] = satArray[i][1] = satArray[i][2] = 0;
-     for (int i=0; i<num_sat; ++i)
-     {
-+#if GPSD_API_MAJOR_VERSION > 5
-+        int id = gpsdata->skyview[i].PRN;
-+        satArray[id][0] = gpsdata->skyview[i].elevation;
-+        satArray[id][1] = gpsdata->skyview[i].azimuth;
-+        satArray[id][2] = gpsdata->skyview[i].ss;
-+#else
-         int id = gpsdata->PRN[i];
-         satArray[id][0] = gpsdata->elevation[i];
-         satArray[id][1] = gpsdata->azimuth[i];
-         satArray[id][2] = gpsdata->ss[i];
-+#endif
-     }
-     setNumSatellites(num_sat);
- 

diff --git a/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch b/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch
deleted file mode 100644
index 4197610..00000000
--- a/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch
+++ /dev/null
@@ -1,212 +0,0 @@
---- a/src/ImportExport/ImportExportGdal.cpp 2015-06-15 18:48:39.604575423 +0200
-+++ b/src/ImportExport/ImportExportGdal.cpp 2015-06-15 18:48:39.604575423 +0200
-@@ -21,10 +21,13 @@
- #include "ProjectionChooser.h"
- #include "Global.h"
- 
--#include "cpl_vsi.h"
-+#include <cpl_vsi.h>
-+#include <gdal.h>
-+#include <gdal_priv.h>
- 
- #include <QDir>
- 
-+
- bool parseContainer(QDomElement& e, Layer* aLayer);
- 
- ImportExportGdal::ImportExportGdal(Document* doc)
-@@ -55,6 +58,55 @@ bool ImportExportGdal::saveFile(QString)
- bool ImportExportGdal::export_(const QList<Feature *>& featList)
- {
-     const char *pszDriverName = "SQLite";
-+    QString fileName(HOMEDIR + "/test.sqlite");
-+#ifdef GDAL2
-+    GDALDriver *poDriver;
-+    GDALDriverManager *driverManager = GetGDALDriverManager();
-+    GDALAllRegister();
-+    driverManager->AutoLoadDrivers();
-+
-+    poDriver = driverManager->GetDriverByName(pszDriverName);
-+    if( poDriver == NULL )
-+    {
-+        qDebug( "%s driver not available.", pszDriverName );
-+        return false;
-+    }
-+
-+    /* Create create options */
-+    char **createOptions = NULL;
-+    createOptions = CSLSetNameValue( createOptions, "SPATIALITE", "YES" );
-+
-+    /* Open new dataset */
-+    GDALDataset *poDS;
-+
-+    QFile::remove(fileName);
-+    poDS = poDriver->Create( fileName.toUtf8().constData(), 0, 0, 0, GDT_Unknown, createOptions );
-+    if( poDS == NULL )
-+    {
-+        qDebug( "Creation of output file failed." );
-+        return false;
-+    }
-+    poDS->ExecuteSQL("PRAGMA synchronous = OFF", NULL, NULL);
-+
-+    /* Create Spatial reference object */
-+    OGRSpatialReference *poSRS;
-+    poSRS = new OGRSpatialReference();
-+    poSRS->importFromEPSG(4326);
-+
-+    /* Create layer options */
-+    char **layerOptions = NULL;
-+    layerOptions = CSLSetNameValue( layerOptions, "FORMAT", "SPATIALITE" );
-+    layerOptions = CSLSetNameValue( layerOptions, "SPATIAL_INDEX", "YES" );
-+
-+    /* Create layer */
-+    OGRLayer *poLayer;
-+    poLayer = poDS->CreateLayer( "osm", poSRS, wkbUnknown, layerOptions);
-+
-+    /* Free the options */
-+    CSLDestroy( createOptions );
-+    CSLDestroy( layerOptions );
-+#else
-+    /* This is legacy code, and is not tested at all */
-     OGRSFDriver *poDriver;
- 
-     OGRRegisterAll();
-@@ -68,8 +120,8 @@ bool ImportExportGdal::export_(const QList<Feature *>& featList)
- 
-     OGRDataSource *poDS;
- 
--    QFile::remove(QString(HOMEDIR + "/test.sqlite"));
--    poDS = poDriver->CreateDataSource( QString(HOMEDIR + "/test.sqlite").toUtf8().constData(), NULL );
-+    QFile::remove(fileName);
-+    poDS = poDriver->CreateDataSource( fileName.toUtf8().constData(), NULL );
-     if( poDS == NULL )
-     {
-         qDebug( "Creation of output file failed." );
-@@ -89,6 +141,8 @@ bool ImportExportGdal::export_(const QList<Feature *>& featList)
-     OGRLayer *poLayer;
-     poLayer = poDS->CreateLayer( "osm", poSRS, wkbUnknown, papszOptions);
-     CSLDestroy( papszOptions );
-+#endif
-+
- 
-     if( poLayer == NULL )
-     {
-@@ -142,7 +196,11 @@ bool ImportExportGdal::export_(const QList<Feature *>& featList)
-         }
-         OGRFeature::DestroyFeature( poFeature );
-     }
-+#ifdef GDAL2
-+    GDALClose( (GDALDatasetH) poDS );
-+#else
-     OGRDataSource::DestroyDataSource( poDS );
-+#endif
-     return true;
- }
- 
-@@ -264,7 +322,11 @@ Feature* ImportExportGdal::parseGeometry(Layer* aLayer, OGRGeometry *poGeometry)
- 
- // import the  input
- 
--bool ImportExportGdal::importGDALDataset(OGRDataSource* poDS, Layer* aLayer, bool confirmProjection)
-+#ifndef GDAL2
-+#define GDALDataset OGRDataSource
-+#endif
-+bool ImportExportGdal::importGDALDataset(GDALDataset* poDS, Layer* aLayer, bool confirmProjection)
-+#undef GDALDataset
- {
-     int ogrError;
- 
-@@ -422,11 +484,16 @@ bool ImportExportGdal::importGDALDataset(OGRDataSource* poDS, Layer* aLayer, boo
- 
- bool ImportExportGdal::import(Layer* aLayer)
- {
-+#ifdef GDAL2
-+    GDALAllRegister();
-+    GDALDataset *poDS;
-+    poDS = (GDALDataset *) GDALOpen( FileName.toUtf8().constData(), GA_ReadOnly );
-+#else
-     OGRRegisterAll();
--
--    OGRDataSource       *poDS;
--
-+    OGRDataSource *poDS;
-     poDS = OGRSFDriverRegistrar::Open( FileName.toUtf8().constData(), FALSE );
-+#endif
-+
-     if( poDS == NULL )
-     {
-         qDebug( "GDAL Open failed.\n" );
-@@ -435,22 +502,26 @@ bool ImportExportGdal::import(Layer* aLayer)
- 
-     importGDALDataset(poDS, aLayer, M_PREFS->getGdalConfirmProjection());
- 
--    OGRDataSource::DestroyDataSource( poDS );
-+    GDALClose( (GDALDatasetH) poDS );
- 
-     return true;
- }
- 
- bool ImportExportGdal::import(Layer* aLayer, const QByteArray& ba, bool confirmProjection)
- {
--    OGRRegisterAll();
--
--    OGRDataSource       *poDS;
--//    int ogrError;
--
-     GByte* content = (GByte*)(ba.constData());
-     /*FILE* f = */VSIFileFromMemBuffer("/vsimem/temp", content, ba.size(), FALSE);
- 
-+#ifdef GDAL2
-+    GDALAllRegister();
-+    GDALDataset *poDS;
-+    poDS = (GDALDataset *) GDALOpen( "/vsimem/temp", GA_ReadOnly );
-+#else
-+    OGRRegisterAll();
-+    OGRDataSource *poDS;
-     poDS = OGRSFDriverRegistrar::Open( "/vsimem/temp", FALSE );
-+#endif
-+
-     if( poDS == NULL )
-     {
-         qDebug( "GDAL Open failed.\n" );
-@@ -458,7 +529,7 @@ bool ImportExportGdal::import(Layer* aLayer, const QByteArray& ba, bool confirmP
-     }
-     importGDALDataset(poDS, aLayer, confirmProjection);
- 
--    OGRDataSource::DestroyDataSource( poDS );
-+    GDALClose( (GDALDatasetH) poDS );
- 
-     return true;
- }
---- a/src/ImportExport/ImportExportGdal.h 2015-06-15 18:50:42.884995287 +0200
-+++ b/src/ImportExport/ImportExportGdal.h 2015-06-15 18:50:42.884995287 +0200
-@@ -13,7 +13,15 @@
- #define ImportExportGDAL_H
- 
- #include "IImportExport.h"
--#include "ogrsf_frmts.h"
-+
-+#include <ogrsf_frmts.h>
-+#include <gdal.h>
-+#include <gdal_priv.h>
-+#include <gdal_version.h>
-+
-+#if GDAL_VERSION_MAJOR == 2
-+#define GDAL2
-+#endif
- 
- class Projection;
- class Layer;
-@@ -52,7 +60,11 @@ class ImportExportGdal : public IImportExport
-     Node *nodeFor(Layer* aLayer, OGRPoint point);
-     Way *readWay(Layer* aLayer, OGRLineString *poRing);
- 
--    bool importGDALDataset(OGRDataSource *poDs, Layer *aLayer, bool confirmProjection);
-+#ifndef GDAL2
-+#define GDALDataset OGRDataSource
-+#endif
-+    bool importGDALDataset(GDALDataset *poDs, Layer *aLayer, bool confirmProjection);
-+#undef GDALDataset
- 
- private:
-     QHash<OGRPoint, Node*> pointHash;

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.1-r2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.1-r2.ebuild
deleted file mode 100644
index 211238a..00000000
--- a/sci-geosciences/merkaartor/merkaartor-0.18.1-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PLOCALES="ar cs de es et fr hr hu it ja nl pl pt_BR pt ru sk sv uk"
-
-inherit eutils fdo-mime gnome2-utils l10n multilib qt4-r2
-
-DESCRIPTION="A Qt4 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 qrcode"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	dev-qt/qtwebkit:4
-	>=dev-qt/qtsingleapplication-2.6.1[X,qt4(+)]
-	>=sci-libs/gdal-1.6.0
-	>=sci-libs/proj-4.6
-	sys-libs/zlib
-	exif? ( media-gfx/exiv2:= )
-	gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
-	libproxy? ( net-libs/libproxy )
-	qrcode? ( media-gfx/zbar )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CHANGELOG HACKING )
-
-src_prepare() {
-	my_rm_loc() {
-		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
-		rm "translations/${PN}_${1}.ts" || die
-	}
-
-	l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
-
-	if [[ -n "$(l10n_get_locales)" ]]; then
-		l10n_for_each_disabled_locale_do my_rm_loc
-		$(qt4_get_bindir)/lrelease src/src.pro || die
-	fi
-
-	epatch "${FILESDIR}"/${P}-system-libs.patch
-
-	# bug 554304 - build against gdal 2
-	epatch "${FILESDIR}"/${PN}-gdal-2-fix.patch
-
-	epatch_user
-}
-
-src_configure() {
-	# TRANSDIR_SYSTEM is for bug #385671
-	eqmake4 \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations" \
-		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/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="$(usex qrcode '1' '0')" \
-		Merkaartor.pro
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
deleted file mode 100644
index e512319..00000000
--- a/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PLOCALES="ar cs de es et fr hr hu it ja nl pl pt_BR pt ru sk sv uk"
-
-inherit eutils fdo-mime gnome2-utils l10n multilib qmake-utils
-
-DESCRIPTION="A 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 qrcode qt4 qt5"
-
-REQUIRED_USE="
-	^^ ( qt4 qt5 )
-	qrcode? ( qt4 )
-"
-RDEPEND="
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-		dev-qt/qtwebkit:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtprintsupport:5
-	)
-	>=dev-qt/qtsingleapplication-2.6.1[X,qt4?,qt5?]
-	>=sci-libs/gdal-1.6.0
-	>=sci-libs/proj-4.6
-	sys-libs/zlib
-	exif? ( media-gfx/exiv2:= )
-	gps? ( >=sci-geosciences/gpsd-3.13[cxx] )
-	libproxy? ( net-libs/libproxy )
-	qrcode? ( media-gfx/zbar[qt4] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CHANGELOG HACKING )
-
-src_prepare() {
-	my_rm_loc() {
-		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
-		rm "translations/${PN}_${1}.ts" || die
-	}
-
-	l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
-
-	if [[ -n "$(l10n_get_locales)" ]]; then
-		l10n_for_each_disabled_locale_do my_rm_loc
-		if use qt4 ; then
-			$(qt4_get_bindir)/lrelease src/src.pro || die
-		else
-			$(qt5_get_bindir)/lrelease src/src.pro || die
-		fi
-	fi
-
-	if use qt4 ; then
-		# fix qtgui include - only for qt4
-		epatch "${FILESDIR}"/"${P}"-fix-qtgui-include.patch
-	fi
-
-	# build system expects to be building from git
-	sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g"
-
-	# Fix gpsdata handling for gpsd >= 3.12
-	# https://github.com/openstreetmap/merkaartor/issues/76
-	epatch "${FILESDIR}"/"${P}"-gpsdata-handling-gpsd-3.12.patch
-
-	epatch "${FILESDIR}/${P}-geoimagedock.patch"
-
-	epatch_user
-}
-
-src_configure() {
-	# TRANSDIR_SYSTEM is for bug #385671
-	if use qt4 ; then
-		eqmake4 \
-		PREFIX="${ED}/usr" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
-		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/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="$(usex qrcode '1' '0')" \
-		Merkaartor.pro
-	else
-		eqmake5 \
-		PREFIX="${ED}/usr" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		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="$(usex qrcode '1' '0')" \
-		Merkaartor.pro
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/, sci-geosciences/merkaartor/files/
@ 2018-08-05 15:37 Amy Liffey
  0 siblings, 0 replies; 5+ messages in thread
From: Amy Liffey @ 2018-08-05 15:37 UTC (permalink / raw
  To: gentoo-commits

commit:     0553c73ec423b80b07df52b87db616d17a2f00eb
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 15:34:43 2018 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 15:37:17 2018 +0000
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 00000000000..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 00000000000..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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/, sci-geosciences/merkaartor/files/
@ 2018-12-29 23:52 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-12-29 23:52 UTC (permalink / raw
  To: gentoo-commits

commit:     18930bc543d1582937aab1b70294d7721595ea66
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 23:25:10 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 23:52:37 2018 +0000
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 <asturm <AT> 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 00000000000..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?= <krakonos@krakonos.org>
+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 @@
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+-    <widget class="QWebView" name="webView">
++    <widget class="QWebEngineView" name="webView">
+      <property name="url">
+       <url>
+        <string>about:blank</string>
+@@ -41,9 +41,9 @@
+  </widget>
+  <customwidgets>
+   <customwidget>
+-   <class>QWebView</class>
++   <class>QWebEngineView</class>
+    <extends>QWidget</extends>
+-   <header>QtWebKit/QWebView</header>
++   <header>QWebEngineView</header>
+   </customwidget>
+  </customwidgets>
+  <resources/>
+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(&pt);
+-        page->mainFrame()->render(&P, QRegion(0,0,page->sw,page->sh));
++        page->view()->render(&P, 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 BrowserImageManager::checkRequests()
+     } else {
+         if ((requestDuration++) > 100) {
+             requestDuration = 0;
+-            page->triggerAction(QWebPage::Stop);
++            page->triggerAction(QWebEnginePage::Stop);
+             qDebug() << "BrowserImageManager Timeout";
+         }
+     }
+@@ -365,7 +363,7 @@ void BrowserImageManager::checkRequests()
+ void BrowserImageManager::timeout()
+ {
+     qDebug() << "BrowserImageManager::timeout";
+-    page->triggerAction(QWebPage::Stop);
++    page->triggerAction(QWebEnginePage::Stop);
+     pageLoadFinished(false);
+ }
+ #endif // BROWSERIMAGEMANAGER_IS_THREADED
+diff --git a/src/QMapControl/browserimagemanager.h b/src/QMapControl/browserimagemanager.h
+index 10f8a477..ca846e31 100644
+--- a/src/QMapControl/browserimagemanager.h
++++ b/src/QMapControl/browserimagemanager.h
+@@ -24,14 +24,10 @@
+ #include <QPixmap>
+ 
+ #include <QtNetwork/QtNetwork>
+-#include <QWebFrame>
+-#include "qwebhistory.h"
+-#include "qwebhistoryinterface.h"
+-#include "qwebkitglobal.h"
+-#include "qwebpage.h"
+-#include "qwebpluginfactory.h"
+-#include "qwebsettings.h"
+-#include "qwebview.h"
++#include <QWebEnginePage>
++#include <QWebEngineHistory>
++#include <QWebEngineSettings>
++#include <QWebEngineView>
+ 
+ #include <QThread>
+ 
+@@ -41,13 +37,13 @@
+     @author Chris Browet <cbro@semperpax.com>
+ */
+ 
+-class BrowserWebPage : public QWebPage
++class BrowserWebPage : public QWebEnginePage
+ {
+     friend class BrowserImageManager;
+ 
+     protected:
+         virtual void javaScriptConsoleMessage ( const QString & message, int lineNumber, const QString & sourceID );
+-        virtual void javaScriptAlert ( QWebFrame * frame, const QString & msg ) ;
++        virtual void javaScriptAlert ( const QString & msg ) ;
+         void launchRequest ( const QUrl & url );
+ 
+     private:
+@@ -116,7 +112,6 @@ class BrowserImageManager : public QObject, public IImageManager
+         static BrowserImageManager* m_BrowserImageManagerInstance;
+ 
+         BrowserWebPage* page;
+-        QWebFrame *frame;
+         QNetworkAccessManager* qnam;
+ 
+     signals:
+diff --git a/src/src.pro b/src/src.pro
+index eb93b263..137d7e14 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -34,7 +34,7 @@ TEMPLATE = app
+ 
+ CONFIG += rtti stl exceptions
+ #CONFIG -= exceptions
+-QT += svg network xml core gui webkitwidgets concurrent printsupport
++QT += svg network xml core gui webenginewidgets concurrent printsupport
+ win32-msvc* {
+     LIBS += -lzlib
+ } else {

diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch
new file mode 100644
index 00000000000..48c4af7b9c5
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch
@@ -0,0 +1,35 @@
+From 20edcc7e85413e60ff180bd9f20e5428e5729222 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
+Date: Mon, 26 Sep 2016 13:11:33 +0200
+Subject: [PATCH] Replaced missing QT += webkit, updated linux package list.
+
+---
+ ci/travis-linux-install.sh | 3 +--
+ src/QMapControl.pri        | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/ci/travis-linux-install.sh b/ci/travis-linux-install.sh
+index 79975d27..4e83c9bb 100755
+--- a/ci/travis-linux-install.sh
++++ b/ci/travis-linux-install.sh
+@@ -8,6 +8,5 @@ sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa
+ sudo apt-get update -qq
+ sudo apt-cache search qt
+ sudo apt-get -qq install gdb libgdal-dev libproj-dev
+-sudo apt-get -qq install libqt4-xml libqt4-network libqt4-gui libqt4-svg libqt4-webkit libqt4-dev qt4-qmake
+-sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webkit5* libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
++sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webengine5{,-dev} libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
+ qtchooser -list-versions
+diff --git a/src/QMapControl.pri b/src/QMapControl.pri
+index bbfc09b5..92769565 100644
+--- a/src/QMapControl.pri
++++ b/src/QMapControl.pri
+@@ -26,7 +26,7 @@ QT += network
+         DEFINES += USE_WEBKIT
+         SOURCES += browserimagemanager.cpp
+         HEADERS += browserimagemanager.h
+-        QT += webkit
++        QT += webenginewidgets
+         contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
+     }
+ }

diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch
new file mode 100644
index 00000000000..97d76a18764
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch
@@ -0,0 +1,135 @@
+From 3019f1d2c76a0ae0c51e70d34bc25a49cb030845 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
+Date: Wed, 28 Sep 2016 21:41:02 +0200
+Subject: [PATCH] Removed webengine from LicenseDisplayDialog and renamed
+ conditional.
+
+This removes the QWebEngine dependency for most build configurations.
+None of the code actually uses it, but there are some plugins that do.
+I expect they are all obsolete, but will keep it in until they are
+replaced/deemed not working.
+---
+ COMPILE.md                         |  2 +-
+ src/Layers/ImageMapLayer.cpp       |  2 +-
+ src/Layers/LicenseDisplayDialog.ui | 29 +++++++++++++++--------------
+ src/QMapControl.pri                | 14 ++++++--------
+ src/src.pro                        |  2 +-
+ 5 files changed, 24 insertions(+), 25 deletions(-)
+
+diff --git a/COMPILE.md b/COMPILE.md
+index 9324019d..108a2eee 100644
+--- a/COMPILE.md
++++ b/COMPILE.md
+@@ -151,7 +151,7 @@ There are some parameters you can pass to qmake to customize build:
+ | TRANSDIR_MERKAARTOR=<path>  | where will the Merkaartor translations be installed |
+ | TRANSDIR_SYSTEM=<path>      | where your global Qt translation directory is | 
+ | NODEBUG=1                   | release target |
+-| NOUSEWEBKIT                 | disable use of WebKit (Yahoo adapter) |
++| USEWEBENGINE=1              | enable use of WebEngine (required for some external plugins) |
+ | SYSTEM_QTSA                 | use system copy of qtsingleapplication instead of internal |
+ 
+ 
+diff --git a/src/Layers/ImageMapLayer.cpp b/src/Layers/ImageMapLayer.cpp
+index 31966b09..b46199b9 100644
+--- a/src/Layers/ImageMapLayer.cpp
++++ b/src/Layers/ImageMapLayer.cpp
+@@ -263,7 +263,7 @@ void ImageMapLayer::setMapAdapter(const QUuid& theAdapterUid, const QString& ser
+                     QDialog dlg;
+                     ui.setupUi(&dlg);
+                     dlg.setWindowTitle(tr("Licensing Terms: %1").arg(name()));
+-                    ui.webView->load(u);
++                    ui.urlLabel->setText(QString("<a href='%1'>%2</a>").arg(u.toString()).arg(u.toString()));
+ 
+                     bool OK = false;
+                     while (!OK) {
+diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui
+index 3dabd130..dd748e41 100755
+--- a/src/Layers/LicenseDisplayDialog.ui
++++ b/src/Layers/LicenseDisplayDialog.ui
+@@ -6,8 +6,8 @@
+    <rect>
+     <x>0</x>
+     <y>0</y>
+-    <width>650</width>
+-    <height>400</height>
++    <width>786</width>
++    <height>171</height>
+    </rect>
+   </property>
+   <property name="windowTitle">
+@@ -15,11 +15,19 @@
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+-    <widget class="QWebEngineView" name="webView">
+-     <property name="url">
+-      <url>
+-       <string>about:blank</string>
+-      </url>
++    <widget class="QLabel" name="label">
++     <property name="text">
++      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The content selected is shared under a non-standard license agreement. The full text is available on the following URL. It is your reponsibility to read, understand and agree to the license.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
++     </property>
++     <property name="wordWrap">
++      <bool>true</bool>
++     </property>
++    </widget>
++   </item>
++   <item>
++    <widget class="QLabel" name="urlLabel">
++     <property name="text">
++      <string>TextLabel</string>
+      </property>
+     </widget>
+    </item>
+@@ -39,13 +47,6 @@
+    </item>
+   </layout>
+  </widget>
+- <customwidgets>
+-  <customwidget>
+-   <class>QWebEngineView</class>
+-   <extends>QWidget</extends>
+-   <header>QWebEngineView</header>
+-  </customwidget>
+- </customwidgets>
+  <resources/>
+  <connections>
+   <connection>
+diff --git a/src/QMapControl.pri b/src/QMapControl.pri
+index 92769565..3491c8b1 100644
+--- a/src/QMapControl.pri
++++ b/src/QMapControl.pri
+@@ -21,13 +21,11 @@ SOURCES += \
+ 
+ QT += network
+ 
+-!contains(NOUSEWEBKIT,1) {
+-    greaterThan(QT_VER_MAJ, 3) : greaterThan(QT_VER_MIN, 3) {
+-        DEFINES += USE_WEBKIT
+-        SOURCES += browserimagemanager.cpp
+-        HEADERS += browserimagemanager.h
+-        QT += webenginewidgets
+-        contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
+-    }
++contains(USEWEBENGINE,1) {
++    DEFINES += USE_WEBKIT
++    SOURCES += browserimagemanager.cpp
++    HEADERS += browserimagemanager.h
++    QT += webenginewidgets
++    contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
+ }
+ 
+diff --git a/src/src.pro b/src/src.pro
+index 137d7e14..81a65f34 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -34,7 +34,7 @@ TEMPLATE = app
+ 
+ CONFIG += rtti stl exceptions
+ #CONFIG -= exceptions
+-QT += svg network xml core gui webenginewidgets concurrent printsupport
++QT += svg network xml core gui concurrent printsupport
+ win32-msvc* {
+     LIBS += -lzlib
+ } else {

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
index c4f7ac66d49..ef8f4c26acf 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps libproxy"
+IUSE="debug exif gps libproxy webengine"
 
 RDEPEND="
 	dev-qt/qtconcurrent:5
@@ -23,7 +23,6 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsingleapplication[X,qt5(+)]
 	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	sci-libs/gdal
@@ -32,6 +31,7 @@ RDEPEND="
 	exif? ( media-gfx/exiv2:= )
 	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
 	libproxy? ( net-libs/libproxy )
+	webengine? ( dev-qt/qtwebengine:5 )
 "
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826
 	"${FILESDIR}"/${P}-desktopfile.patch
+	"${FILESDIR}"/${P}-webengine{1,2,3}.patch
 )
 
 DOCS=( AUTHORS CHANGELOG )
@@ -78,6 +79,7 @@ src_configure() {
 		GEOIMAGE=$(usex exif 1 0) \
 		GPSDLIB=$(usex gps 1 0) \
 		LIBPROXY=$(usex libproxy 1 0) \
+		USEWEBENGINE=$(usex webengine 1 0) \
 		ZBAR=0 \
 		Merkaartor.pro
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/, sci-geosciences/merkaartor/files/
@ 2020-06-14 21:51 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-06-14 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     7eb1bf48e02f7e48c4ff82c0e4274b49246f247d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 20:32:00 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 21:51:38 2020 +0000
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 <asturm <AT> 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 00000000000..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 <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ 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 <QtCore/QString>
+ #include <QList>
++#include <QPainter>
++#include <QPainterPath>
++#include <QString>
+ 
+ #define CAST_FEATURE(x) (dynamic_cast<Feature*>(x))
+ #define CAST_NODE(x) (dynamic_cast<Node*>(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 )
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-06-14 21:52 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-14 21:51 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/, sci-geosciences/merkaartor/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2018-12-29 23:52 Andreas Sturmlechner
2018-08-05 15:37 Amy Liffey
2017-01-09 22:46 Andreas Sturmlechner
2016-03-14 23:21 Sam Jorna

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox