diff options
| author | riggs <riggs@FreeBSD.org> | 2016-08-28 15:42:58 +0800 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2016-08-28 15:42:58 +0800 |
| commit | 7a087d7721d1663c413eab720ec86aed8b5312ab (patch) | |
| tree | 03d57b72b40c8c406c77f32fcb34356920836cfd | |
| parent | ca8e245aac50f681998a2ba32559a6ea09b655b2 (diff) | |
| download | freebsd-ports-gnome-7a087d7721d1663c413eab720ec86aed8b5312ab.tar.gz freebsd-ports-gnome-7a087d7721d1663c413eab720ec86aed8b5312ab.tar.zst freebsd-ports-gnome-7a087d7721d1663c413eab720ec86aed8b5312ab.zip | |
Fix build with libc++ 3.8.0
PR: 210991
Submitted by: dev2@heesakkers.info (maintainer)
MFH: 2016Q3 (ports-secteam build fix blanket)
| -rw-r--r-- | astro/gpsbabel/files/patch-exif.cc | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/astro/gpsbabel/files/patch-exif.cc b/astro/gpsbabel/files/patch-exif.cc new file mode 100644 index 000000000000..9252fc5ccd3c --- /dev/null +++ b/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; + } |