Fix building with gpsd-2.96. Fixes bug #371859. Patch taken from archlinux.

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

4 files changed, 66 insertions, 8 deletions

diff --git a/sci-geosciences/viking/ChangeLog b/sci-geosciences/viking/ChangeLog
index abe330e70da6..da46b06d8deb 100644
--- a/sci-geosciences/viking/ChangeLog
+++ b/sci-geosciences/viking/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/viking
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.13 2011/06/07 08:40:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.14 2011/06/17 08:39:56 scarabeus Exp $
+
+  17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> viking-1.2.ebuild,
+  +files/viking-gpsd-2.96.patch:
+  Fix building with gpsd-2.96. Fixes bug #371859. Patch taken from archlinux.
 
 *viking-1.2 (07 Jun 2011)
 
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 77cda51f000a..de4b24ce7b35 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX viking-gpsd-2.96.patch 2162 RMD160 39d74daddc7501db65c7208d0080d5cb82ac4462 SHA1 a7c469194ae04535549b7bac65365be0f66c5652 SHA256 7277a6f0bbe7b16440ca92a5975c6f0b38261f13bbbb6f04e4fc684b8965c902
 DIST viking-1.2.tar.gz 1049922 RMD160 4eb58636b35e13212761856a65d5161fd411d915 SHA1 a592ecfed5184acde584df4fbef241f76327b117 SHA256 d284f37025cc0ab319c52ceca0705210df938e9b36af3e74fc69baf27aeed8fd
-EBUILD viking-1.2.ebuild 1199 RMD160 105f7e836a5acde8cf0d6e1dc9f0aaa68de25f2e SHA1 8a92298af98b235a657a41bd26293e2890b12c16 SHA256 8907bf3b53cd34967910dc1645bd7aa775018f6f628a5692f668f8cd7adc08e6
-MISC ChangeLog 2050 RMD160 69cbb0b5736b2d58337b44d1f4cbb0484e921ae8 SHA1 89100c408c31df4317e2d2c8c22ad57f01188584 SHA256 987324b7d69527f81cb31a673f7c8beefcb8f9b242d21cfccbde0030cb1d476c
+EBUILD viking-1.2.ebuild 1270 RMD160 a77ad8cceaa11abd7c6363c58791b6c824dd07cc SHA1 d3db11cccaa6ab8b895fa61bcff19d7540748ea0 SHA256 c2e06e05528cbd8b68e32a0dfd7efd56f6f80e690f294b4b348b99142a77ebe7
+MISC ChangeLog 2236 RMD160 bfbdc40cf031760c3f50c7c9fd4d2c4375d48940 SHA1 0cd1e71ab5da73c3330b2bacec1ba2ab03c0a839 SHA256 ab88a3948468af5035e9ba31837c463556f588c38acb7aa3eeb77c3e8d2677fc
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3t4/4ACgkQHB6c3gNBRYdpVwCdH1TdXf8SdzO9Iip4gmDH1XDn
-WIQAnR0AX3ZzB2jJuHJX2ZhVV4FRIbxK
-=0mNa
+iEYEARECAAYFAk37EuYACgkQHB6c3gNBRYflGwCdGuZL0o4gowyhAM8LtV4Vx+6u
+GX0AoMzzQSg5liYJt99X6fqpGqwealcK
+=zF5C
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/viking/files/viking-gpsd-2.96.patch b/sci-geosciences/viking/files/viking-gpsd-2.96.patch
new file mode 100644
index 000000000000..01b117312a21
--- /dev/null
+++ b/sci-geosciences/viking/files/viking-gpsd-2.96.patch
@@ -0,0 +1,47 @@
+diff -wbBur viking-1.1/configure.ac viking-1.1.my/configure.ac
+--- viking-1.1/configure.ac	2011-02-08 21:29:01.000000000 +0000
++++ viking-1.1.my/configure.ac	2011-04-18 13:31:07.000000000 +0000
+@@ -244,7 +244,7 @@
+                [ac_cv_enable_realtimegpstracking], [ac_cv_enable_realtimegpstracking=yes])
+ case $ac_cv_enable_realtimegpstracking in
+   yes)
+-    AC_CHECK_LIB(gps,gps_poll,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking]))
++    AC_CHECK_LIB(gps,gps_read,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking]))
+     AC_DEFINE(VIK_CONFIG_REALTIME_GPS_TRACKING, [], [REALTIME GPS TRACKING STUFF])
+     ;;
+ esac
+diff -wbBur viking-1.1/src/vikgpslayer.c viking-1.1.my/src/vikgpslayer.c
+--- viking-1.1/src/vikgpslayer.c	2011-02-08 21:09:00.000000000 +0000
++++ viking-1.1.my/src/vikgpslayer.c	2011-04-18 13:35:48.000000000 +0000
+@@ -1377,8 +1377,11 @@
+ {
+   VikGpsLayer *vgl = data;
+   if (condition == G_IO_IN) {
+-    if (!gps_poll(&vgl->vgpsd->gpsd))
++    if (!gps_read(&vgl->vgpsd->gpsd))
++    {
++      gpsd_raw_hook(&vgl->vgpsd->gpsd, NULL);
+       return TRUE;
++    }
+     else {
+       g_warning("Disconnected from gpsd. Trying to reconnect");
+       rt_gpsd_disconnect(vgl);
+@@ -1408,7 +1411,8 @@
+ {
+   VikGpsLayer *vgl = (VikGpsLayer *)data;
+ #ifndef HAVE_GPS_OPEN_R
+-  struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port);
++  static struct gps_data_t __gd;
++  struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port, &__gd) ? NULL : &__gd;
+ 
+   if (gpsd == NULL) {
+ #else
+@@ -1439,7 +1443,7 @@
+     vik_trw_layer_add_track(vtl, vgl->realtime_track_name, vgl->realtime_track);
+   }
+ 
+-  gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook);
++//  gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook);
+   vgl->realtime_io_channel = g_io_channel_unix_new(vgl->vgpsd->gpsd.gps_fd);
+   vgl->realtime_io_watch_id = g_io_add_watch( vgl->realtime_io_channel,
+                     G_IO_IN | G_IO_ERR | G_IO_HUP, gpsd_data_available, vgl);
diff --git a/sci-geosciences/viking/viking-1.2.ebuild b/sci-geosciences/viking/viking-1.2.ebuild
index 2334701da216..94b138e73a3a 100644
--- a/sci-geosciences/viking/viking-1.2.ebuild
+++ b/sci-geosciences/viking/viking-1.2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-1.2.ebuild,v 1.1 2011/06/07 08:40:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-1.2.ebuild,v 1.2 2011/06/17 08:39:56 scarabeus Exp $
 
 EAPI=4
 
+inherit base
+
 DESCRIPTION="GPS data editor and analyzer"
 HOMEPAGE="http://viking.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -19,7 +21,7 @@ COMMONDEPEND="dev-libs/expat
 	sys-libs/zlib
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
-	gps? ( sci-geosciences/gpsd )
+	gps? ( >=sci-geosciences/gpsd-2.96 )
 "
 RDEPEND="${COMMONDEPEND}
 	sci-geosciences/gpsbabel
@@ -34,6 +36,10 @@ DEPEND="${COMMONDEPEND}
 
 DOCS=( README doc/GEOCODED-PHOTOS doc/GETTING-STARTED doc/GPSMAPPER )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-gpsd-2.96.patch
+)
+
 src_configure() {
 	econf \
 		--disable-deprecations \