<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7ad0b06e7859da4f4b7b6e9145618b17e929875a">https://github.com/macports/macports-ports/commit/7ad0b06e7859da4f4b7b6e9145618b17e929875a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7ad0b06e7859da4f4b7b6e9145618b17e929875a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu May 19 09:10:27 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> libiconv: Fix build with c89 compilers
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove patch-c99.diff which was added over a decade ago to fix the build
</span><span style='display:block; white-space:pre;color:#404040;'> with c99 compilers. It isn't needed anymore for that purpose -- upstream
</span><span style='display:block; white-space:pre;color:#404040;'> must have fixed it another way -- and now it causes build failure with
</span><span style='display:block; white-space:pre;color:#404040;'> c89 compilers.
</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/65200
</span>---
textproc/libiconv/Portfile | 4 +---
textproc/libiconv/files/patch-c99.diff | 13 -------------
2 files changed, 1 insertion(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libiconv/Portfile b/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 52059665b2f..fa979782f6e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,7 @@ long_description \
</span>
depends_build port:gperf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-Makefile.in-darwin.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-c99.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src-Makefile.in-darwin.diff
</span>
# Also needed by later clangs.
if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libiconv/files/patch-c99.diff b/textproc/libiconv/files/patch-c99.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 71f458f8a04..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libiconv/files/patch-c99.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/iconv.c.orig 2022-01-23 16:36:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/iconv.c 2022-05-18 03:40:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -188,7 +188,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "aliases2.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef S
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC_STDC_INLINE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static inline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__GNUC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __inline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __cplusplus
</span></pre><pre style='margin:0'>
</pre>