From 4283f2742c9c750d9ef4cfe21975852fa1828bdf Mon Sep 17 00:00:00 2001 From: Hanno Böck Date: Mon, 10 Aug 2009 22:01:15 +0000 Subject: viking fix for latest gpsd (Portage version: 2.2_rc38/cvs/Linux x86_64) --- sci-geosciences/viking/ChangeLog | 6 +++++- sci-geosciences/viking/files/viking-new-gpsd.diff | 22 ++++++++++++++++++++++ sci-geosciences/viking/viking-0.9.8.ebuild | 10 +++++++++- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 sci-geosciences/viking/files/viking-new-gpsd.diff (limited to 'sci-geosciences') diff --git a/sci-geosciences/viking/ChangeLog b/sci-geosciences/viking/ChangeLog index 3b58fc69712a..818afa7cb95e 100644 --- a/sci-geosciences/viking/ChangeLog +++ b/sci-geosciences/viking/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-geosciences/viking # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.6 2009/02/13 21:59:01 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.7 2009/08/10 22:01:15 hanno Exp $ + + 10 Aug 2009; Hanno Boeck viking-0.9.8.ebuild, + +files/viking-new-gpsd.diff: + Patch from trunk, fixes compilation with latest gpsd. *viking-0.9.8 (13 Feb 2009) diff --git a/sci-geosciences/viking/files/viking-new-gpsd.diff b/sci-geosciences/viking/files/viking-new-gpsd.diff new file mode 100644 index 000000000000..47fd6105344f --- /dev/null +++ b/sci-geosciences/viking/files/viking-new-gpsd.diff @@ -0,0 +1,22 @@ +diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c +index d5206bf..d06f5a3 100644 +--- a/src/vikgpslayer.c ++++ b/src/vikgpslayer.c +@@ -234,8 +234,6 @@ struct _VikGpsLayer { + GpsFix realtime_fix; + GpsFix last_fix; + +- enum unit realtime_gpsd_unit; +- + VikTrack *realtime_track; + gchar *realtime_track_name; + +@@ -470,8 +468,6 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) + vgl->realtime_track_pt1_gc = vik_viewport_new_gc ( vp, "red", 2 ); + vgl->realtime_track_pt2_gc = vik_viewport_new_gc ( vp, "green", 2 ); + vgl->realtime_track_pt_gc = vgl->realtime_track_pt1_gc; +- vgl->realtime_gpsd_unit = gpsd_units(); +- // fprintf(stderr, "DEBUG: gpsd_unit = %d\n", vgl->realtime_gpsd_unit); + vgl->realtime_track = NULL; + + /* Setting params here */ diff --git a/sci-geosciences/viking/viking-0.9.8.ebuild b/sci-geosciences/viking/viking-0.9.8.ebuild index 5a1234cba964..df55e5bffa40 100644 --- a/sci-geosciences/viking/viking-0.9.8.ebuild +++ b/sci-geosciences/viking/viking-0.9.8.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-0.9.8.ebuild,v 1.1 2009/02/13 21:59:01 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-0.9.8.ebuild,v 1.2 2009/08/10 22:01:15 hanno Exp $ + +inherit eutils DESCRIPTION="Viking is a program to manage GPS data." HOMEPAGE="http://viking.sourceforge.net/" @@ -20,6 +22,12 @@ DEPEND=">=x11-libs/gtk+-2.2.0 dev-util/intltool dev-util/pkgconfig" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/viking-new-gpsd.diff" +} + src_compile() { econf --enable-openstreetmap \ --enable-expedia \ -- cgit v1.2.3-65-gdbad