diff options
| author | David Spencer <baildon.research@googlemail.com> | 2018-10-20 23:40:16 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-10-21 06:47:03 +0700 |
| commit | f8257a466f1379ed75e6107bc1672f91494670dd (patch) | |
| tree | d15ab22d1f1a4c4741ce1ebc7fe923236046b036 | |
| parent | 6b71a363e9e85bf83596ddc6e69bfe8956ae4046 (diff) | |
| download | slackbuilds-f8257a466f1379ed75e6107bc1672f91494670dd.tar.gz | |
gis/foxtrotgps: Fix build with gpsd-3.18.1.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
| -rw-r--r-- | gis/foxtrotgps/foxtrotgps-gpsd-3.18.patch | 11 | ||||
| -rw-r--r-- | gis/foxtrotgps/foxtrotgps.SlackBuild | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/gis/foxtrotgps/foxtrotgps-gpsd-3.18.patch b/gis/foxtrotgps/foxtrotgps-gpsd-3.18.patch new file mode 100644 index 0000000000..db19d19a28 --- /dev/null +++ b/gis/foxtrotgps/foxtrotgps-gpsd-3.18.patch @@ -0,0 +1,11 @@ +--- foxtrotgps-1.2.1/src/gps_functions.c.orig 2018-10-09 17:00:10.297646701 +0000 ++++ foxtrotgps-1.2.1/src/gps_functions.c 2018-10-09 17:00:43.751114273 +0000 +@@ -738,7 +738,7 @@ + if (!libgps_initialized) + return FALSE; + +- ret = gps_read(&libgps_gpsdata); ++ ret = gps_read(&libgps_gpsdata, NULL, 0); + /* Note that gps_read() will never actually return 0 + (zero-length reads are converted internally to a -1 return, + since they mean that the connection to the daemon has closed), diff --git a/gis/foxtrotgps/foxtrotgps.SlackBuild b/gis/foxtrotgps/foxtrotgps.SlackBuild index 709b23ba8d..f40d7d5127 100644 --- a/gis/foxtrotgps/foxtrotgps.SlackBuild +++ b/gis/foxtrotgps/foxtrotgps.SlackBuild @@ -26,12 +26,12 @@ PRGNAM=foxtrotgps VERSION=${VERSION:-1.2.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -71,6 +71,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Patch ripped off from Arch (thanks!) +patch -p1 < $CWD/foxtrotgps-gpsd-3.18.patch + # "--with-gconf-source" requires this, it will put all files in the package mkdir -p $PKG/etc/gconf/gconf.xml.defaults |