mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
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
This commit is contained in:
Sam Jorna (wraeth)
committed by
Sam Jorna
Sam Jorna
parent
8c96273f1f
commit
c11ac51e22
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
134
sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
Normal file
134
sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
Normal file
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user