<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/281371cab680fc75c26df264b772d8aab5cd88f1">https://github.com/macports/macports-ports/commit/281371cab680fc75c26df264b772d8aab5cd88f1</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 281371cab68 nghttp2: Fix redefinition of typedef
</span>281371cab68 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 281371cab680fc75c26df264b772d8aab5cd88f1
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Aug 6 01:10:10 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    nghttp2: Fix redefinition of typedef
</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/70481
</span>---
 www/nghttp2/Portfile                                | 10 +---------
 www/nghttp2/files/fix-redefinition-of-typedef.patch | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 9 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nghttp2/Portfile b/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bef0f53b791..7192b954227 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +31,7 @@ depends_build       path:bin/pkg-config:pkgconfig
</span> # See: https://github.com/nghttp2/nghttp2/pull/2086
 patchfiles-append   patch-src-shrpx_client_handler.cc.diff \
                     patch-src-shrpx_downstream_connection_pool.cc.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    fix-redefinition-of-typedef.patch \
</span>                     src-shrpx_config.diff
 
 # https://trac.macports.org/wiki/WimplicitFunctionDeclaration#strchr
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,17 +39,8 @@ configure.checks.implicit_function_declaration.whitelist-append strchr
</span> 
 # nghttp2 is a dependency of Clang, so we must avoid circular dependencies.
 # If building the library only, C++ is not used.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# The library seems to use one C11 feature, redefinition of typedef.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://github.com/nghttp2/nghttp2/issues/2096
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# No version of Apple provided GCC seems to work.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# All versions of Apple provided Clang seem to work.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# However, the Apple version of Clang on 10.6 requires `-Wtypedef-redefinition`.
</span> compiler.cxx_standard
 compiler.c_standard         1999
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append   *gcc-4.0 *gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq ${name} && ${configure.compiler} eq "clang" && ${os.platform} eq "darwin" && ${os.major} <= 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.cflags-append -Wtypedef-redefinition
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> 
 configure.args      --disable-silent-rules \
                     --disable-threads \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nghttp2/files/fix-redefinition-of-typedef.patch b/www/nghttp2/files/fix-redefinition-of-typedef.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0a5840e3cee
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nghttp2/files/fix-redefinition-of-typedef.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</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 'nghttp2_data_provider_wrap'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/nghttp2/nghttp2/issues/2096
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/nghttp2/nghttp2/commit/e4c54d9c82141d20ed95fa9e4143fd10578bc511
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/nghttp2_submit.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/nghttp2_submit.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <nghttp2/nghttp2.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct nghttp2_data_provider_wrap nghttp2_data_provider_wrap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "nghttp2_outbound_item.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nghttp2_submit_data_shared(nghttp2_session *session, uint8_t flags,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                int32_t stream_id,
</span></pre><pre style='margin:0'>

</pre>