Hello community, here is the log from the commit of package collectd for openSUSE:Factory checked in at 2019-01-03 18:06:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectd (Old) and /work/SRC/openSUSE:Factory/.collectd.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "collectd" Thu Jan 3 18:06:47 2019 rev:30 rq:661974 version:5.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/collectd/collectd.changes 2018-06-13 15:39:32.776216258 +0200 +++ /work/SRC/openSUSE:Factory/.collectd.new.28833/collectd.changes 2019-01-03 18:06:47.268131843 +0100 @@ -1,0 +2,6 @@ +Sat Dec 29 14:59:06 UTC 2018 - mardnh@gmx.de + +- Add patch: + * 0001-gps-plugin-fix-build-with-newer-gpsd.patch + +------------------------------------------------------------------- New: ---- 0001-gps-plugin-fix-build-with-newer-gpsd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectd.spec ++++++ --- /var/tmp/diff_new_pack.nFkZly/_old 2019-01-03 18:06:47.884131295 +0100 +++ /var/tmp/diff_new_pack.nFkZly/_new 2019-01-03 18:06:47.888131291 +0100 @@ -64,6 +64,7 @@ Patch21: collectd-fix_collectd_config_path_in_snmp_probe.patch Patch23: collectd-javac_target.patch Patch24: 9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch +Patch25: 0001-gps-plugin-fix-build-with-newer-gpsd.patch # for /etc/apache2/... ownership (rpmlint): BuildRequires: apache2 BuildRequires: autoconf @@ -419,6 +420,7 @@ %if 0%{?suse_version} > 1320 %patch24 -p1 %endif +%patch25 -p1 sed -i 's|@@VERSION@@|%{version}|g' configure.ac ++++++ 0001-gps-plugin-fix-build-with-newer-gpsd.patch ++++++
From d5ec9075510601537cc76be4417ab337364506d0 Mon Sep 17 00:00:00 2001 From: Baruch Siach
Date: Tue, 9 Oct 2018 19:57:21 +0300 Subject: [PATCH] gps plugin: fix build with newer gpsd
gpsd version 3.18 changed the prototype of gps_read(). Make the gps_read() call depend on GPSD_API_MAJOR_VERSION to fix that. This fixes build failures like: gps.c: In function 'cgps_thread': gps.c:144:11: error: too few arguments to function 'gps_read' if (gps_read(&gpsd_conn) == -1) { ^~~~~~~~ (cherry picked from commit 991a6d3fd38c2435d94de3853fda36b3330cf6ab) --- src/gps.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gps.c b/src/gps.c index 1d32d049..b22c3a2e 100644 --- a/src/gps.c +++ b/src/gps.c @@ -141,7 +141,12 @@ static void *cgps_thread(void *pData) { continue; } - if (gps_read(&gpsd_conn) == -1) { +#if GPSD_API_MAJOR_VERSION > 6 + if (gps_read(&gpsd_conn, NULL, 0) == -1) +#else + if (gps_read(&gpsd_conn) == -1) +#endif + { WARNING("gps plugin: incorrect data! (err_count: %d)", err_count); err_count++; -- 2.16.4
participants (1)
-
root