Add upstream patch to fix compilation with newer gpsd versions, fixing bug 541646.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 73 insertions, 8 deletions

diff --git a/sci-geosciences/viking/ChangeLog b/sci-geosciences/viking/ChangeLog
index 6345a28fd409..f25acccaa101 100644
--- a/sci-geosciences/viking/ChangeLog
+++ b/sci-geosciences/viking/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/viking
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.28 2015/03/09 19:59:46 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.29 2015/03/10 18:42:06 graaff Exp $
+
+  10 Mar 2015; Hans de Graaff <graaff@gentoo.org> viking-1.5.1.ebuild,
+  +files/viking-1.5.1-gpsd-3.13.patch:
+  Add upstream patch to fix compilation with newer gpsd versions, fixing bug
+  541646.
 
   09 Mar 2015; Hans de Graaff <graaff@gentoo.org> viking-1.5.1.ebuild:
   Limit gpsd dependency to compatible versions for bug 541646.
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 7593d28b8617..5e3360cbb4cb 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -2,15 +2,16 @@
 Hash: SHA256
 
 AUX 1.3-autoreconf.patch 381 SHA256 c92829c5674aa7e965a4a4d3d8fd9b6263e9abd25dc9a2d1c31ebd73f9fb5f35 SHA512 d5b55410cf8b37aea7a0e1506e255f185d74d52a9fe9fefca18ccd480cc595f6e4b72215170ac39324400b695f7cdff86e6b108e3e38511e44ad6eafd7a730e9 WHIRLPOOL 586a8a2a5b3edeab94fefd3f7b26039dc70e47d3b9cc2c52c74b12d99e7b0ec7afb382aa39b5449884ac30925ec2ae4163134d1daa724b3c036dd2ab7128845e
+AUX viking-1.5.1-gpsd-3.13.patch 2338 SHA256 8e536f48288fec71dc1d8c4fce695149d46271cf9b8626a5ac14b108f7c490e6 SHA512 ec56b365bb2dac3b3051cf6acd4185c8dac1a58cf2cc566d6dc8ef0936d5e4a527bc9da986140aac655fcfa8bfcf8b272b96b9d5de54af6d494abebadab278fe WHIRLPOOL 4559a81360962ce747c4ff9806ad22332145d618b413b4b514599cc1a092ea278e5af4e13bc729ef39c536504072bd863b84804ef5135302c2cff0e149455d1f
 DIST viking-1.5.1.tar.bz2 1616172 SHA256 6c560c8665112732e575110e9a316638cf278f03b5ecd92ff8845419cb3d53ec SHA512 7c6320dd98f1fdfeeadf088223268774efcce899084d5989ebf9ac8f79370c408a427b01ea45a0fd1ad3bbb2ea99767a243666e5c03e0be36204a9fda5be9317 WHIRLPOOL 7e0c9068ffcf131180d1906e3c71825f8762722083523b033c66eb33ef26c228cb80d0846d50b261c55691688fd50c0e17c2342a4cbbfc8e1559d8e6b477126f
 DIST viking.pdf 383200 SHA256 b45d2c35c36484f9e3550c2b161fc7c60609e0f1f6f163f73ff70886f5532138 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee WHIRLPOOL b674549c160429de8757f337699d596be2573158a64f6d873b59769eddc1afa8519e4ab0ac8f13f6a36b57da11f85c5f1fa061eb06ba61cdc026bbc4702ab33e
