tags 948388 +patch thanks
yes, your fix is correct, just needs a ckeck if the api version is >= 9.
Makes sense.
Maybe better would be to add following to navit to allow building while qtbase5-dev is installed. Building that way produces equal .deb packages.
Seems very sensible to me, it's not good for users to run into strange failures when they try to work on a package. I just took what has been discussed into this bugreport so-far and put it all together into a debdiff. If I get confirmation from users that the resulting package works and noone objects to me doing so I will likely NMU this later.
diff -Nru navit-0.5.3+dfsg.1/debian/changelog navit-0.5.3+dfsg.1/debian/changelog --- navit-0.5.3+dfsg.1/debian/changelog 2019-08-12 10:36:32.000000000 +0000 +++ navit-0.5.3+dfsg.1/debian/changelog 2020-01-18 00:37:31.000000000 +0000 @@ -1,3 +1,14 @@ +navit (0.5.3+dfsg.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with new gpsd (Closes: 948388) + (thanks to Bernhard Übelacker for the basic fix, and Bernd Zeimetz for + suggesting putting it behind a version check). + * Explicitly disable QT, to fix FTBFS when qtbase5-dev is installed. + (thanks to Bernhard Übelacker for the fix) + + -- Peter Michael Green <plugw...@debian.org> Sat, 18 Jan 2020 00:37:31 +0000 + navit (0.5.3+dfsg.1-2) unstable; urgency=medium * New patch gpsd-7.patch to support the new gps_read implementation diff -Nru navit-0.5.3+dfsg.1/debian/patches/gpsd-9.patch navit-0.5.3+dfsg.1/debian/patches/gpsd-9.patch --- navit-0.5.3+dfsg.1/debian/patches/gpsd-9.patch 1970-01-01 00:00:00.000000000 +0000 +++ navit-0.5.3+dfsg.1/debian/patches/gpsd-9.patch 2020-01-18 00:37:31.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Update for change in gpsd api 9 + thanks to Bernhard Übelacker for the basic fix, and Bernd Zeimetz for + suggesting putting it behind a version check. +Author: Peter Michael Green <plugw...@debian.org> +Bug-Debian: https://bugs.debian.org/948388 + +--- navit-0.5.3+dfsg.1.orig/navit/vehicle/gpsd/vehicle_gpsd.c ++++ navit-0.5.3+dfsg.1/navit/vehicle/gpsd/vehicle_gpsd.c +@@ -174,7 +174,11 @@ vehicle_gpsd_callback(struct gps_data_t + data->set &= ~MODE_SET; + } + if (data->set & TIME_SET) { ++#if GPSD_API_MAJOR_VERSION >= 9 ++ priv->fix_time = data->fix.time.tv_sec; ++#else + priv->fix_time = data->fix.time; ++#endif + data->set &= ~TIME_SET; + } + #ifdef HAVE_LIBGPS19 diff -Nru navit-0.5.3+dfsg.1/debian/patches/series navit-0.5.3+dfsg.1/debian/patches/series --- navit-0.5.3+dfsg.1/debian/patches/series 2019-08-12 10:36:04.000000000 +0000 +++ navit-0.5.3+dfsg.1/debian/patches/series 2020-01-18 00:37:31.000000000 +0000 @@ -1,3 +1,4 @@ path_max dpkg-cross.patch gpsd-7.patch +gpsd-9.patch diff -Nru navit-0.5.3+dfsg.1/debian/rules navit-0.5.3+dfsg.1/debian/rules --- navit-0.5.3+dfsg.1/debian/rules 2018-09-01 10:16:52.000000000 +0000 +++ navit-0.5.3+dfsg.1/debian/rules 2020-01-18 00:37:31.000000000 +0000 @@ -75,6 +75,9 @@ # Enable libspeechd CMAKEFLAGS += -Dspeech/speech_dispatcher=TRUE +# Disable Qt explicitly to allow building while qtbase5-dev is installed +CMAKEFLAGS += -DDISABLE_QT=TRUE + # Avoid floating point calculation for armel ifeq ($(DEB_HOST_ARCH), armel) CMAKEFLAGS += -DAVOID_FLOAT=TRUE
