X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mx1.tetrasec.net (lists.alpinelinux.org [74.117.189.116]) by lists.alpinelinux.org (Postfix) with ESMTP id 3C74FF84E2C for ; Sun, 9 Dec 2018 20:35:44 +0000 (UTC) Received: from mx1.tetrasec.net (mail.local [127.0.0.1]) by mx1.tetrasec.net (Postfix) with ESMTP id CA9D69E2573; Sun, 9 Dec 2018 20:35:43 +0000 (GMT) Received: from obsidian.resnet.local (fw.spencertelecom.com [74.117.189.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: nangel@tetrasec.net) by mx1.tetrasec.net (Postfix) with ESMTPSA id 616E09E1F29; Sun, 9 Dec 2018 20:35:43 +0000 (GMT) From: Nathan Angelacos To: alpine-aports@lists.alpinelinux.org Cc: Nathan Angelacos Subject: [alpine-aports] [PATCH] main/gpsd Date: Sun, 9 Dec 2018 15:35:32 -0500 Message-Id: <20181209203532.11774-1-nangel@alpinelinux.org> X-Mailer: git-send-email 2.19.2 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.pat= ch diff --git a/main/gpsd/0001-workaround-for-scons-using-python2.patch b/ma= in/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." +=20 +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 # Maintainer: Nathan Angelacos pkgname=3Dgpsd -pkgver=3D3.17 -pkgrel=3D2 +pkgver=3D3.18.1 +pkgrel=3D0 pkgdesc=3D"A GPS daemon" arch=3Dall url=3D"http://catb.org/gpsd/" @@ -12,6 +12,7 @@ subpackages=3D"$pkgname-dev $pkgname-doc py3-$pkgname:_= py $pkgname-clients:_client source=3D"https://download-mirror.savannah.gnu.org/releases/gpsd/$pkgnam= e-$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=3D${_py%py} pkgdesc=3D"$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 =20 mkdir -p "$subpkgdir"/usr/bin for n in gpscat gpsfake gpsprof; do @@ -72,9 +75,10 @@ _clients() { mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin } =20 -sha512sums=3D"71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267= c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1 g= psd-3.17.tar.gz +sha512sums=3D"b381b177fcd29089a61aa11f5df2c67473720a6bbc5590ca1c4fda6273= 31c407de01c62caceeddae780626b9a02392e9a770d52a143357e1babdcc2fbff0ed38 g= psd-3.18.1.tar.gz eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff8= 35a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048 timepps.h ca534795df3033f15a2cd2f8cc6de5d71608f30418887f31df6dc1db1f283d5cf8292092= 3a1a4adbcaa147e9e32458eee46aed3d64a9a83c950bb83d5e9d4f6e gpsd-use-local-= timepps-header.patch +ab64ec2e28a00d94e71218462b755131f4c5c7ac39db5e914135c9009a3b8d7dca2b5762= ea0b9b5859785294ed0db42234ff044ef82185b2c08f96a9ba50f4f0 0001-workaround= -for-scons-using-python2.patch e2af8f52fc2d7e663882b6d12c5f4d709aa267b16eb9aeca2a70d8ecc681ae72359f3efc= d1636cde576bc8579e008f242574bc0adfab7252d3e763f039e86135 ttydefaults.pat= ch a0e7bf206ad51c31195f86f79ef92adca425d7f988534c0f70a2dd3053613f6fc46820d6= 2d0330aaef7ca100b5f2ab781ce9643f25b4c99c844ae66e7eec5cbc gpsd.initd 55d4a51f82d445d3ac93b2855132ef4380908ed045feba6298ed1d0b607cd9054b5325c0= 24dc52b370983ebd5d9b377537aee7d7128c97aa22e3075f4134d404 gpsd.confd" --=20 2.19.2 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---