Subject: [alpine-aports] [PATCH] main/gpsd

From: Nathan Angelacos <[email-masked]>
Date: Sun, 9 Dec 2018 15:35:32 -0500

3.18.1 upgrade
	scons still requires python2, and some of the gps
		 utilities no longer work with python2
	The 0001-workaround-for-scons-using-python2.patch
		explicitly uses python3 as the interpreter
	3.18.1 insists on putting the python utilites in
		/usr/local - we manually move them as
		part of the _py subpackage
---
 ...1-workaround-for-scons-using-python2.patch | 40 +++++++++++++++++++
 main/gpsd/APKBUILD                            | 12 ++++--
 2 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 main/gpsd/0001-workaround-for-scons-using-python2.patch

diff --git a/main/gpsd/0001-workaround-for-scons-using-python2.patch b/main/gpsd/0001-workaround-for-scons-using-python2.patch
new file mode 100644
index 0000000000..755f241716
--- /dev/null
+++ b/main/gpsd/0001-workaround-for-scons-using-python2.patch
@@ -0,0 +1,40 @@
+diff --git a/gpscat b/gpscat
+index 26c9acf..6cf4765 100755
+--- a/gpscat
++++ b/gpscat
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ "Display GPS output.  Hexify it if necessary."
+ 
+diff --git a/gpsfake b/gpsfake
+index e02d64a..ec10974 100755
+--- a/gpsfake
++++ b/gpsfake
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ '''
+ gpsfake -- test harness for gpsd
+diff --git a/ubxtool b/ubxtool
+index 6bdb0ba..82f5b2e 100755
+--- a/ubxtool
++++ b/ubxtool
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- coding: UTF-8
+ '''
+ ubxtool -- u-blox configurator and packet decoder
+diff --git a/zerk b/zerk
+index 745c765..2e1b73a 100755
+--- a/zerk
++++ b/zerk
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- coding: UTF-8
+ '''
+ zerk -- GREIS configurator and packet decoder
diff --git a/main/gpsd/APKBUILD b/main/gpsd/APKBUILD
index d7ae67ecb4..d27e57b5c3 100644
--- a/main/gpsd/APKBUILD
+++ b/main/gpsd/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Nathan Angelacos <[email-masked]>
 # Maintainer: Nathan Angelacos <[email-masked]>
 pkgname=gpsd
-pkgver=3.17
-pkgrel=2
+pkgver=3.18.1
+pkgrel=0
 pkgdesc="A GPS daemon"
 arch=all
 url="http://catb.org/gpsd/"
@@ -12,6 +12,7 @@ subpackages="$pkgname-dev $pkgname-doc py3-$pkgname:_py $pkgname-clients:_client
 source="https://download-mirror.savannah.gnu.org/releases/gpsd/$pkgname-$pkgver.tar.gz
 	timepps.h
 	gpsd-use-local-timepps-header.patch
+	0001-workaround-for-scons-using-python2.patch
 	ttydefaults.patch
 	gpsd.initd
 	gpsd.confd"
@@ -57,7 +58,9 @@ _py() {
 	local _pyver=${_py%py}
 	pkgdesc="$pkgname library and clients for python $_pyver"
 	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/python*  "$subpkgdir"/usr/lib/
+	# As of 3.18.1, gpsd wants to put the python stuff in /usr/local
+	mv "$pkgdir"/usr/local/lib/python*  "$subpkgdir"/usr/lib/
+	rm -rf "$pkgdir"/usr/local
 
 	mkdir -p "$subpkgdir"/usr/bin
 	for n in gpscat gpsfake gpsprof; do
@@ -72,9 +75,10 @@ _clients() {
 	mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin
 }
 
-sha512sums="71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1  gpsd-3.17.tar.gz
+sha512sums="b381b177fcd29089a61aa11f5df2c67473720a6bbc5590ca1c4fda627331c407de01c62caceeddae780626b9a02392e9a770d52a143357e1babdcc2fbff0ed38  gpsd-3.18.1.tar.gz
 eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048  timepps.h
 ca534795df3033f15a2cd2f8cc6de5d71608f30418887f31df6dc1db1f283d5cf82920923a1a4adbcaa147e9e32458eee46aed3d64a9a83c950bb83d5e9d4f6e  gpsd-use-local-timepps-header.patch
+ab64ec2e28a00d94e71218462b755131f4c5c7ac39db5e914135c9009a3b8d7dca2b5762ea0b9b5859785294ed0db42234ff044ef82185b2c08f96a9ba50f4f0  0001-workaround-for-scons-using-python2.patch
 e2af8f52fc2d7e663882b6d12c5f4d709aa267b16eb9aeca2a70d8ecc681ae72359f3efcd1636cde576bc8579e008f242574bc0adfab7252d3e763f039e86135  ttydefaults.patch
 a0e7bf206ad51c31195f86f79ef92adca425d7f988534c0f70a2dd3053613f6fc46820d62d0330aaef7ca100b5f2ab781ce9643f25b4c99c844ae66e7eec5cbc  gpsd.initd
 55d4a51f82d445d3ac93b2855132ef4380908ed045feba6298ed1d0b607cd9054b5325c024dc52b370983ebd5d9b377537aee7d7128c97aa22e3075f4134d404  gpsd.confd"
-- 
2.19.2

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---