diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
commit | 46eedbedafdb0040c37884982d4c775ce277fb7b (patch) | |
tree | db33a91259730be84999e13a8d8168c799f50ac0 /sci-geosciences/foxtrotgps | |
parent | e23a08d0c97a0cc415aaa165da840b056f93c997 (diff) |
gentoo resync : 20.10.2021
Diffstat (limited to 'sci-geosciences/foxtrotgps')
-rw-r--r-- | sci-geosciences/foxtrotgps/Manifest | 2 | ||||
-rw-r--r-- | sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch | 30 |
2 files changed, 20 insertions, 12 deletions
diff --git a/sci-geosciences/foxtrotgps/Manifest b/sci-geosciences/foxtrotgps/Manifest index 5c4de42a3450..f911d6b6ce64 100644 --- a/sci-geosciences/foxtrotgps/Manifest +++ b/sci-geosciences/foxtrotgps/Manifest @@ -1,4 +1,4 @@ -AUX foxtrotgps-1.2.2-fix-some-receivers.patch 1098 BLAKE2B 33591dbe0c0b2d2704ec286535a7043cf8052fb0facccbfb345605edec94cbf8b6b2be7420d1ae0556fc0367d3bfadf4bae9abe8bd7fce3a05618830b66f24a3 SHA512 c3484641c627d518fbf0f12580e690de150c5b196e48e6313c86ac9498fad7572c95645d20c0b6e3587ce68dfdb05fdc7aa0ffb21f5e1bcd969df88fa803457f +AUX foxtrotgps-1.2.2-fix-some-receivers.patch 1439 BLAKE2B b84bac776f7a55af7ee52d18e960ef1fa1016c811baea874e1f7ce6e73150c0e61d4dd5ed9374d087ac73ee176616328cd8f1ac99045c669248f3a635c7f2856 SHA512 62a0ba6521e423590c22e7391f4f24b8a62044d6aea219356ae7fad3ac3d95d63b34890c53fc18347efed122b96340e3f7e7c525a2de37da13887007cafb08d0 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 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 index 23930212f31f..76d0c2d04a6d 100644 --- 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 @@ -1,33 +1,41 @@ -From ea27c684924b8d8a560ca6fe1f25443624d54a93 Mon Sep 17 00:00:00 2001 +https://bugs.gentoo.org/739568 +https://bugs.gentoo.org/806986 +https://bugs.gentoo.org/808883 +https://bugs.gentoo.org/818268 + +From 86989085a3010cb83a094a788cd83a4654c9eb3c 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 +Subject: [PATCH] Fix some GPS receivers (and fix build with newer gpsd API 12) Rebased version of upstream patch: https://bazaar.launchpad.net/~foxtrotgps-team/foxtrotgps/trunk/revision/329 -Conservatively added an extra API version check for gpsd. +See https://github.com/ntpsec/gpsd/commit/d4a4d8d3606fd50f10bcd20096a8a0cdb8b2d427 +re API change. Bug: https://bugs.gentoo.org/808883 --- - src/gps_functions.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + src/gps_functions.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gps_functions.c b/src/gps_functions.c -index 602b06e..4f30cbb 100644 +index 602b06e..0baea81 100644 --- a/src/gps_functions.c +++ b/src/gps_functions.c -@@ -762,7 +762,9 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition, gpointer data) +@@ -762,8 +762,10 @@ 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); ++#if GPSD_API_MAJOR_VERSION >= 12 && defined(STATUS_UNK) ++ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_UNK || libgps_gpsdata.fix.mode >= MODE_2D); ++#elif 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); + #endif -- -2.33.0 +2.33.1 |