-EBUILD viking-1.5.1.ebuild 1507 SHA256 0db48c47abbb449ab5de9b73416008724cb115eda0bc337a48e23037d7324cf7 SHA512 f23abc7158b913c74cfb85a298a6085330ab195c5f5aeac281f5d83034c557b0086bedf8ac1965e6c5b58302ce6d01e5924cf3bd4dae6cb8951dec770fcf153c WHIRLPOOL 866bb4d31dbfedafa7d2d1aded6de0622945889ace427d75458c6bd514db33380fad401a55b13a3103d87f709c9766e7fc046d2bd56a64d7c83cfecc0cda85d9
-MISC ChangeLog 4476 SHA256 89528cb30c29e858a8e78ff6da2102778fed1edbafe5caba665be73ac7490e86 SHA512 36a361df15cba4d0bbfef99361e6d7edcc53c3fe27d19823b5ff94adc78f3ef91a80b28f655497f60a875e0d8fbbbacb871ebd838ec2032befba513d8981cea6 WHIRLPOOL 9d509e40c15e789c90229b4c6b1ed1fd8b8a1522c78288a3820bf76be208628038f372055d56153cf92db37965c3ecd8ca6320543dac988e27721733d1ca2076
+EBUILD viking-1.5.1.ebuild 1558 SHA256 f107c22d08dec943dcc93d2ab6dabec35ccc98b143e58194fde7d8dff3158525 SHA512 a7131e3d2afcdc1c50dad665facfa3880f5cba8b23f7a33f7d500e89cfc1fc088c540e3ca66d9422ea385fd23a0b66aa10e59a1189ed5d02c1937be50237ebe8 WHIRLPOOL 00f65bd180b25aa6406561bc07ceec802f2bb535a079ba6aca042d3ca44591167109b202c39fdd9ef18bb7d2add8aad988e1c4bdc3afa45751b58e3d960abaab
+MISC ChangeLog 4674 SHA256 770871fa3712195f3d811e5147f942dff9da08c582151d70782f88609c6170f6 SHA512 fb248de7a2400f2f28c2e0e8aadc3f1add45762cd32a2520de2570fab2357fe3c5c21417ee1150538f3c177e5ddea407cb6b8af73e2277cb0114ade5f04b6079 WHIRLPOOL 19b4ceb3dccad1a7306ad06593bcf916c5a19f933e97e91c31cb4969d322ba3678c8b2a06755388cecc337e45ad73ead018f0b285d2ab52d3c6a58f8c20171c2
 MISC metadata.xml 333 SHA256 bb967dc1a9840b18f72aeb0a3625b3bf5924d279e994ff9c8a6e828172159b26 SHA512 44d56cbf00e8a25018d6f4e48c199a45d881ebed9fa4a995443087e3f69ea2bf86af990128b8b635c00e542f3921c1e55db0187781769caa78d837e9d17f08d7 WHIRLPOOL 084764a954207fd73c9179005ff6037c5b94f5e062bda065071a0fb584a909bca781b367cbd1bd50902a99a63edb4c17ed370191a910924782904396b00a3c28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlT9+7MACgkQiIP6VqMIqNfYAwD+K5pKS4KI8Hh+SfTzv9cOOk01
