commit: e93640d6db2ef27849988cd5258eb4f3b1e8a67e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Oct 17 04:25:34 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 17 04:25:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93640d6
sci-geosciences/foxtrotgps: fix patch for newer gpsd (again) I don't think the API define got bumped in 3.23.1? Closes: https://bugs.gentoo.org/818268 Closes: https://bugs.gentoo.org/739568 Closes: https://bugs.gentoo.org/806986 Closes: https://bugs.gentoo.org/808883 Signed-off-by: Sam James <sam <AT> gentoo.org> .../foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch | 2 +- sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 84dffb11efc..76d0c2d04a6 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 @@ -29,7 +29,7 @@ index 602b06e..0baea81 100644 } -#if GPSD_API_MAJOR_VERSION >= 9 - gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX); -+#if GPSD_API_MAJOR_VERSION >= 12 ++#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); diff --git a/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild index 9810966d440..cc36b1da8d8 100644 --- a/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild +++ b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild @@ -30,5 +30,5 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}-gpsd-api9.patch" "${FILESDIR}/${P}-gcc10.patch" - #"${FILESDIR}/${P}-fix-some-receivers.patch" + "${FILESDIR}/${P}-fix-some-receivers.patch" )
