Hello community, here is the log from the commit of package ocli for openSUSE:Factory checked in at 2020-11-08 20:59:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocli (Old) and /work/SRC/openSUSE:Factory/.ocli.new.11331 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocli" Sun Nov 8 20:59:37 2020 rev:4 rq:846947 version:0.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ocli/ocli.changes 2020-06-06 23:40:40.921156433 +0200 +++ /work/SRC/openSUSE:Factory/.ocli.new.11331/ocli.changes 2020-11-08 20:59:48.548230772 +0100 @@ -1,0 +2,6 @@ +Thu Nov 5 10:20:57 UTC 2020 - Martin Hauke <mar...@gmx.de> + +- Add patch: + * 0001-FIX-adapted-for-gpsd-3.21.patch + +------------------------------------------------------------------- New: ---- 0001-FIX-adapted-for-gpsd-3.21.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocli.spec ++++++ --- /var/tmp/diff_new_pack.LN3I9X/_old 2020-11-08 20:59:49.368229182 +0100 +++ /var/tmp/diff_new_pack.LN3I9X/_new 2020-11-08 20:59:49.372229173 +0100 @@ -26,6 +26,7 @@ URL: https://github.com/owntracks/ocli Source: https://github.com/owntracks/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: 0001-FIX-adapted-for-gpsd-3.20.patch +Patch1: 0001-FIX-adapted-for-gpsd-3.21.patch BuildRequires: gpsd-devel BuildRequires: mosquitto-devel Provides: owntracks-cli-publisher @@ -39,6 +40,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build export CFLAGS="%{optflags}" ++++++ 0001-FIX-adapted-for-gpsd-3.21.patch ++++++ >From 454539fba3c81fec4c1321cc52f6344c5a1c0e39 Mon Sep 17 00:00:00 2001 From: Martin Hauke <mar...@gmx.de> Date: Thu, 5 Nov 2020 11:15:59 +0100 Subject: [PATCH] [FIX] adapted for gpsd >= 3.21 With gpsd v3.21 gps_data_t->status was moved to gps_fix_t.status --- owntracks-cli-publisher.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/owntracks-cli-publisher.c b/owntracks-cli-publisher.c index f7c2be6..14c51e3 100644 --- a/owntracks-cli-publisher.c +++ b/owntracks-cli-publisher.c @@ -394,7 +394,11 @@ static void conditionally_log_fix(struct udata *ud, struct gps_data_t *gpsdata) } if (gpsdata->set & STATUS_SET) { +#if GPSD_API_MAJOR_VERSION >= 10 + switch (gpsdata->fix.status) { +#else switch (gpsdata->status) { +#endif case STATUS_FIX: #ifdef STATUS_DGPS_FIX case STATUS_DGPS_FIX: -- 2.29.1
