commit: 334fa4e6a40bd618cacf8edecf120efbcea810b7 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Mon Mar 28 11:53:48 2016 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Mon Mar 28 11:53:48 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=334fa4e6
sci-geosciences/monav: Remove Dead upstream. Based on kdelibs4. Never hit the tree. .../monav/files/monav-0.3-mapnik-2.0.patch | 45 ----------- .../monav/files/monav-0.3-mapnik-2.1.patch | 12 --- .../monav/files/monav-0.3-mapnik-2.2.patch | 15 ---- sci-geosciences/monav/files/monav-0.3-qmake.patch | 11 --- sci-geosciences/monav/metadata.xml | 16 ---- sci-geosciences/monav/monav-0.3-r3.ebuild | 89 ---------------------- 6 files changed, 188 deletions(-) diff --git a/sci-geosciences/monav/files/monav-0.3-mapnik-2.0.patch b/sci-geosciences/monav/files/monav-0.3-mapnik-2.0.patch deleted file mode 100644 index 448a0cb..0000000 --- a/sci-geosciences/monav/files/monav-0.3-mapnik-2.0.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: David Paleino <[email protected]> -Subject: port code to Mapnik2 -Origin: vendor -Forwarded: no - ---- - plugins/osmrenderer/mapnikrenderer.cpp | 10 +++++----- - plugins/osmrenderer/mapnikrenderer.pro | 2 +- - preprocessor/preprocessor-gui.pro | 2 +- - preprocessor/preprocessor.pro | 2 +- - 4 files changed, 8 insertions(+), 8 deletions(-) - ---- monav.orig/plugins/osmrenderer/mapnikrenderer.cpp -+++ monav/plugins/osmrenderer/mapnikrenderer.cpp -@@ -264,7 +264,7 @@ bool MapnikRenderer::Preprocess( IImport - const int metaTileSize = m_settings.metaTileSize * m_settings.tileSize + 2 * m_settings.margin; - - mapnik::Map map; -- mapnik::Image32 image( metaTileSize, metaTileSize ); -+ mapnik::image_32 image( metaTileSize, metaTileSize ); - QTemporaryFile tempOut; - QTemporaryFile tempIn; - mapnik::load_map( map, m_settings.theme.toLocal8Bit().constData() ); -@@ -288,9 +288,9 @@ bool MapnikRenderer::Preprocess( IImport - GPSCoordinate drawBottomRightGPS = drawBottomRight.ToGPSCoordinate(); - projection.forward( drawTopLeftGPS.longitude, drawBottomRightGPS.latitude ); - projection.forward( drawBottomRightGPS.longitude, drawTopLeftGPS.latitude ); -- mapnik::Envelope<double> boundingBox( drawTopLeftGPS.longitude, drawTopLeftGPS.latitude, drawBottomRightGPS.longitude, drawBottomRightGPS.latitude ); -- map.zoomToBox( boundingBox ); -- mapnik::agg_renderer<mapnik::Image32> renderer( map, image ); -+ mapnik::box2d<double> boundingBox( drawTopLeftGPS.longitude, drawTopLeftGPS.latitude, drawBottomRightGPS.longitude, drawBottomRightGPS.latitude ); -+ map.zoom_to_box( boundingBox ); -+ mapnik::agg_renderer<mapnik::image_32> renderer( map, image ); - renderer.apply(); - - std::string data; -@@ -299,7 +299,7 @@ bool MapnikRenderer::Preprocess( IImport - for ( int subX = 0; subX < metaTileSizeX; ++subX ) { - for ( int subY = 0; subY < metaTileSizeY; ++subY ) { - int indexNumber = ( y + subY - info.minY ) * ( info.maxX - info.minX ) + x + subX - info.minX; -- mapnik::image_view<mapnik::ImageData32> view = image.get_view( subX * m_settings.tileSize + m_settings.margin, subY * m_settings.tileSize + m_settings.margin, m_settings.tileSize, m_settings.tileSize ); -+ mapnik::image_view<mapnik::image_data_32> view = image.get_view( subX * m_settings.tileSize + m_settings.margin, subY * m_settings.tileSize + m_settings.margin, m_settings.tileSize, m_settings.tileSize ); - std::string result; - if ( !m_settings.deleteTiles || info.index[( x + subX - info.minX ) + ( y + subY - info.minY ) * ( info.maxX - info.minX )].size == 1 ) { - if ( m_settings.reduceColors ) diff --git a/sci-geosciences/monav/files/monav-0.3-mapnik-2.1.patch b/sci-geosciences/monav/files/monav-0.3-mapnik-2.1.patch deleted file mode 100644 index 9204edf..0000000 --- a/sci-geosciences/monav/files/monav-0.3-mapnik-2.1.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- monav.orig/plugins/osmrenderer/mapnikrenderer.cpp 2013-02-17 20:26:43.070848326 +0100 -+++ monav/plugins/osmrenderer/mapnikrenderer.cpp 2013-02-17 20:27:49.242941943 +0100 -@@ -30,6 +30,9 @@ - #include <mapnik/agg_renderer.hpp> - #include <mapnik/image_util.hpp> - #include <mapnik/load_map.hpp> -+#include <mapnik/graphics.hpp> -+#include <mapnik/image_view.hpp> -+#include <mapnik/config_error.hpp> - #include <omp.h> - #include <QFile> - #include <QTemporaryFile> diff --git a/sci-geosciences/monav/files/monav-0.3-mapnik-2.2.patch b/sci-geosciences/monav/files/monav-0.3-mapnik-2.2.patch deleted file mode 100644 index dea5bb8..0000000 --- a/sci-geosciences/monav/files/monav-0.3-mapnik-2.2.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- plugins/osmrenderer/mapnikrenderer.cpp.orig 2013-09-23 15:01:58.219962201 +0200 -+++ plugins/osmrenderer/mapnikrenderer.cpp 2013-09-23 15:05:25.059214873 +0200 -@@ -150,10 +150,9 @@ - - Timer time; - -- mapnik::datasource_cache::instance()->register_datasources( m_settings.plugins.toAscii().constData() ); -+ mapnik::datasource_cache::instance().register_datasources( m_settings.plugins.toAscii().constData() ); - QDir fonts( m_settings.fonts ); -- mapnik::projection projection; -- projection = mapnik::projection( "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over" ); -+ mapnik::projection projection( "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over" ); - mapnik::freetype_engine::register_font( fonts.filePath( "DejaVuSans.ttf" ).toAscii().constData() ); - mapnik::freetype_engine::register_font( fonts.filePath( "DejaVuSans-Bold.ttf" ).toAscii().constData() ); - mapnik::freetype_engine::register_font( fonts.filePath( "DejaVuSans-Oblique.ttf" ).toAscii().constData() ); diff --git a/sci-geosciences/monav/files/monav-0.3-qmake.patch b/sci-geosciences/monav/files/monav-0.3-qmake.patch deleted file mode 100644 index 5822da1..0000000 --- a/sci-geosciences/monav/files/monav-0.3-qmake.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/client/client.pro 2011-07-28 21:18:24.330394388 +0200 -+++ b/client/client.pro 2011-07-28 21:06:19.223851824 +0200 -@@ -91,7 +91,7 @@ - LIBS += -L../bin/plugins_client -lmapnikrendererclient -lcontractionhierarchiesclient -lgpsgridclient -losmrendererclient -lunicodetournamenttrieclient -lqtilerendererclient - - #required by osmrendererclient --QT += network -+QT += network mobility - CONFIG += mobility - MOBILITY += location - diff --git a/sci-geosciences/monav/metadata.xml b/sci-geosciences/monav/metadata.xml deleted file mode 100644 index 833b009..0000000 --- a/sci-geosciences/monav/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - </maintainer> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo KDE Project</name> - </maintainer> - <use> - <flag name="client">Build the monav client</flag> - <flag name="preprocessor">Build the monav preprocessor to turn OSM maps into monav maps</flag> - <flag name="preprocessor-gui">Build the GUI for the monav preprocessor</flag> - </use> -</pkgmetadata> diff --git a/sci-geosciences/monav/monav-0.3-r3.ebuild b/sci-geosciences/monav/monav-0.3-r3.ebuild deleted file mode 100644 index bbcf022..0000000 --- a/sci-geosciences/monav/monav-0.3-r3.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit qt4-r2 - -DESCRIPTION="State-of-the-art fast and exact routing with OpenStreetMap Data" -HOMEPAGE="http://code.google.com/p/monav/"; -SRC_URI="http://monav.googlecode.com/files/${P}.tar.gz"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="client +preprocessor preprocessor-gui" - -REQUIRED_USE="preprocessor? ( preprocessor-gui )" - -DEPEND=" - dev-qt/qtcore:4 - preprocessor? ( - app-arch/bzip2 - dev-libs/libxml2 - dev-libs/protobuf - sci-geosciences/mapnik - ) - preprocessor-gui? ( - dev-qt/qt-mobility[location] - client? ( dev-qt/qtgui:4 ) - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-qmake.patch - "${FILESDIR}"/${P}-mapnik-2.0.patch - "${FILESDIR}"/${P}-mapnik-2.1.patch - "${FILESDIR}"/${P}-mapnik-2.2.patch -) - -src_configure() { - eqmake4 "${S}"/monavroutingdaemon.pro CONFIG+=nogui -o "${S}"/Makefile.routingdaemon - - if use preprocessor ; then - eqmake4 "${S}"/monavpreprocessor.pro CONFIG+=nogui -o "${S}"/Makefile.preprocessor - fi - - if use preprocessor-gui ; then - eqmake4 "${S}"/monavpreprocessor-gui.pro -o "${S}"/Makefile.preprocessor-gui - fi - - if use client ; then - eqmake4 "${S}"/monavclient.pro -o "${S}"/Makefile.client - fi -} - -src_compile() { - emake -f "${S}"/Makefile.routingdaemon - - if use preprocessor ; then - emake -f "${S}"/Makefile.preprocessor - fi - - if use preprocessor-gui ; then - emake -f "${S}"/Makefile.preprocessor-gui - fi - - if use client ; then - emake -f "${S}"/Makefile.client - fi -} - -src_install() { - dobin bin/daemon-test - dobin bin/monav-daemon - - if use preprocessor ; then - dobin bin/monav-preprocessor - fi - - if use preprocessor-gui ; then - dobin bin/monav-preprocessor-gui - fi - - if use client ; then - dobin bin/monav - fi -}
