Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 19 Dec 2022 05:55:18 GMT
From:      =?utf-8?Q?Romain=20Tarti=C3=A8re?= <romain@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 192f643ab4df - main - deskutils/subsurface: Fix build on older FreeBSD versions
Message-ID:  <202212190555.2BJ5tIp1052000@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by romain:

URL: https://cgit.FreeBSD.org/ports/commit/?id=192f643ab4df488156748f96244bb0a567de892f

commit 192f643ab4df488156748f96244bb0a567de892f
Author:     Romain Tartière <romain@FreeBSD.org>
AuthorDate: 2022-12-19 05:53:19 +0000
Commit:     Romain Tartière <romain@FreeBSD.org>
CommitDate: 2022-12-19 05:54:45 +0000

    deskutils/subsurface: Fix build on older FreeBSD versions
    
    On FreeBSD 12.3, build fail with:
    
    In file included from /wrkdirs/usr/ports/deskutils/subsurface/work/subsurface-5.0.10/core/exif.cpp:32:
    /wrkdirs/usr/ports/deskutils/subsurface/work/subsurface-5.0.10/core/exif.h:128:3: error: unknown type name 'time_t'
      time_t epoch();
            ^
    1 error generated.
    
    Explicitly add time.h to headers which use time_t to avoid the issue.
    This should not have an impact where the package could be build so not
    bumping PORTREVISION.
---
 deskutils/subsurface/files/patch-core_exif.h      | 10 ++++++++++
 deskutils/subsurface/files/patch-core_parse-gpx.h | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/deskutils/subsurface/files/patch-core_exif.h b/deskutils/subsurface/files/patch-core_exif.h
new file mode 100644
index 000000000000..8647e5344ea5
--- /dev/null
+++ b/deskutils/subsurface/files/patch-core_exif.h
@@ -0,0 +1,10 @@
+--- core/exif.h.orig	2022-12-19 04:30:05 UTC
++++ core/exif.h
+@@ -36,6 +36,7 @@
+ #define __EXIF_H
+ 
+ #include <string>
++#include <time.h>
+ 
+ namespace easyexif {
+ 
diff --git a/deskutils/subsurface/files/patch-core_parse-gpx.h b/deskutils/subsurface/files/patch-core_parse-gpx.h
new file mode 100644
index 000000000000..9707991bca30
--- /dev/null
+++ b/deskutils/subsurface/files/patch-core_parse-gpx.h
@@ -0,0 +1,10 @@
+--- core/parse-gpx.h.orig	2022-12-19 05:04:53 UTC
++++ core/parse-gpx.h
+@@ -3,6 +3,7 @@
+ #define PARSE_GPX_H
+ 
+ #include <QString>
++#include <time.h>
+ 
+ struct dive_coords {         // This structure holds important information after parsing the GPX file:
+ 	time_t start_dive;            // Start time of the current dive, obtained using current_dive (local time)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212190555.2BJ5tIp1052000>