From owner-svn-ports-all@freebsd.org Sun Aug 28 07:45:54 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D79CB785BA; Sun, 28 Aug 2016 07:45:54 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EB1B6C34; Sun, 28 Aug 2016 07:45:53 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7S7jrsU070671; Sun, 28 Aug 2016 07:45:53 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7S7jrDH070670; Sun, 28 Aug 2016 07:45:53 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201608280745.u7S7jrDH070670@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 28 Aug 2016 07:45:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r421010 - branches/2016Q3/astro/gpsbabel/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2016 07:45:54 -0000 Author: riggs Date: Sun Aug 28 07:45:52 2016 New Revision: 421010 URL: https://svnweb.freebsd.org/changeset/ports/421010 Log: MFH: r421009 Fix build with libc++ 3.8.0 PR: 210991 Submitted by: dev2@heesakkers.info (maintainer) Approved by: ports-secteam (build fix blanket) Added: branches/2016Q3/astro/gpsbabel/files/patch-exif.cc - copied unchanged from r421009, head/astro/gpsbabel/files/patch-exif.cc Modified: Directory Properties: branches/2016Q3/ (props changed) Copied: branches/2016Q3/astro/gpsbabel/files/patch-exif.cc (from r421009, head/astro/gpsbabel/files/patch-exif.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/astro/gpsbabel/files/patch-exif.cc Sun Aug 28 07:45:52 2016 (r421010, copy of r421009, head/astro/gpsbabel/files/patch-exif.cc) @@ -0,0 +1,26 @@ +--- exif.cc.orig 2016-01-03 02:09:17 UTC ++++ exif.cc +@@ -1100,7 +1100,7 @@ exif_find_wpt_by_time(const Waypoint* wp + + if (exif_wpt_ref == NULL) { + exif_wpt_ref = wpt; +- } else if (abs(exif_time_ref - wpt->creation_time.toTime_t()) < abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t())) { ++ } else if (qAbs(exif_time_ref - wpt->creation_time.toTime_t()) < qAbs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t())) { + exif_wpt_ref = wpt; + } + } +@@ -1447,12 +1447,12 @@ exif_write(void) + + if (exif_wpt_ref == NULL) { + warning(MYNAME ": No point with a valid timestamp found.\n"); +- } else if (abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()) > frame) { ++ } else if (qAbs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()) > frame) { + warning(MYNAME ": No matching point found for image date %s!\n", qPrintable(str)); + if (exif_wpt_ref != NULL) { + QString str = exif_time_str(exif_wpt_ref->creation_time.toTime_t()); + warning(MYNAME ": Best is from %s, %d second(s) away.\n", +- qPrintable(str), abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t())); ++ qPrintable(str), (int) qAbs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t())); + } + exif_wpt_ref = NULL; + }