<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ed3da8ccd9e14d0530bb7380144ba8ae3ac6ebe5">https://github.com/macports/macports-ports/commit/ed3da8ccd9e14d0530bb7380144ba8ae3ac6ebe5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ed3da8ccd9e qlandkarte: try to fix build with current proj4
</span>ed3da8ccd9e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ed3da8ccd9e14d0530bb7380144ba8ae3ac6ebe5
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Dec 7 01:14:50 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> qlandkarte: try to fix build with current proj4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/68847
</span>---
gis/qlandkarte/Portfile | 8 +++++---
gis/qlandkarte/files/TWOPI.patch | 11 +++++++++++
2 files changed, 16 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qlandkarte/Portfile b/gis/qlandkarte/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 26d90fb8a08..d4cfdfa3361 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qlandkarte/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qlandkarte/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,7 @@ checksums md5 51f804235511f1c10ae8538f86743135
</span> depends_lib-append port:proj4 \
port:libusb-compat
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-extra-includes=${prefix}/lib/proj49/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-extra-libs=${prefix}/lib/proj49/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-qt-dir=${qt_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles TWOPI.patch
</span>
post-patch {
# fix lack of CoreFoundation after libgarmin.a
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +35,10 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-extra-includes=${prefix}/lib/proj49/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extra-libs=${prefix}/lib/proj49/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-qt-dir=${qt_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
xinstall -d ${destroot}${applications_dir}
copy ${worksrcpath}/bin/QLandkarte.app ${destroot}${applications_dir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qlandkarte/files/TWOPI.patch b/gis/qlandkarte/files/TWOPI.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7b536b30421
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qlandkarte/files/TWOPI.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CGarminImg.h.orig 2008-02-13 21:15:18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CGarminImg.h 2023-12-07 01:09:00
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -207,5 +207,8 @@ class CGarminImg : public QObject
</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;'>+ #define DEG(x) ((x) < 0x800000 ? (double)(x) * 360.0 / 16777216.0 : (double)((x) - 0x1000000) * 360.0 / 16777216.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef TWOPI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define TWOPI M_TWOPI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RAD(x) ((x) < 0x800000 ? (double)(x) * TWOPI / 16777216.0 : (double)((x) - 0x1000000) * TWOPI / 16777216.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif //CGARMINIMG_H
</span></pre><pre style='margin:0'>
</pre>