<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/0f9b9c1a8c11a2c50b4ac4c3cc0e002f74620f34">https://github.com/macports/macports-ports/commit/0f9b9c1a8c11a2c50b4ac4c3cc0e002f74620f34</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 0f9b9c1a8c1 tmux: Rename header guards
</span>0f9b9c1a8c1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0f9b9c1a8c11a2c50b4ac4c3cc0e002f74620f34
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Sep 25 16:08:10 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> tmux: Rename header guards
</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/70719
</span>---
sysutils/tmux/Portfile | 3 +++
sysutils/tmux/files/queue.h.patch | 31 +++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/tmux/Portfile b/sysutils/tmux/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ee9003ad79c..5ad5e73408f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/tmux/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/tmux/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,6 +33,9 @@ depends_build path:bin/pkg-config:pkgconfig
</span> depends_lib port:libutf8proc \
port:libevent \
port:ncurses
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles queue.h.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
--enable-utf8proc \
--sysconfdir=${prefix}/etc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/tmux/files/queue.h.patch b/sysutils/tmux/files/queue.h.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..578a172b9fc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/tmux/files/queue.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Rename header guards on compat/queue.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Some platforms (…macOS) have a <sys/queue.h> but it isn't full-featured
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+enough to have all the functionality we need (e.g. TAILQ_REPLACE). This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+means the configure check fails and we fall back to our compatibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+header, but if *someone else* happens to include the system header first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+then it will activate the _SYS_QUEUE_H_ header guard and ours will not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+define anything. Since we can't really control whether the system header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is included or not (it is pulled in transitively) we probably should
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+just rename ours so it doesn't conflict.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/tmux/tmux/commit/775789fbd5c4f3aa93061480cd64e61daf7fb689
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- compat/queue.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ compat/queue.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,8 +32,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @(#)queue.h 8.5 (Berkeley) 8/20/94
</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;'>+-#ifndef _SYS_QUEUE_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define _SYS_QUEUE_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef _COMPAT_QUEUE_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _COMPAT_QUEUE_H_
</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;'>+ * This file defines five types of data structures: singly-linked lists,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -530,4 +530,4 @@ struct { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } while (0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* !_SYS_QUEUE_H_ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* !_COMPAT_QUEUE_H_ */
</span></pre><pre style='margin:0'>
</pre>