From nobody Mon Mar 14 00:32:43 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 801E71A0CC2D; Mon, 14 Mar 2022 00:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KGyDW2b9wz4SJ3; Mon, 14 Mar 2022 00:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647217963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zGW/W3o1DvM6gXVBzsBbTvRdcecmzlgZLLnLs3ip5uw=; b=yC7pAv1wQCMtSiUZzli0uguETOjSSd38lqJkDCPWGlrQp9Hf+SlClGX3K70u/H0qT9Rgle 5KcnSTDnoVJ7W2vPNL/BaWyX3AVEkgnq53BA29AQihK+nA/OB8M4seSlhT7gPJvek86yUH 4e04jrsKRNObIrB44y4crCXJHq20EuGTnd75pE/TQLw10xdWp6A0+Ee+ChxhSTHpFFMYLK hktA/PzDi1SZ3e9lcGt2YRrLuJtDCYUbiCFIeRC6TcjQ+tIuW8Vm7/Kjfq5CexBeuNdH0A RkFMNaq/3z9HD6lpwrMUVeFoGX1SHlSeaqsBBEKGDcVqJ/gv5GHBtog60A5+rg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 39BC4232DD; Mon, 14 Mar 2022 00:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22E0Whgk010155; Mon, 14 Mar 2022 00:32:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22E0WhYT010154; Mon, 14 Mar 2022 00:32:43 GMT (envelope-from git) Date: Mon, 14 Mar 2022 00:32:43 GMT Message-Id: <202203140032.22E0WhYT010154@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Steve Wills Subject: git: 3cb0fc7db427 - main - astro/foxtrotgps: fix build with new gpsd List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: swills X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cb0fc7db427ed8f2abefaa5ad0f6ae0d9bfb1c4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647217963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zGW/W3o1DvM6gXVBzsBbTvRdcecmzlgZLLnLs3ip5uw=; b=TZeUhoKpQa4MD0caAzQLpYX206BAyQKMWsMJFKM1R4pql5az9ew3b4T57cMVo/AxQ+95Dq 2cWfeHn1TibPNEYFhB1eLqKqR1k+Mdyxz3CEAD0T++pJ/MsBlRLjmJw5dAQsr1qeENcF6y eRSEUuxiRoednU0p3VsIjV0psRyFQI+LsWLDOj4PH6JtY3ZbVkDyyhUYdfK8coh1VkMK06 gGXtE2e4YNfV1sylFxaAZ1S/j0jiIbn2e9M+5lKvMYwWEdiPl8ZEcGtk34eujn8QeBKsp9 AdDJogWdYecykoamazYpPybIe03oXl4xBUjHxUs0lJdjgnjYo9hX7+7QoV8Veg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647217963; a=rsa-sha256; cv=none; b=rrj8yRPknLN5AUxDZGLsXLbYyJi5VW8tN+Duv245LWweEjTypeZkHyX/NPEb9VrLzcmDM8 wLF5g8bxpa+sR4RJPhXBkSDQcg9HtkX92pTfnqxsWIAtfSJLfO8TnQufUKLuKA+uqfPs3f tH99SVAXhvteX9AymvI0fAdBfV5fiQDWnXwtVe0rRe9t4K90OqKa0Z7UXROBKdMr3QbFTT d9DHAV544oRPWxk9q+jErR7iWdm7p0K1YAIclBVesmOk4tP39DD7pLf8vWkKKg74YOkfP4 yHX5Hq2XnJKF6RpuNu1X0Y8v9srkCAKAwngVhJM9M6qlIBKoysJ5LIJ1/Xehwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by swills: URL: https://cgit.FreeBSD.org/ports/commit/?id=3cb0fc7db427ed8f2abefaa5ad0f6ae0d9bfb1c4 commit 3cb0fc7db427ed8f2abefaa5ad0f6ae0d9bfb1c4 Author: Steve Wills AuthorDate: 2022-03-14 00:16:08 +0000 Commit: Steve Wills CommitDate: 2022-03-14 00:31:48 +0000 astro/foxtrotgps: fix build with new gpsd PR: 258110 Approved by: crwhipp@gmail.com (maintainer) --- astro/foxtrotgps/Makefile | 1 + astro/foxtrotgps/files/patch-src_gps__functions.c | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/astro/foxtrotgps/Makefile b/astro/foxtrotgps/Makefile index 1de6e505a57b..478a8604ee22 100644 --- a/astro/foxtrotgps/Makefile +++ b/astro/foxtrotgps/Makefile @@ -2,6 +2,7 @@ PORTNAME= foxtrotgps PORTVERSION= 1.2.2 +PORTREVISION= 1 CATEGORIES= astro geography MASTER_SITES= http://www.foxtrotgps.org/releases/ diff --git a/astro/foxtrotgps/files/patch-src_gps__functions.c b/astro/foxtrotgps/files/patch-src_gps__functions.c index 9b41464e09cc..c292f3f582b6 100644 --- a/astro/foxtrotgps/files/patch-src_gps__functions.c +++ b/astro/foxtrotgps/files/patch-src_gps__functions.c @@ -1,6 +1,6 @@ ---- src/gps_functions.c.orig 2020-03-05 17:21:38 UTC +--- src/gps_functions.c.orig 2019-07-10 05:35:12 UTC +++ src/gps_functions.c -@@ -735,6 +735,11 @@ cb_gpsd_io_error(GIOChannel *src, GIOCondition conditi +@@ -729,6 +729,11 @@ cb_gpsd_io_error(GIOChannel *src, GIOCondition conditi } @@ -12,7 +12,7 @@ static gboolean cb_gpsd_data(GIOChannel *src, GIOCondition condition, gpointer data) -@@ -755,7 +760,7 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition, +@@ -753,12 +758,16 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition, { gpsdata->satellites_used = libgps_gpsdata.satellites_used; gpsdata->hdop = libgps_gpsdata.dop.hdop; @@ -21,3 +21,12 @@ if (isnan(gpsdata->fix.time)) { gpsdata->fix.time = (time_t) 0; + } ++#if GPSD_API_MAJOR_VERSION >= 10 ++ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_UNK); ++#else + gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX); ++#endif + if (gpsdata->valid) + { + gpsdata->seen_valid = TRUE;