<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cd5cd5f1c88e27f72ca0cdee5b75121b828a28b6">https://github.com/macports/macports-ports/commit/cd5cd5f1c88e27f72ca0cdee5b75121b828a28b6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cd5cd5f1c88e27f72ca0cdee5b75121b828a28b6
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Jun 2 07:08:54 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> zstd: ensure patch files apply cleanly
</span>---
archivers/zstd/files/flags.patch | 4 ++--
archivers/zstd/files/patch-zstd-tiger-no-backtrace.diff | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zstd/files/flags.patch b/archivers/zstd/files/flags.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 1452c4a8ee1..0f303bacf33 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zstd/files/flags.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zstd/files/flags.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ https://github.com/macports/macports-ports/pull/568
</span> CFLAGS += $(MOREFLAGS)
--- lib/libzstd.mk.orig 2021-12-20 16:49:18.000000000 -0600
+++ lib/libzstd.mk 2021-12-22 02:41:39.000000000 -0600
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,7 +90,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -113,7 +113,7 @@
</span> DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
-Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
-Wstrict-prototypes -Wundef -Wpointer-arith \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,4 +21,4 @@ https://github.com/macports/macports-ports/pull/568
</span> + -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
-Wredundant-decls -Wmissing-prototypes -Wc++-compat
CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS += $(MOREFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASFLAGS += $(DEBUGFLAGS) $(MOREFLAGS) $(CFLAGS)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zstd/files/patch-zstd-tiger-no-backtrace.diff b/archivers/zstd/files/patch-zstd-tiger-no-backtrace.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f227aee5c9a..ac5c1cdd308 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zstd/files/patch-zstd-tiger-no-backtrace.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zstd/files/patch-zstd-tiger-no-backtrace.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- programs/fileio.c.orig 2021-12-20 16:49:18.000000000 -0600
+++ programs/fileio.c 2021-12-22 02:31:01.000000000 -0600
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -186,7 +186,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,7 +173,7 @@
</span> #if !defined(BACKTRACE_ENABLE)
/* automatic detector : backtrace enabled by default on linux+glibc and osx */
# if (defined(__linux__) && (defined(__GLIBC__) && !defined(__UCLIBC__))) \
</pre><pre style='margin:0'>
</pre>