Date: Friday, May 22, 2015 @ 13:45:54 Author: spupykin Revision: 133971
Added: gpsdrive/trunk/gpsd-3.14.patch Modified: gpsdrive/trunk/PKGBUILD -----------------+ PKGBUILD | 12 ++++++++---- gpsd-3.14.patch | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-05-22 10:58:42 UTC (rev 133970) +++ PKGBUILD 2015-05-22 11:45:54 UTC (rev 133971) @@ -6,7 +6,7 @@ pkgname=gpsdrive pkgver=2.11 _pkgver=20150407 -pkgrel=27 +pkgrel=28 pkgdesc="A car (bike, ship, plane) navigation system" arch=("i686" "x86_64") url="http://www.gpsdrive.de/" @@ -18,9 +18,11 @@ install="gpsdrive.install" #source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz") source=("http://arch.p5n.pp.ru/~sergej/dl/2015/${pkgname}-${_pkgver}.tar.xz" - "gpsdrive-perltovendor.patch") + "gpsdrive-perltovendor.patch" + "gpsd-3.14.patch") md5sums=('c363e751ba1e70e49b198a1889142ca5' - 'c28bc2dc51a76a39161bf540aebfab6c') + 'c28bc2dc51a76a39161bf540aebfab6c' + '77fa3d6b0437cff54505aedde7ab7230') prepare() { cd "$srcdir" @@ -32,7 +34,9 @@ sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c sed -i '22,1i#include <mapnik/graphics.hpp>' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp sed -i 's|datasource_cache::instance()->|datasource_cache::instance().|' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp - (cd gpsdrive-${_pkgver} && patch -p1 <$srcdir/gpsdrive-perltovendor.patch) + cd gpsdrive-${_pkgver} + patch -p1 <$srcdir/gpsdrive-perltovendor.patch + patch -p1 <$srcdir/gpsd-3.14.patch } build() { Added: gpsd-3.14.patch =================================================================== --- gpsd-3.14.patch (rev 0) +++ gpsd-3.14.patch 2015-05-22 11:45:54 UTC (rev 133971) @@ -0,0 +1,20 @@ +diff -wbBur gpsdrive-20150407/src/gps_handler.c gpsdrive-20150407.q/src/gps_handler.c +--- gpsdrive-20150407/src/gps_handler.c 2015-04-07 14:39:04.000000000 +0300 ++++ gpsdrive-20150407.q/src/gps_handler.c 2015-05-22 14:40:05.036450732 +0300 +@@ -443,11 +443,11 @@ + for (i=0;i<data->satellites;i++) + #endif + { +- gps_sats[i].used = data->used[i]; +- gps_sats[i].prn = data->PRN[i]; +- gps_sats[i].elevation = data->elevation[i]; +- gps_sats[i].azimuth = data->azimuth[i]; +- gps_sats[i].snr = data->ss[i]; ++ gps_sats[i].used = data->skyview[i].used; ++ gps_sats[i].prn = data->skyview[i].PRN; ++ gps_sats[i].elevation = data->skyview[i].elevation; ++ gps_sats[i].azimuth = data->skyview[i].azimuth; ++ gps_sats[i].snr = data->skyview[i].ss; + } + } +