Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 562151A9239 for ; Sun, 2 Jan 2022 11:59:08 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 8A75E84EC4; Sun, 2 Jan 2022 11:59:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C56FD84E63 for ; Sun, 2 Jan 2022 11:59:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id FFdv8IFEr9RX for ; Sun, 2 Jan 2022 11:59:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3BFF284CEF for ; Sun, 2 Jan 2022 11:59:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 35D2CFAEC; Sun, 2 Jan 2022 11:59:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1641124746295320" MIME-Version: 1.0 Date: Sun, 2 Jan 2022 11:59:06 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/geography/gpsd To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20220102115906.35D2CFAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1641124746295320 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Sun Jan 2 11:59:06 UTC 2022 Modified Files: pkgsrc/geography/gpsd: distinfo pkgsrc/geography/gpsd/patches: patch-SConscript Log Message: gpsd: Fix build with Python 3.10 To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 pkgsrc/geography/gpsd/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/geography/gpsd/patches/patch-SConscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1641124746295320 Content-Disposition: inline Content-Length: 2648 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/geography/gpsd/distinfo diff -u pkgsrc/geography/gpsd/distinfo:1.34 pkgsrc/geography/gpsd/distinfo:1.35 --- pkgsrc/geography/gpsd/distinfo:1.34 Tue Nov 9 11:51:11 2021 +++ pkgsrc/geography/gpsd/distinfo Sun Jan 2 11:59:05 2022 @@ -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 Index: pkgsrc/geography/gpsd/patches/patch-SConscript diff -u pkgsrc/geography/gpsd/patches/patch-SConscript:1.4 pkgsrc/geography/gpsd/patches/patch-SConscript:1.5 --- pkgsrc/geography/gpsd/patches/patch-SConscript:1.4 Tue Nov 9 11:51:11 2021 +++ pkgsrc/geography/gpsd/patches/patch-SConscript Sun Jan 2 11:59:06 2022 @@ -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'], --_----------=_1641124746295320--