summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Boeck <hanno@gentoo.org>2009-08-10 22:01:15 +0000
committerHanno Boeck <hanno@gentoo.org>2009-08-10 22:01:15 +0000
commit454e741649249f7639062bd865515b5c4879a672 (patch)
treec2d1c706b6033cf33636fc95193b634dbc61aa77 /sci-geosciences
parentFix typo in DESCRIPTION. (diff)
downloadhistorical-454e741649249f7639062bd865515b5c4879a672.tar.gz
historical-454e741649249f7639062bd865515b5c4879a672.tar.bz2
historical-454e741649249f7639062bd865515b5c4879a672.zip
viking fix for latest gpsd
Package-Manager: portage-2.2_rc38/cvs/Linux x86_64
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/viking/ChangeLog6
-rw-r--r--sci-geosciences/viking/Manifest11
-rw-r--r--sci-geosciences/viking/files/viking-new-gpsd.diff22
-rw-r--r--sci-geosciences/viking/viking-0.9.8.ebuild10
4 files changed, 42 insertions, 7 deletions
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 <hanno@gentoo.org> 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/Manifest b/sci-geosciences/viking/Manifest
index 9a2b24c3a322..7fd7a7d0f425 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,14 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX viking-new-gpsd.diff 764 RMD160 5345f5124e4e66295925f4a48e348c09dd9bc5d0 SHA1 ec32e298c882ffb2a09f44e69e205ae77e5f6769 SHA256 d40b98447817ae25a0b4db4b5bea6666cc35bb57cb6ce7aff3e56fd6ab653397
DIST viking-0.9.8.tar.gz 778565 RMD160 01484eaf1453b9cb8302a14161290d1c2714dbc0 SHA1 fa36293c6e926a20c6d209cbe6e1e0657e83e11d SHA256 4dfc76b477679aa6457953797c037874b1808d28a8e2b4631ca1ddd2a87948c7
-EBUILD viking-0.9.8.ebuild 1056 RMD160 119e9661e39fbb5844c01767d65d631ca921db1c SHA1 11243eca76888cf4f3d75a428c12f494e6f9c582 SHA256 57aaec3553b2240b857653507f173f6041e0b24e2dc619c432156ef26fe3b487
-MISC ChangeLog 1011 RMD160 b2dec5606c5b6de896cca99a35a1ff6937fad852 SHA1 9f111bb98292867816e9aabbc5a2a43cb2841251 SHA256 17b26706f6568d54cb3b0ad0dce2807db21aa96c8af51b10841a688a62354421
+EBUILD viking-0.9.8.ebuild 1157 RMD160 a06230baee54d653c715c553ea08beaed48779d7 SHA1 b54e731de52e71df847200517c7c7668246eb54d SHA256 6af95a1bd1d1d0cbf52d73b4a41b933a81ef6620f4e31c1e9f219d266244bd1f
+MISC ChangeLog 1166 RMD160 fa8f44b4adaea1f884ce94cce0f1dafe89a6b5f8 SHA1 0b15d39d2cb77c19ce7b2bb6f9b1dba0694dcedd SHA256 2140ccfda7d7bde8c6e2487aa9f5c12e7fd9d3f21bfd6d8d4959112dfa70ad9e
MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEUEARECAAYFAkqAl3wACgkQr2QksT29OyDreQCfd3c2ejhKC4CmFBQQBCLJSN/7
-PpcAmO1uhu8aR48J9z/geiMQIet98Uo=
-=afBw
+iEYEARECAAYFAkqAmKgACgkQr2QksT29OyDwhQCfS1fgV5KhK2hQ/ELBFlvNO4/I
+PqgAnR4roclcotPYpxl0lwMYD5F15KDn
+=iHrD
-----END PGP SIGNATURE-----
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 \