<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/67f9ad1f087eae352fb54918fc21045a6d884704">https://github.com/macports/macports-ports/commit/67f9ad1f087eae352fb54918fc21045a6d884704</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 67f9ad1f087 libkml: Fix typedef redefinition and some warnings
</span>67f9ad1f087 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 67f9ad1f087eae352fb54918fc21045a6d884704
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jul 24 12:22:28 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> libkml: Fix typedef redefinition and some warnings
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70349
</span>---
gis/libkml/Portfile | 5 ++-
gis/libkml/files/iomem_simple.h.patch | 24 ++++++++++++
gis/libkml/files/unzip.c.patch | 70 +++++++++++++++++++++++++++++++++++
3 files changed, 98 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/libkml/Portfile b/gis/libkml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e20b9c0ab1d..0b6b9f71406 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/libkml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/libkml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,10 @@ depends_lib-append port:expat \
</span> port:uriparser \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles DYLD_LIBRARY_PATH.patch libkml_pc-boost.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles DYLD_LIBRARY_PATH.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iomem_simple.h.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libkml_pc-boost.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unzip.c.patch
</span>
configure.args-append -DBUILD_EXAMPLES=OFF \
-DBUILD_TESTING=OFF \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/libkml/files/iomem_simple.h.patch b/gis/libkml/files/iomem_simple.h.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..01f23cefdbe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/libkml/files/iomem_simple.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: redefinition of typedef ‘open_file_func’
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/libkml/libkml/issues/253
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Part of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/libkml/libkml/commit/d4adfd8a8862ce460314e514b26cffc9815f06ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/kml/base/contrib/minizip/iomem_simple.h.orig 2015-12-21 11:23:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/kml/base/contrib/minizip/iomem_simple.h 2024-07-24 12:17:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,13 +35,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** KMR already defined in minizip/ioapi.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct zlib_filefunc_def_s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/libkml/files/unzip.c.patch b/gis/libkml/files/unzip.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..75ed932ee26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/libkml/files/unzip.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,70 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+warning: add explicit braces to avoid dangling else [-Wdangling-else]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+warning: equality comparison with extraneous parentheses [-Wparentheses-equality]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Simplification of part of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/libkml/libkml/commit/d4adfd8a8862ce460314e514b26cffc9815f06ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/kml/base/contrib/minizip/unzip.c.orig 2015-12-21 11:23:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/kml/base/contrib/minizip/unzip.c 2024-07-24 12:08:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -638,10 +638,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* we check the magic */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (err==UNZ_OK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err=UNZ_ERRNO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (uMagic!=0x02014b50)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err=UNZ_BADZIPFILE;
</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;'>+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err=UNZ_ERRNO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -718,10 +720,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uSizeRead = extraFieldBufferSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (lSeek!=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lSeek=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err=UNZ_ERRNO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err=UNZ_ERRNO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -743,10 +747,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uSizeRead = commentBufferSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (lSeek!=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lSeek=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err=UNZ_ERRNO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((file_info.size_file_comment>0) && (commentBufferSize>0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err=UNZ_ERRNO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1007,10 +1013,12 @@
</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;'>+ if (err==UNZ_OK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err=UNZ_ERRNO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (uMagic!=0x04034b50)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err=UNZ_BADZIPFILE;
</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;'>+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err=UNZ_ERRNO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1269,7 +1277,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return UNZ_PARAMERROR;
</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;'>+- if ((pfile_in_zip_read_info->read_buffer == NULL))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (pfile_in_zip_read_info->read_buffer == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return UNZ_END_OF_LIST_OF_FILE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (len==0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span></pre><pre style='margin:0'>
</pre>