gpsd: update to 3.20 (soname bump)

common/shlibs

@@ -81,7 +81,7 @@ libmenuw.so.5 ncurses-libs-5.9_13 ignore
 libmenuw.so.6 ncurses-libs-5.8_1 ignore
 libobjc.so.4 libobjc-4.7.3_12
 libgomp.so.1 libgomp-4.4.0_1
-libgps.so.24 gpsd-3.18.1_1
+libgps.so.25 gpsd-3.20_1
 libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
@@ -442,7 +442,7 @@ libdca.so.0 libdca-0.0.5_1
 libmpeg2.so.0 libmpeg2-0.5.1_1
 libmpeg2convert.so.0 libmpeg2-0.5.1_1
 libmng.so.2 libmng-2.0.2_1
-libQgpsmm.so.24 gpsd-qt-3.18.1_1
+libQgpsmm.so.25 gpsd-qt-3.20_1
 libQtAssistantClient.so qt-4.5.3_1
 libQtXmlPatterns.so.4 qt-4.5.3_1
 libQtScriptTools.so.4 qt-4.5.3_1

srcpkgs/gpsd/patches/SConstruct-cross.patch

@@ -0,0 +1,13 @@
+--- SConstruct~	2020-01-01 02:31:27.000000000 +0100
++++ SConstruct	2020-05-17 11:20:07.334411693 +0200
+@@ -629,6 +629,10 @@
+ 
+     # run it
+     ret = context.TryRun(program, '.c')
++    if not ret[1]:
++        # Assume 8
++        context.Result("unchecked")
++        return '8'
+     context.Result(ret[0])
+     return ret[1]
+ 

srcpkgs/gpsd/patches/SContruct-python-manpages.patch

@@ -1,56 +0,0 @@
-From 02d21faebec245e1526449fb54e7078914d75db7 Mon Sep 17 00:00:00 2001
-From: "Gary E. Miller" <gem@rellim.com>
-Date: Thu, 1 Nov 2018 15:49:01 -0700
-Subject: SConstruct:  Do not crash when not building python man pages.
-
----
- SConstruct | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 0fc3614..0226cd2 100644
---- SConstruct
-+++ SConstruct
-@@ -1751,14 +1751,19 @@ if tiocmiwait:
-         "ppscheck.8": "ppscheck.xml",
-     })
- 
--all_manpages = list(base_manpages.keys()) + list(python_manpages.keys())
-+all_manpages = list(base_manpages.keys())
-+if python_manpages:
-+    all_manpages += list(python_manpages.keys())
- 
- man_env = env.Clone()
- if man_env.GetOption('silent'):
-     man_env['SPAWN'] = filtered_spawn  # Suppress stderr chatter
- manpage_targets = []
- if manbuilder:
--    items = list(base_manpages.items()) + list(python_manpages.items())
-+    items = list(base_manpages.items())
-+    if python_manpages:
-+        items += list(python_manpages.items())
-+
-     for (man, xml) in items:
-         manpage_targets.append(man_env.Man(source=xml, target=man))
- 
-@@ -1907,7 +1912,7 @@ if qt_env:
- 
- 
- maninstall = []
--for manpage in list(base_manpages.keys()) + list(python_manpages.keys()):
-+for manpage in all_manpages:
-     if not manbuilder and not os.path.exists(manpage):
-         continue
-     section = manpage.split(".")[1]
-@@ -2517,7 +2522,7 @@ if os.path.exists("gpsd.c") and os.path.exists(".gitignore"):
-     if ".gitignore" in distfiles:
-         distfiles.remove(".gitignore")
-     distfiles += generated_sources
--    distfiles += list(base_manpages.keys()) + list(python_manpages.keys())
-+    distfiles += all_manpages
-     if "packaging/rpm/gpsd.spec" not in distfiles:
-         distfiles.append("packaging/rpm/gpsd.spec")
- 
--- 
-cgit v1.0-41-gc330
-

srcpkgs/gpsd/template

@@ -1,37 +1,40 @@
 # Template file for 'gpsd'
 pkgname=gpsd
-version=3.18.1
+version=3.20
 revision=1
 build_style=scons
 make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin
  udevdir=/usr/lib/udev CC=${CC} qt_versioned=5"
 make_install_args="$make_build_args"
 make_install_target=udev-install
-hostmakedepends="pkg-config bc python libxslt xmlto asciidoc ncurses"
+hostmakedepends="pkg-config bc python-pyserial libxslt xmlto asciidoc ncurses"
-makedepends="eudev-libudev-devel ntp libusb-devel ncurses-devel
+makedepends="eudev-libudev-devel ntp libusb-devel ncurses-devel gtk+3-devel
- pps-tools-devel libcap-devel libbluetooth-devel"
+ pps-tools-devel libcap-devel libbluetooth-devel qt5-devel"
 short_desc="GPS/AIS receiver monitoring daemon"
 maintainer="uriahheep <uriahheep@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://www.catb.org/gpsd/"
-distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.gz"
+distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.xz"
-checksum=5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e
+checksum=3998a5cbb728e97f896f46c3c83301b1e6c5d859393e58c2fad8c5426774d571
-python_version=2 #unverified
+python_version=2	# Must be same version as scons
 system_accounts="gpsd"
 
-subpackages="gpsd-devel"
+subpackages="gpsd-devel gpsd-qt gpsd-qt-devel"
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" gpsd-python gpsd-xgps gpsd-qt gpsd-qt-devel"
+	subpackages+=" gpsd-python gpsd-xgps"
-	makedepends+=" qt5-devel python-devel python-gobject-devel"
+	makedepends+=" python-devel python-gobject-devel"
 else
+	# xxx scons uses its environment to build python stuff; so arch
+	# and python version must match. This should be fixed.
 	make_build_args+=" python=0"
 fi
 
 pre_build() {
-	unset CPPFLAGS
+	unset LD
 }
 
 pre_install() {
+	unset LD
 	export DESTDIR=${DESTDIR}
 	makejobs="-j1"
 }
@@ -40,24 +43,29 @@ post_install() {
 	vsv gpsd
 	vlicense COPYING
 	vlicense AUTHORS
+	vbin gpsinit
 	if [ -z "$CROSS_BUILD" ]; then
 		mv ${DESTDIR}/usr/local/lib/python* "${DESTDIR}/usr/lib"
 	fi
 }
 
 gpsd-python_package() {
-	short_desc+=" - Python2 tools/bindings"
+	short_desc+=" - Python tools/bindings"
-	depends="python gnuplot ${sourcepkg}>=${version}_${revision}"
+	depends="python python-pyserial gnuplot ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/lib/python2.7
+		vmove "usr/lib/python*"
 		vmove usr/bin/gegps
 		vmove usr/bin/gpscat
 		vmove usr/bin/gpsfake
 		vmove usr/bin/gpsprof
+		vmove usr/bin/ubxtool
+		vmove usr/bin/zerk
 		vmove usr/share/man/man1/gegps.1
 		vmove usr/share/man/man1/gpscat.1
 		vmove usr/share/man/man1/gpsfake.1
 		vmove usr/share/man/man1/gpsprof.1
+		vmove usr/share/man/man1/ubxtool.1
+		vmove usr/share/man/man1/zerk.1
 	}
 }