6 files changed, 21 insertions, 21 deletions
diff --git a/gis/foxtrotgps/foxtrotgps-1.2.2-fix-some-receivers.patch.gz b/gis/foxtrotgps/foxtrotgps-1.2.2-fix-some-receivers.patch.gz
new file mode 100644
index 0000000000..e67180d1ed
--- /dev/null
+++ b/gis/foxtrotgps/foxtrotgps-1.2.2-fix-some-receivers.patch.gz
diff --git a/gis/foxtrotgps/foxtrotgps-1.2.2-gcc10.patch.gz b/gis/foxtrotgps/foxtrotgps-1.2.2-gcc10.patch.gz
new file mode 100644
index 0000000000..da38c23f78
--- /dev/null
+++ b/gis/foxtrotgps/foxtrotgps-1.2.2-gcc10.patch.gz
diff --git a/gis/foxtrotgps/foxtrotgps-1.2.2-gpsd-api9.patch.gz b/gis/foxtrotgps/foxtrotgps-1.2.2-gpsd-api9.patch.gz
new file mode 100644
index 0000000000..6e8471a93d
--- /dev/null
+++ b/gis/foxtrotgps/foxtrotgps-1.2.2-gpsd-api9.patch.gz
diff --git a/gis/foxtrotgps/foxtrotgps-gpsd-3.18.patch b/gis/foxtrotgps/foxtrotgps-gpsd-3.18.patch
deleted file mode 100644
index db19d19a28..0000000000
--- a/gis/foxtrotgps/foxtrotgps-gpsd-3.18.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 f40d7d5127..02d2a1c653 100644
--- a/gis/foxtrotgps/foxtrotgps.SlackBuild
+++ b/gis/foxtrotgps/foxtrotgps.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for foxtrotgps
 
@@ -24,10 +24,13 @@
 
 # Modified by Mario Preksavec <mario at slackware dot hr>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=foxtrotgps
-VERSION=${VERSION:-1.2.1}
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,6 +74,10 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
+# thanks gentoo maintainers
+zcat $CWD/$PRGNAM-$VERSION-gpsd-api9.patch.gz | patch -p1
+zcat $CWD/$PRGNAM-$VERSION-gcc10.patch.gz | patch -p1
+zcat $CWD/$PRGNAM-$VERSION-fix-some-receivers.patch.gz | patch -p1
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -71,9 +85,6 @@ 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
 
@@ -113,4 +124,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/gis/foxtrotgps/foxtrotgps.info b/gis/foxtrotgps/foxtrotgps.info
index e3b03d6e4b..cd673a3b38 100644
--- a/gis/foxtrotgps/foxtrotgps.info
+++ b/gis/foxtrotgps/foxtrotgps.info
@@ -1,8 +1,8 @@
 PRGNAM="foxtrotgps"
-VERSION="1.2.1"
+VERSION="1.2.2"
 HOMEPAGE="https://www.foxtrotgps.org/"
-DOWNLOAD="https://www.foxtrotgps.org/releases/foxtrotgps-1.2.1.tar.xz"
-MD5SUM="b4042572edbbad13db6bc90eb9a7f11b"
+DOWNLOAD="https://www.foxtrotgps.org/releases/foxtrotgps-1.2.2.tar.xz"
+MD5SUM="3a7e7b94202134b51b11dcb80734eb7f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gpsd"