-51cMFbHi5rQquxpTw6IA+gIRZsA79tbrkwwaZ3F5B93DwCDYtNqaIlPdapl/MZSP
-=3js7
+iF4EAREIAAYFAlT/Ov8ACgkQiIP6VqMIqNfh3QD9EhBxZDmZq/oJ8OIPM4GUkOwo
+u+0iWPv/CtGA7EKKqmgA/0eTRblqm5/xr4L+UjHyuEihegiZEw2q05QZmki5qe9x
+=AqCD
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/viking/files/viking-1.5.1-gpsd-3.13.patch b/sci-geosciences/viking/files/viking-1.5.1-gpsd-3.13.patch
new file mode 100644
index 000000000000..d559746ff81c
--- /dev/null
+++ b/sci-geosciences/viking/files/viking-1.5.1-gpsd-3.13.patch
@@ -0,0 +1,53 @@
+commit 25043ca24a55468dc9eeaa7335a24d132c51b07d
+Author: Rob Norris <rw_norris@hotmail.com>
+Date:   Mon Mar 9 23:25:15 2015 +0000
+
+    SF Bugs#117: Confirm capability with GPSD_API_MAJOR_VERSION=6 (gpsd 3.12 / libgps.so.22)
+
+diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c
+index daf6d42..ca4be29 100644
+--- a/src/vikgpslayer.c
++++ b/src/vikgpslayer.c
+@@ -1673,7 +1673,7 @@ static gboolean gpsd_data_available(GIOChannel *source, GIOCondition condition,
+   if (condition == G_IO_IN) {
+ #if GPSD_API_MAJOR_VERSION == 3 || GPSD_API_MAJOR_VERSION == 4
+     if (!gps_poll(&vgl->vgpsd->gpsd)) {
+-#elif GPSD_API_MAJOR_VERSION == 5
++#elif GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
+     if (gps_read(&vgl->vgpsd->gpsd) > -1) {
+       // Reuse old function to perform operations on the new GPS data
+       gpsd_raw_hook(vgl->vgpsd, NULL);
+@@ -1718,7 +1718,7 @@ static gboolean rt_gpsd_try_connect(gpointer *data)
+   vgl->vgpsd = g_malloc(sizeof(VglGpsd));
+ 
+   if (gps_open_r(vgl->gpsd_host, vgl->gpsd_port, /*(struct gps_data_t *)*/vgl->vgpsd) != 0) {
+-#elif GPSD_API_MAJOR_VERSION == 5
++#elif GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
+   vgl->vgpsd = g_malloc(sizeof(VglGpsd));
+   if (gps_open(vgl->gpsd_host, vgl->gpsd_port, &vgl->vgpsd->gpsd) != 0) {
+ #else
+@@ -1757,7 +1757,7 @@ static gboolean rt_gpsd_try_connect(gpointer *data)
+ #if GPSD_API_MAJOR_VERSION == 3
+   gps_query(&vgl->vgpsd->gpsd, "w+x");
+ #endif
+-#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5
++#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
+   gps_stream(&vgl->vgpsd->gpsd, WATCH_ENABLE, NULL);
+ #endif
+ 
+@@ -1813,13 +1813,13 @@ static void rt_gpsd_disconnect(VikGpsLayer *vgl)
+     vgl->realtime_io_channel = NULL;
+   }
+   if (vgl->vgpsd) {
+-#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5
++#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
+     gps_stream(&vgl->vgpsd->gpsd, WATCH_DISABLE, NULL);
+ #endif
+     gps_close(&vgl->vgpsd->gpsd);
+ #if GPSD_API_MAJOR_VERSION == 3
+     free(vgl->vgpsd);
+-#elif GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5
++#elif GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
+     g_free(vgl->vgpsd);
+ #endif
+     vgl->vgpsd = NULL;
diff --git a/sci-geosciences/viking/viking-1.5.1.ebuild b/sci-geosciences/viking/viking-1.5.1.ebuild
index 26e17c1e9642..dea09aa1cf12 100644
--- a/sci-geosciences/viking/viking-1.5.1.ebuild
+++ b/sci-geosciences/viking/viking-1.5.1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-1.5.1.ebuild,v 1.2 2015/03/09 19:59:46 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-1.5.1.ebuild,v 1.3 2015/03/10 18:42:06 graaff Exp $
 
 EAPI=5
 
+inherit eutils
+
 DESCRIPTION="GPS data editor and analyzer"
 HOMEPAGE="http://viking.sourceforge.net/"
 IUSE="doc +exif gps +magic nls"
@@ -23,7 +25,7 @@ COMMONDEPEND="
 	sys-libs/zlib
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
-	gps? ( >=sci-geosciences/gpsd-2.96 <sci-geosciences/gpsd-3.12 )
+	gps? ( >=sci-geosciences/gpsd-2.96 )
 	exif? ( media-libs/libexif )
 	magic? ( sys-apps/file )
 "
@@ -40,6 +42,10 @@ DEPEND="${COMMONDEPEND}
 	sys-devel/gettext
 "
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gpsd-3.13.patch
+}
+
 src_configure() {
 	econf \
 		--disable-deprecations \