gentoo resync : 17.08.2021

4 files changed, 76 insertions, 8 deletions

diff --git a/sci-geosciences/foxtrotgps/Manifest b/sci-geosciences/foxtrotgps/Manifest
index 6ae1d6b7e0aa..36d93ad10eaf 100644
--- a/sci-geosciences/foxtrotgps/Manifest
+++ b/sci-geosciences/foxtrotgps/Manifest
@@ -1,3 +1,5 @@
-DIST foxtrotgps-1.2.0.tar.xz 1666752 BLAKE2B 35fa2c67376154d4e6e6d5c2fcd5f3584bc246f35d1295b37352e8394313ae1db6c981fb54ee34fcc80d34bf3a9167ec80fa25971df9ef512c2bdc4a37f7d933 SHA512 fdea60bb22b223512ba75651386dcd3c2f7843f18dea8bde85b7498d8909931d44c2d877338c57d3a3b9e46ede9a29e14ecb918182142bce7e8cb5f4e674cb1b
-EBUILD foxtrotgps-1.2.0.ebuild 573 BLAKE2B 71f083ebf95068d8b460e33a4d4f26aa2addac2d0214c58ff299fd7d489d09c70eda1b9892490e70cd0ca921ea087b652b94e299aca67c3a345ae6f0c12e78ac SHA512 63384198a99a4634cf2c17d4be7af217e40844773f72c2a4f025432c5c7d9faeb937f894b8827e87c6a9ad58e23197d8b4302b0a20c795ee903c1ce0ca6b98d8
+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.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-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.0.ebuild b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2.ebuild
index f3c9efbbf8e6..5db8c34ce191 100644
--- a/sci-geosciences/foxtrotgps/foxtrotgps-1.2.0.ebuild
+++ b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit gnome2
 
@@ -11,18 +11,23 @@ SRC_URI="https://www.foxtrotgps.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-libs/libxml2:2
-	gnome-base/gconf:2
 	gnome-base/libglade
 	media-libs/libexif
 	net-misc/curl
-	>=sci-geosciences/gpsd-2.90
+	>=sci-geosciences/gpsd-2.90:=
 	sys-apps/dbus
 	x11-libs/gtk+:2
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 "
+
+PATCHES=(
+	"${FILESDIR}/${P}-gpsd-api9.patch"
+	"${FILESDIR}/${P}-gcc10.patch"
+)