diff options
| -rw-r--r-- | app-misc/gpsdrive/ChangeLog | 9 | ||||
| -rw-r--r-- | app-misc/gpsdrive/gpsdrive-2.10_pre7.ebuild | 18 |
2 files changed, 21 insertions, 6 deletions
diff --git a/app-misc/gpsdrive/ChangeLog b/app-misc/gpsdrive/ChangeLog index 9a0fde7267c2..fc63c902766a 100644 --- a/app-misc/gpsdrive/ChangeLog +++ b/app-misc/gpsdrive/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/gpsdrive -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.35 2009/11/17 05:39:46 nerdboy Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.36 2010/02/13 05:38:42 nerdboy Exp $ + + 13 Feb 2010; Steve Arnold <nerdboy@gentoo.org> gpsdrive-2.10_pre7.ebuild: + Fixed OSM icon path (bug #304045) and libgda dep (bug #281705). The boost + dep has been moved to mapnik, but has subtle breakage if mapnik is built + against anything other than the 1.39 version of boost. 17 Nov 2009; Steve Arnold <nerdboy@gentoo.org> gpsdrive-2.10_pre7.ebuild: Updated depends for boost and speech-dispatcher; fixes bug #293065). diff --git a/app-misc/gpsdrive/gpsdrive-2.10_pre7.ebuild b/app-misc/gpsdrive/gpsdrive-2.10_pre7.ebuild index 7be4328d6de0..3e621e7a8a5c 100644 --- a/app-misc/gpsdrive/gpsdrive-2.10_pre7.ebuild +++ b/app-misc/gpsdrive/gpsdrive-2.10_pre7.ebuild @@ -1,6 +1,7 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.10_pre7.ebuild,v 1.4 2009/11/17 05:39:46 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.10_pre7.ebuild,v 1.5 2010/02/13 05:38:42 nerdboy Exp $ + EAPI=2 inherit cmake-utils eutils fdo-mime @@ -26,8 +27,7 @@ COMMON_DEP="sci-geosciences/gpsd x11-libs/gtk+:2 dbus? ( dev-libs/dbus-glib ) gdal? ( sci-libs/gdal ) - mapnik? ( sci-geosciences/mapnik - >=dev-libs/boost-1.39.0 ) + mapnik? ( sci-geosciences/mapnik ) libgda? ( =gnome-extra/libgda-3.0*[postgres] ) speech? ( >=app-accessibility/speech-dispatcher-0.6.7 )" @@ -46,6 +46,16 @@ src_prepare() { -e "s:mapnik/0.5:mapnik:g" \ tests/gpsdriverc-in \ src/gpsdrive_config.c || die "sed failed" + + # update OSM icon paths + sed -i \ + -e "s|icons/map-icons|osm|g" \ + cmake/Modules/DefineInstallationPaths.cmake \ + scripts/osm/perl_lib/Geo/Gpsdrive/DB_Defaults.pm \ + scripts/osm/perl_lib/Geo/Gpsdrive/OSM.pm \ + src/icons.c \ + || die "sed failed" + # Fix desktop file... sed -i -e "s:gpsicon:/usr/share/icons/gpsdrive.png:g" \ -e "s:Graphics;Network;Geography:Education;Science;Geography;GPS:g" \ |