diff options
| author | ryoon <ryoon@pkgsrc.org> | 2022-01-02 11:59:05 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2022-01-02 11:59:05 +0000 |
| commit | a16438340a81e395931a80213aed1f1ac5de398b (patch) | |
| tree | 1cfd49a05597f228264531cf9aceb48ad59444a9 | |
| parent | 1f82f0d403a6bf43934ea4cd04740dfea2d7163f (diff) | |
| download | pkgsrc-a16438340a81e395931a80213aed1f1ac5de398b.tar.gz | |
gpsd: Fix build with Python 3.10
| -rw-r--r-- | geography/gpsd/distinfo | 4 | ||||
| -rw-r--r-- | geography/gpsd/patches/patch-SConscript | 25 |
2 files changed, 25 insertions, 4 deletions
diff --git a/geography/gpsd/distinfo b/geography/gpsd/distinfo index 3fddbe9c270..d904d885e80 100644 --- a/geography/gpsd/distinfo +++ b/geography/gpsd/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.34 2021/11/09 11:51:11 nia Exp $ +$NetBSD: distinfo,v 1.35 2022/01/02 11:59:05 ryoon Exp $ BLAKE2s (gpsd-3.23.1.tar.gz) = 1f5ecdc768d95f384055cdb564f292a289c250552911b6822ef1a09e420ffda1 SHA512 (gpsd-3.23.1.tar.gz) = fccfac363103282581e4ea8236ce40e4600a01f02489c1aaec721a13deac556bac046a3b76f8a5e21fe8c736056e872d8c7f2e4ed2d38a164323dd9738f00388 Size (gpsd-3.23.1.tar.gz) = 4904121 bytes -SHA1 (patch-SConscript) = 5d042bb9d6547c7f78ea8f37b1d12963d49584b6 +SHA1 (patch-SConscript) = 2b8175fdb66f6ca7efe7ec71eb5ff91af5d18e6f diff --git a/geography/gpsd/patches/patch-SConscript b/geography/gpsd/patches/patch-SConscript index de6dc8edd0b..6a744397c90 100644 --- a/geography/gpsd/patches/patch-SConscript +++ b/geography/gpsd/patches/patch-SConscript @@ -1,11 +1,32 @@ -$NetBSD: patch-SConscript,v 1.4 2021/11/09 11:51:11 nia Exp $ +$NetBSD: patch-SConscript,v 1.5 2022/01/02 11:59:06 ryoon Exp $ gpspipe requires libgpsd for serial.c cfmakeraw() compat. \todo Fix upstream? +Support Python 3.10 or later. + --- SConscript.orig 2021-09-21 21:53:44.000000000 +0000 +++ SConscript -@@ -1930,7 +1930,7 @@ gpsmon = env.Program('gpsmon/gpsmon', gp +@@ -1516,15 +1516,13 @@ if not cleaning and not helping and conf + # announce(python_config) + + # aiogps is only available on Python >= 3.6 +- sysver = config.GetPythonValue('target version', +- 'import sys', +- '"%d.%d" % sys.version_info[0:2]') ++ sysver = sys.version_info + +- if 3 > int(sysver[0]) or 6 > int(sysver[2]): ++ if 3 > sysver[0] or 6 > sysver[1]: + config.env['aiogps'] = False + announce("WARNING: Python%s too old (need 3.6): " + "gps/aiogps.py will not be installed" % +- (sysver), end=True) ++ (str(sysver[0]) + "." + str(sysver[1])), end=True) + else: + config.env['aiogps'] = True + +@@ -1930,7 +1928,7 @@ gpsmon = env.Program('gpsmon/gpsmon', gp LIBS=[libgpsd_static, libgps_static], parse_flags=gpsdflags + gpsflags + ncurseslibs) gpspipe = env.Program('clients/gpspipe', ['clients/gpspipe.c'], |