From 7c59acba5699c9c58090a7a738669669a7307023 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 21 Aug 2021 23:14:26 +0100
Subject: gentoo resync : 21.08.2021

---
 sci-geosciences/foxtrotgps/Manifest                |  2 ++
 .../foxtrotgps-1.2.2-fix-some-receivers.patch      | 33 +++++++++++++++++++++
 .../foxtrotgps/foxtrotgps-1.2.2-r1.ebuild          | 34 ++++++++++++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch
 create mode 100644 sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild

(limited to 'sci-geosciences/foxtrotgps')

diff --git a/sci-geosciences/foxtrotgps/Manifest b/sci-geosciences/foxtrotgps/Manifest
index 36d93ad10eaf..82dbc2df852d 100644
--- a/sci-geosciences/foxtrotgps/Manifest
+++ b/sci-geosciences/foxtrotgps/Manifest
@@ -1,5 +1,7 @@
+AUX foxtrotgps-1.2.2-fix-some-receivers.patch 1098 BLAKE2B 33591dbe0c0b2d2704ec286535a7043cf8052fb0facccbfb345605edec94cbf8b6b2be7420d1ae0556fc0367d3bfadf4bae9abe8bd7fce3a05618830b66f24a3 SHA512 c3484641c627d518fbf0f12580e690de150c5b196e48e6313c86ac9498fad7572c95645d20c0b6e3587ce68dfdb05fdc7aa0ffb21f5e1bcd969df88fa803457f
 AUX foxtrotgps-1.2.2-gcc10.patch 591 BLAKE2B fac2f1f2f3ddbde8c1a959c58600183eacde1a541731d50da22c7e8ba5eb4c3bd64d1d5a6b92e6f85001d4bafb4eb0865421e72d9e48108ebf6e2fb2eec3d6e5 SHA512 b9dff10263f033021d89dfba583b7f0f7e34c06c8340126cf36a1d8145b2fd9e449edd64e7a9bb83d058597a8669567cda896521130c6804afc4286c54756e8b
 AUX foxtrotgps-1.2.2-gpsd-api9.patch 1178 BLAKE2B 9ca91432862f1b488b497d44a7252be373d560287c0751363b306dca32d1c21f9de93dfa6987e3b67ff35e340f626943c9c6843b715071e6fe4fdec6e22598b2 SHA512 a2c89485f1bfaa9053a1a8ee47e3803345334a1504ce7a6af2add8dd0ab7d17e9651651263e8141e27f21ab32c3bd5852e96ac42934e6422f9d236782b7b7cd8
 DIST foxtrotgps-1.2.2.tar.xz 1692120 BLAKE2B a8a70948992cd25609189caae3ec4136d056f86c85dc8b6e9610e935f60499f7bd78f083cc3f3e0904ec56eadb492babb7c8016e0270ea3285dadd99b32fcca8 SHA512 57b436221698fd81e58052f847e19999783e8dd1a165b196c80616591f22b36896454a87dd5a3c2c25bdd4654b8110dc0f320f70f0592ed58210fcc0be98f2ff
+EBUILD foxtrotgps-1.2.2-r1.ebuild 691 BLAKE2B 9a557caf8dd3640c61a74eea186d8e727667851a67c2722438302b5a69b2f94f88ca81e83a4d85c7da0c57212e2a5b17f740500ca183b381d5b06c0abc7c0927 SHA512 9c52e6ea6885a476488d8ed84e7379607091f9b11efae03f83b7eca25818baac19effafa086c0f26e024ac8e485b5fa50b21a3aa49b4fbd5b77dab863c5463c2
 EBUILD foxtrotgps-1.2.2.ebuild 646 BLAKE2B 08ad38e71d5a94f3fddd0b639a9b4e5c6f823ac28f860e977969c985d57ec6480181cb49bcb5ce9db89108df867f7e3d7af258db6d01caef18683805e2a661ad SHA512 461f2f41e97ccbd522b9f79494ea450943292c12178ee8a615c1d7448fa27374725f59cebb7e305b6d09f13fd8c19b165edca5df1f751c4a7faf22405c177e15
 MISC metadata.xml 638 BLAKE2B 80aa309f8c886fe6405df01099753668953aa7ec7d40ab908bdc743706db71be0ec4fd93fe5cc92871d84330f7f4133829cd90baede016c6b042a808f7106495 SHA512 e527ac4bbf4c1b1ee71264ca8d533bab5daecdc3bcb2e75f9464f79de4ff678d22c37c82bd6dae7cb64c65f67d56c13897dcc8f3eedf559cd584762db4b6c5e9
diff --git a/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch
new file mode 100644
index 000000000000..23930212f31f
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch
@@ -0,0 +1,33 @@
+From ea27c684924b8d8a560ca6fe1f25443624d54a93 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 18 Aug 2021 20:18:03 +0100
+Subject: [PATCH] Fix some GPS receivers
+
+Rebased version of upstream patch:
+https://bazaar.launchpad.net/~foxtrotgps-team/foxtrotgps/trunk/revision/329
+
+Conservatively added an extra API version check for gpsd.
+
+Bug: https://bugs.gentoo.org/808883
+---
+ src/gps_functions.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/gps_functions.c b/src/gps_functions.c
+index 602b06e..4f30cbb 100644
+--- a/src/gps_functions.c
++++ b/src/gps_functions.c
+@@ -762,7 +762,9 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition, gpointer data)
+ 		{
+ 			gpsdata->fix.time = (time_t) 0;
+ 		}
+-#if GPSD_API_MAJOR_VERSION >= 9
++#if GPSD_API_MAJOR_VERSION >= 10
++		gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX || libgps_gpsdata.fix.mode >= MODE_2D);
++#elif GPSD_API_MAJOR_VERSION >= 9
+ 		gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX);
+ #else
+ 		gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX);
+-- 
+2.33.0
+
diff --git a/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..cc36b1da8d8e
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2
+
+DESCRIPTION="Easy to use, fast and lightweight mapping application (fork of tangogps)"
+HOMEPAGE="https://www.foxtrotgps.org/"
+SRC_URI="https://www.foxtrotgps.org/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	gnome-base/libglade
+	media-libs/libexif
+	net-misc/curl
+	>=sci-geosciences/gpsd-2.90:=
+	sys-apps/dbus
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gpsd-api9.patch"
+	"${FILESDIR}/${P}-gcc10.patch"
+	"${FILESDIR}/${P}-fix-some-receivers.patch"
+)
-- 
cgit v1.2.3