diff options
| -rw-r--r-- | sci-geosciences/monav/files/monav-0.3-mapnik-2.0.patch (renamed from sci-geosciences/monav/files/monav-0.3-mapnik2.patch) | 0 | ||||
| -rw-r--r-- | sci-geosciences/monav/files/monav-0.3-mapnik-2.1.patch | 12 | ||||
| -rw-r--r-- | sci-geosciences/monav/monav-0.3-r2.ebuild (renamed from sci-geosciences/monav/monav-0.3-r1.ebuild) | 10 |
3 files changed, 17 insertions, 5 deletions
diff --git a/sci-geosciences/monav/files/monav-0.3-mapnik2.patch b/sci-geosciences/monav/files/monav-0.3-mapnik-2.0.patch index 448a0cbe907..448a0cbe907 100644 --- a/sci-geosciences/monav/files/monav-0.3-mapnik2.patch +++ b/sci-geosciences/monav/files/monav-0.3-mapnik-2.0.patch 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 new file mode 100644 index 00000000000..9204edfd6f2 --- /dev/null +++ b/sci-geosciences/monav/files/monav-0.3-mapnik-2.1.patch @@ -0,0 +1,12 @@ +--- 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/monav-0.3-r1.ebuild b/sci-geosciences/monav/monav-0.3-r2.ebuild index a657d6218a9..d9736f5e34c 100644 --- a/sci-geosciences/monav/monav-0.3-r1.ebuild +++ b/sci-geosciences/monav/monav-0.3-r2.ebuild @@ -25,11 +25,11 @@ DEPEND="x11-libs/qt-core:4 dev-libs/protobuf )" RDEPEND="${DEPEND}" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-qmake.patch \ - "${FILESDIR}"/${P}-mapnik2.patch -} +PATCHES=( + "${FILESDIR}"/${P}-qmake.patch + "${FILESDIR}"/${P}-mapnik-2.0.patch + "${FILESDIR}"/${P}-mapnik-2.1.patch +) src_configure() { eqmake4 "${S}"/monavroutingdaemon.pro CONFIG+=nogui -o "${S}"/Makefile.routingdaemon |