<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cfbd0f8cc9fa3597667e35f7822d44ad93974a41">https://github.com/macports/macports-ports/commit/cfbd0f8cc9fa3597667e35f7822d44ad93974a41</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cfbd0f8cc9fa3597667e35f7822d44ad93974a41
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Thu Dec 14 07:14:50 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> proj6-8: fix build with gcc13
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/OSGeo/PROJ/commit/b0b8937c56ced8eb0ffef532b9c691a1a5fc8634
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/68889
</span>---
gis/proj6/Portfile | 3 ++-
gis/proj6/files/patch-add-missing-includes.diff | 12 ++++++++++++
gis/proj7/Portfile | 3 ++-
gis/proj7/files/patch-add-missing-includes.diff | 12 ++++++++++++
gis/proj8/Portfile | 3 ++-
gis/proj8/files/patch-add-missing-includes.diff | 23 +++++++++++++++++++++++
6 files changed, 53 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/proj6/Portfile b/gis/proj6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ad5f84a4155..64a52b02f32 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/proj6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/proj6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,6 @@ version 6.3.2
</span> set datumgrid_ver 1.8
revision 0
categories-append gis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license MIT
maintainers {stromnov @stromnov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +52,8 @@ post-extract {
</span> system "${prefix}/bin/unzip -o '$datumgrid' -d '${worksrcpath}/data'"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-add-missing-includes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 2011
configure.pre_args --prefix=${prefix}/lib/proj6
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/proj6/files/patch-add-missing-includes.diff b/gis/proj6/files/patch-add-missing-includes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..48f9373db54
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/proj6/files/patch-add-missing-includes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/OSGeo/PROJ/commit/b0b8937c56ced8eb0ffef532b9c691a1a5fc8634
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/proj_json_streaming_writer.hpp 2023-12-14 02:31:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/proj_json_streaming_writer.hpp 2023-12-14 02:17:08.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vector>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <cstdint>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CPL_DLL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/proj7/Portfile b/gis/proj7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 55c512718f8..9deff4b1731 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/proj7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/proj7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,6 @@ name ${realname}7
</span> version 7.2.1
revision 1
categories-append gis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license MIT
maintainers {stromnov @stromnov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,6 +29,8 @@ checksums rmd160 33640fc210ad5e465c04047ac364a53c2415b441 \
</span> sha256 b384f42e5fb9c6d01fe5fa4d31da2e91329668863a684f97be5d4760dbbf0a14 \
size 5714666
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-add-missing-includes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 2011
# error: return type 'const nn<[...]>' must match previous return type
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/proj7/files/patch-add-missing-includes.diff b/gis/proj7/files/patch-add-missing-includes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..48f9373db54
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/proj7/files/patch-add-missing-includes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/OSGeo/PROJ/commit/b0b8937c56ced8eb0ffef532b9c691a1a5fc8634
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/proj_json_streaming_writer.hpp 2023-12-14 02:31:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/proj_json_streaming_writer.hpp 2023-12-14 02:17:08.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vector>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <cstdint>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CPL_DLL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/proj8/Portfile b/gis/proj8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e69a4d6daba..610aab25b62 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/proj8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/proj8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,6 @@ name ${realname}8
</span> version 8.2.1
revision 1
categories-append gis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license MIT
maintainers {stromnov @stromnov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,6 +29,8 @@ checksums rmd160 7456023fdeb03f7d1c182fe67f617960ea3efede \
</span> sha256 76ed3d0c3a348a6693dfae535e5658bbfd47f71cb7ff7eb96d9f12f7e068b1cf \
size 5882136
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-add-missing-includes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 2011
# error: return type 'const nn<[...]>' must match previous return type
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/proj8/files/patch-add-missing-includes.diff b/gis/proj8/files/patch-add-missing-includes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6dda8a64eb8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/proj8/files/patch-add-missing-includes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/OSGeo/PROJ/commit/b0b8937c56ced8eb0ffef532b9c691a1a5fc8634
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/proj_json_streaming_writer.hpp 2023-12-14 02:31:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/proj_json_streaming_writer.hpp 2023-12-14 02:17:08.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vector>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <cstdint>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CPL_DLL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/projections/s2.cpp 2021-11-02 01:18:48.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/projections/s2.cpp 2023-12-14 07:06:49.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,6 +52,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cmath>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <cstdint>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "proj.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "proj_internal.h"
</span></pre><pre style='margin:0'>
</pre>