From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D0FE3138AC0 for ; Sun, 17 Feb 2013 19:41:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B21C21C008; Sun, 17 Feb 2013 19:41:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9DCF21C008 for ; Sun, 17 Feb 2013 19:41:50 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D140433BF3E for ; Sun, 17 Feb 2013 19:41:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6B90AE4073 for ; Sun, 17 Feb 2013 19:41:48 +0000 (UTC) From: "Dennis Schridde" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dennis Schridde" Message-ID: <1361130067.415a73ac0c4997a8c62dee10597b7484bda7866c.devurandom@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: sci-geosciences/monav/files/, sci-geosciences/monav/ X-VCS-Repository: proj/kde X-VCS-Files: sci-geosciences/monav/files/monav-0.3-mapnik-2.0.patch sci-geosciences/monav/files/monav-0.3-mapnik-2.1.patch sci-geosciences/monav/files/monav-0.3-mapnik2.patch sci-geosciences/monav/monav-0.3-r1.ebuild sci-geosciences/monav/monav-0.3-r2.ebuild X-VCS-Directories: sci-geosciences/monav/files/ sci-geosciences/monav/ X-VCS-Committer: devurandom X-VCS-Committer-Name: Dennis Schridde X-VCS-Revision: 415a73ac0c4997a8c62dee10597b7484bda7866c X-VCS-Branch: master Date: Sun, 17 Feb 2013 19:41:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7ba01f55-8d1d-4d9f-b900-e1bcd907e6f9 X-Archives-Hash: 182c629625614efc5ad25efe6c64a191 commit: 415a73ac0c4997a8c62dee10597b7484bda7866c Author: Dennis Schridde gmx net> AuthorDate: Sun Feb 17 19:41:07 2013 +0000 Commit: Dennis Schridde gmx net> CommitDate: Sun Feb 17 19:41:07 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=415a73ac [sci-geosciences/monav] Add patch for compatibility with sci-geosciences/mapnik-2.1.0 --- ....3-mapnik2.patch => monav-0.3-mapnik-2.0.patch} | 0 .../monav/files/monav-0.3-mapnik-2.1.patch | 12 ++++++++++++ .../{monav-0.3-r1.ebuild => monav-0.3-r2.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 similarity index 100% rename from sci-geosciences/monav/files/monav-0.3-mapnik2.patch rename to 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 0000000..9204edf --- /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 + #include + #include ++#include ++#include ++#include + #include + #include + #include diff --git a/sci-geosciences/monav/monav-0.3-r1.ebuild b/sci-geosciences/monav/monav-0.3-r2.ebuild similarity index 93% rename from sci-geosciences/monav/monav-0.3-r1.ebuild rename to sci-geosciences/monav/monav-0.3-r2.ebuild index a657d62..d9736f5 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