<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bec31416d841b4ab653267a00282c64e9a37354d">https://github.com/macports/macports-ports/commit/bec31416d841b4ab653267a00282c64e9a37354d</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 bec31416d84 ruby33: Cosmetic patchfile cleanup
</span>bec31416d84 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bec31416d841b4ab653267a00282c64e9a37354d
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Sun Jul 14 16:32:02 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> ruby33: Cosmetic patchfile cleanup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This regenerates the main patchfile from updated git commits, removes
</span><span style='display:block; white-space:pre;color:#404040;'> the additional patchfile, and updates the related comment in the
</span><span style='display:block; white-space:pre;color:#404040;'> Portfile. There are no substantive changes in the patchfile(s), but
</span><span style='display:block; white-space:pre;color:#404040;'> the mtimes are updated to correspond to the new release. The result
</span><span style='display:block; white-space:pre;color:#404040;'> of the patch phase is unchanged.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also, the update URL was omitted from the original update commit
</span><span style='display:block; white-space:pre;color:#404040;'> message. See:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Verified that the build trees from "port patch" are identical before
</span><span style='display:block; white-space:pre;color:#404040;'> and after this change.
</span><span style='display:block; white-space:pre;color:#404040;'> Built successfully with no variants on 10.4-10.5 ppc, 10.4-10.6 i386,
</span><span style='display:block; white-space:pre;color:#404040;'> 10.5-12.x x86_64, and 11.x-14.x arm64.
</span><span style='display:block; white-space:pre;color:#404040;'> Built with all variants except jemalloc and yjit on 10.4-10.5, all
</span><span style='display:block; white-space:pre;color:#404040;'> variants except yjit on 10.6-10.11, and all variants on 10.12+.
</span><span style='display:block; white-space:pre;color:#404040;'> Tests not run due to test framework issues.
</span>---
lang/ruby33/Portfile | 6 +----
lang/ruby33/files/patch-sources.diff | 39 ++++++++++++++++++----------
lang/ruby33/files/patch-vm_insnhelper.c.diff | 11 --------
3 files changed, 26 insertions(+), 30 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby33/Portfile b/lang/ruby33/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 72bb8d86368..69f5cb6cd82 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby33/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby33/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,14 +70,10 @@ select.file ${filespath}/ruby${ruby_ver_nodot}
</span>
# patch-sources.diff: fixes for various issues.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This diff is from v3_3_3 vs. macports-3_3_3.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from v3_3_4 vs. macports-3_3_4r2.
</span> #
patchfiles-append patch-sources.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix build error on macOS 10.7, 10.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# this problem was reported to ruby-dev team at 2024-07-13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-vm_insnhelper.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #-------------------------------------------------------------------------------
# Fix compilation on buildbots for 10.12 and earlier.
# Issue: 62183: error: use of undeclared identifier 'fmt'; did you mean 'fma'?
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby33/files/patch-sources.diff b/lang/ruby33/files/patch-sources.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2cc69cc7f21..354001b33d5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby33/files/patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby33/files/patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- .gdbinit.orig 2024-06-11 16:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .gdbinit 2024-06-14 19:51:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- .gdbinit.orig 2024-07-08 16:28:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ .gdbinit 2024-07-14 16:28:09.000000000 -0700
</span> @@ -1,4 +1,5 @@
-set startup-with-shell off
+# Move this to end, so failure on older gdbs doesn't blow the rest
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +14,8 @@
</span> +
+# Moved from beginning, since it fails on older gdbs
+set startup-with-shell off
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/digest/md5/md5cc.h.orig 2024-06-11 16:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/md5/md5cc.h 2024-06-14 19:51:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/md5/md5cc.h.orig 2024-07-08 16:28:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/md5/md5cc.h 2024-07-14 16:28:09.000000000 -0700
</span> @@ -17,3 +17,11 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(MD5
#undef MD5_Finish
#define MD5_Update rb_digest_MD5_update
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +28,8 @@
</span> + */
+#undef MD5_Init
+#define MD5_Init CC_MD5_Init
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/digest/sha1/sha1cc.h.orig 2024-06-11 16:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/sha1/sha1cc.h 2024-06-14 19:51:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/sha1/sha1cc.h.orig 2024-07-08 16:28:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/sha1/sha1cc.h 2024-07-14 16:28:09.000000000 -0700
</span> @@ -12,3 +12,11 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(SHA
#undef SHA1_Finish
#define SHA1_Update rb_digest_SHA1_update
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,8 @@
</span> + */
+#undef SHA1_Init
+#define SHA1_Init CC_SHA1_Init
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/digest/sha2/sha2cc.h.orig 2024-06-11 16:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/sha2/sha2cc.h 2024-06-14 19:51:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/sha2/sha2cc.h.orig 2024-07-08 16:28:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/sha2/sha2cc.h 2024-07-14 16:28:09.000000000 -0700
</span> @@ -1,6 +1,33 @@
#define COMMON_DIGEST_FOR_OPENSSL 1
#include <CommonCrypto/CommonDigest.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,8 +94,8 @@
</span> +#define SHA384_Init CC_SHA384_Init
+#undef SHA512_Init
+#define SHA512_Init CC_SHA512_Init
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/bundler/gem_helper.rb.orig 2024-06-11 16:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/bundler/gem_helper.rb 2024-06-14 19:51:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/bundler/gem_helper.rb.orig 2024-07-08 16:28:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/bundler/gem_helper.rb 2024-07-14 16:28:09.000000000 -0700
</span> @@ -231,7 +231,7 @@ module Bundler
end
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,8 +105,8 @@
</span> end
end
end
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- signal.c.orig 2024-06-11 16:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ signal.c 2024-06-14 19:51:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- signal.c.orig 2024-07-08 16:28:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ signal.c 2024-07-14 16:28:09.000000000 -0700
</span> @@ -803,7 +803,8 @@ check_stack_overflow(int sig, const uint
const greg_t bp = mctx->gregs[REG_EBP];
# endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,8 +117,8 @@
</span> # define MCTX_SS_REG(reg) __ss.__##reg
# else
# define MCTX_SS_REG(reg) ss.reg
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- vm_dump.c.orig 2024-06-11 16:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vm_dump.c 2024-06-14 19:51:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vm_dump.c.orig 2024-07-08 16:28:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vm_dump.c 2024-07-14 16:28:09.000000000 -0700
</span> @@ -490,7 +490,8 @@ rb_vmdebug_thread_dump_state(FILE *errou
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,3 +139,14 @@
</span> # define UNW_LOCAL_ONLY
# include <libunwind.h>
# include <sys/mman.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vm_insnhelper.c.orig 2024-07-08 16:28:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vm_insnhelper.c 2024-07-14 16:28:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -396,7 +396,7 @@ vm_push_frame(rb_execution_context_t *ec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This is a no-op in all cases we've looked at (https://godbolt.org/z/3oxd1446K), but should guarantee it for all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ future/untested compilers/platforms. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #ifdef HAVE_DECL_ATOMIC_SIGNAL_FENCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if defined HAVE_DECL_ATOMIC_SIGNAL_FENCE && HAVE_DECL_ATOMIC_SIGNAL_FENCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ atomic_signal_fence(memory_order_seq_cst);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby33/files/patch-vm_insnhelper.c.diff b/lang/ruby33/files/patch-vm_insnhelper.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f7fd9de3ebe..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby33/files/patch-vm_insnhelper.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- vm_insnhelper.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vm_insnhelper.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -423,7 +423,7 @@ vm_push_frame(rb_execution_context_t *ec,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This is a no-op in all cases we've looked at (https://godbolt.org/z/3oxd1446K), but should guarantee it for all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- future/untested compilers/platforms. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #ifdef HAVE_DECL_ATOMIC_SIGNAL_FENCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined HAVE_DECL_ATOMIC_SIGNAL_FENCE && HAVE_DECL_ATOMIC_SIGNAL_FENCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- atomic_signal_fence(memory_order_seq_cst);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>