<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/2253556298a8d479a376e5f897445c52ba9d935d">https://github.com/macports/macports-ports/commit/2253556298a8d479a376e5f897445c52ba9d935d</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 2253556298a xscorch: Fix build failure
</span>2253556298a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2253556298a8d479a376e5f897445c52ba9d935d
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 10 03:03:24 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> xscorch: Fix build failure
</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/66450
</span>---
games/xscorch/Portfile | 19 +++++++++++----
...onfigure.diff => change-echo-n-to-printf.patch} | 1 +
games/xscorch/files/implicit.patch | 27 ++++++++++++++++++++++
games/xscorch/files/no-thread-jumps.patch | 20 ++++++++++++++++
4 files changed, 63 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xscorch/Portfile b/games/xscorch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7df00ed8ac3..5371535db30 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xscorch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xscorch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,6 @@ name xscorch
</span> version 0.2.1
revision 1
categories games
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,21 +22,33 @@ homepage http://www.xscorch.org/
</span> master_sites ${homepage}releases/
checksums rmd160 ac8688e40162834db064c2aa18f904748ef56d0e \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a315f7001a020c6b8f644db1c1dc56ccfbb9e3efcbf12c41ac9eb4e5e75cb5f7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a315f7001a020c6b8f644db1c1dc56ccfbb9e3efcbf12c41ac9eb4e5e75cb5f7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 849773
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build path:bin/pkg-config:pkgconfig
</span>
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:libmikmod
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles change-echo-n-to-printf.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch \
</span> overlapping-memcpy.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-thread-jumps.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --mandir=${prefix}/share/man \
--disable-warn \
--disable-network \
--enable-opt
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D__ALLOW_DEPRECATED_GDK__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url [lindex ${master_sites} 0]
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xscorch/files/patch-configure.diff b/games/xscorch/files/change-echo-n-to-printf.patch
</span>similarity index 92%
rename from games/xscorch/files/patch-configure.diff
rename to games/xscorch/files/change-echo-n-to-printf.patch
<span style='display:block; white-space:pre;color:#808080;'>index 9e1c9207c78..ea5630a7cc1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xscorch/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xscorch/files/change-echo-n-to-printf.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use printf instead of echo -n to avoid literal "-n" printed onscreen.
</span> --- configure.orig 2011-07-31 19:31:11.000000000 -0500
+++ configure 2011-09-12 21:47:50.000000000 -0500
@@ -16936,7 +16936,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xscorch/files/implicit.patch b/games/xscorch/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..57c4aeb2657
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xscorch/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix failure to find libmikmod:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checking for libmikmod - version >= 3.1.5... no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Because of:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'strlen' with type 'unsigned long (const char *)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'strcpy' with type 'char *(char *, const char *)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2011-07-31 19:31:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-01-10 02:23:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12947,6 +12947,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mikmod.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char* my_strdup (char *str)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12961,7 +12962,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return new_str;
</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;'>+-int main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int major,minor,micro;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int libmikmod_major_version,libmikmod_minor_version,libmikmod_micro_version;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xscorch/files/no-thread-jumps.patch b/games/xscorch/files/no-thread-jumps.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bcc85e105e2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xscorch/files/no-thread-jumps.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Remove -fthread-jumps which causes compile failure with clang when --enable-opt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is used because clang does not understand that flag.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This patch is applied conditionally, when the compiler is not gcc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The flag is probably also pointless for gcc since this optimization is included
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in -O1 and later and this line already uses -O3.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-fthread-jumps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2011-07-31 19:31:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-01-10 01:43:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14422,7 +14422,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$enable_opt" = "xyes" -o \( "x$enable_opt" = "xmaybe" -a "x$CFLAGS" = "x" \); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "enabled" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBJ_CFLAGS_OPT="-O3 -fomit-frame-pointer -finline-functions -funroll-loops -fthread-jumps -DNDEBUG"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBJ_CFLAGS_OPT="-O3 -fomit-frame-pointer -finline-functions -funroll-loops -DNDEBUG"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not enabled" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "not enabled" >&6; }
</span></pre><pre style='margin:0'>
</pre>