From e5b3ec269d0eae0d2370ae33c4236e7d3341c74a Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 14 Aug 2021 21:56:42 +0200
Subject: sci-geosciences/foxtrotgps: 1.2.2 version bump, EAPI-7 bump

Thanks-to: Alexander Bezrukov <phmagic@mail.ru>
Closes: https://bugs.gentoo.org/739568
Closes: https://bugs.gentoo.org/806986
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 sci-geosciences/foxtrotgps/Manifest                |  1 +
 .../foxtrotgps/files/foxtrotgps-1.2.2-gcc10.patch  | 24 ++++++++++++++
 .../files/foxtrotgps-1.2.2-gpsd-api9.patch         | 37 ++++++++++++++++++++++
 sci-geosciences/foxtrotgps/foxtrotgps-1.2.2.ebuild | 33 +++++++++++++++++++
 4 files changed, 95 insertions(+)
 create mode 100644 sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gcc10.patch
 create mode 100644 sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gpsd-api9.patch
 create mode 100644 sci-geosciences/foxtrotgps/foxtrotgps-1.2.2.ebuild

(limited to 'sci-geosciences/foxtrotgps')

diff --git a/sci-geosciences/foxtrotgps/Manifest b/sci-geosciences/foxtrotgps/Manifest
index 91b2999896a2..74d91ea4dc3f 100644
--- a/sci-geosciences/foxtrotgps/Manifest
+++ b/sci-geosciences/foxtrotgps/Manifest
@@ -1 +1,2 @@
 DIST foxtrotgps-1.2.0.tar.xz 1666752 BLAKE2B 35fa2c67376154d4e6e6d5c2fcd5f3584bc246f35d1295b37352e8394313ae1db6c981fb54ee34fcc80d34bf3a9167ec80fa25971df9ef512c2bdc4a37f7d933 SHA512 fdea60bb22b223512ba75651386dcd3c2f7843f18dea8bde85b7498d8909931d44c2d877338c57d3a3b9e46ede9a29e14ecb918182142bce7e8cb5f4e674cb1b
+DIST foxtrotgps-1.2.2.tar.xz 1692120 BLAKE2B a8a70948992cd25609189caae3ec4136d056f86c85dc8b6e9610e935f60499f7bd78f083cc3f3e0904ec56eadb492babb7c8016e0270ea3285dadd99b32fcca8 SHA512 57b436221698fd81e58052f847e19999783e8dd1a165b196c80616591f22b36896454a87dd5a3c2c25bdd4654b8110dc0f320f70f0592ed58210fcc0be98f2ff
diff --git a/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gcc10.patch b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gcc10.patch
new file mode 100644
index 000000000000..5a67f26de561
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gcc10.patch
@@ -0,0 +1,24 @@
+diff -ur a/src/callbacks.c b/src/callbacks.c
+--- a/src/callbacks.c	2019-07-10 08:35:12.000000000 +0300
++++ b/src/callbacks.c	2020-10-16 19:29:48.777271945 +0300
+@@ -46,7 +46,7 @@
+ static gboolean maximized = FALSE;
+ 
+ 
+-GtkWidget *dialog10 = NULL;
++static GtkWidget *dialog10 = NULL;
+ 
+ 
+ static int local_x = 0;
+diff -ur a/src/tracks.c b/src/tracks.c
+--- a/src/tracks.c	2019-07-10 08:35:12.000000000 +0300
++++ b/src/tracks.c	2020-10-16 19:30:12.205982533 +0300
+@@ -30,7 +30,7 @@
+ 
+ GSList *loaded_track = NULL;
+ GtkWidget *window12;
+-GtkWidget *dialog10;
++static GtkWidget *dialog10;
+ 
+ 
+ 
diff --git a/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gpsd-api9.patch b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gpsd-api9.patch
new file mode 100644
index 000000000000..87e973c47c8f
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gpsd-api9.patch
@@ -0,0 +1,37 @@
+diff -ur a/src/gps_functions.c b/src/gps_functions.c
+--- a/src/gps_functions.c
++++ b/src/gps_functions.c
+@@ -753,12 +753,20 @@
+ 	{
+ 		gpsdata->satellites_used = libgps_gpsdata.satellites_used;
+ 		gpsdata->hdop = libgps_gpsdata.dop.hdop;
++#if GPSD_API_MAJOR_VERSION >= 9 /* API change. gpsd version 3.20 and subsequent. */
++		gpsdata->fix.time = libgps_gpsdata.fix.time.tv_sec + (libgps_gpsdata.fix.time.tv_nsec*1e-9);
++#else
+ 		gpsdata->fix.time = libgps_gpsdata.fix.time;
++#endif
+ 		if (isnan(gpsdata->fix.time))
+ 		{
+ 			gpsdata->fix.time = (time_t) 0;
+ 		}
++#if GPSD_API_MAJOR_VERSION >= 9
++		gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX);
++#else
+ 		gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX);
++#endif
+ 		if (gpsdata->valid)
+ 		{
+ 			gpsdata->seen_valid = TRUE;
+@@ -767,7 +775,11 @@
+ 			gpsdata->fix.longitude = libgps_gpsdata.fix.longitude;
+ 			gpsdata->fix.speed = libgps_gpsdata.fix.speed;
+ 			gpsdata->fix.heading = libgps_gpsdata.fix.track;
++#if GPSD_API_MAJOR_VERSION >= 9
++			gpsdata->fix.altitude = libgps_gpsdata.fix.altMSL;
++#else
+ 			gpsdata->fix.altitude = libgps_gpsdata.fix.altitude;
++#endif
+ 		}
+ 
+ 		g_source_remove(watchdog);
+
diff --git a/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2.ebuild b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2.ebuild
new file mode 100644
index 000000000000..5db8c34ce191
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2.ebuild
@@ -0,0 +1,33 @@
+# 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"
+)
-- 
cgit v1.2.3-65-gdbad