<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/ff608e32d3ebb1513e55f21d71de116e9c1c24bb">https://github.com/macports/macports-ports/commit/ff608e32d3ebb1513e55f21d71de116e9c1c24bb</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 ff608e32d3e ruby: fix type conversion errors
</span>ff608e32d3e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ff608e32d3ebb1513e55f21d71de116e9c1c24bb
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Mar 20 19:57:09 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> ruby: fix type conversion errors
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> These warnings have become errors as of Xcode 15.3.
</span>---
lang/ruby/Portfile | 3 +-
lang/ruby/files/conversion.patch | 107 +++++++++++++++++++++++++++++++++++++++
2 files changed, 109 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby/Portfile b/lang/ruby/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0981cfdbfda..03f32b02caf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,8 @@ patchfiles patch-vendordir.diff \
</span> patch-ext_openssl_extconf_rb.diff \
patch-ext_openssl_ossl_ssl_c.diff \
patch-ext_openssl_ossl.h.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- implicit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conversion.patch
</span>
# ignore getcontext() and setcontext()
# on 10.5 or later, these functions have some problems (SEGV on ppc, slower than 1.8.6)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby/files/conversion.patch b/lang/ruby/files/conversion.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..13ece9cabdb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby/files/conversion.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,107 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- eval.c.orig 2024-03-20 19:48:01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ eval.c 2024-03-20 19:49:33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6809,12 +6809,12 @@ yield_under(under, self, args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VALUE under, self, args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (args == Qundef) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return exec_under(yield_under_i, under, 0, self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return exec_under(yield_under_i, under, 0, (void *)self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VALUE info[2] = { args, self };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return exec_under(yield_args_under_i, under, 0, (VALUE)info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return exec_under(yield_args_under_i, under, 0, info);
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12650,7 +12650,7 @@ rb_thread_initialize(thread, args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rb_raise(rb_eThreadError, "already initialized thread - %s:%d",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ node->nd_file, nd_line(node));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return rb_thread_start_0(rb_thread_yield, args, th);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return rb_thread_start_0(rb_thread_yield, (void *)args, th);
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12671,7 +12671,7 @@ rb_thread_start(klass, args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!rb_block_given_p()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rb_raise(rb_eThreadError, "must be called with a block");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return rb_thread_start_0(rb_thread_yield, args, rb_thread_alloc(klass));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return rb_thread_start_0(rb_thread_yield, (void *)args, rb_thread_alloc(klass));
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- range.c.orig 2009-02-22 23:43:42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ range.c 2024-03-20 19:02:38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -390,7 +390,7 @@ range_step(argc, argv, range)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args[0] = INT2FIX(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args[1] = step;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- range_each_func(range, step_i, b, e, args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ range_each_func(range, (void *)step_i, b, e, args);
</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;'>+ return range;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- string.c.orig 2011-12-28 23:47:15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ string.c 2024-03-20 19:09:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1985,8 +1985,7 @@ get_arg_pat(pat, quote)
</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;'>+ static VALUE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-get_arg_pat(pat, quote)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VALUE pat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++get_arg_pat(VALUE pat)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return rb_rescue2(get_pat_quoted, pat,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ regcomp_failed, pat,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/openssl/openssl_missing.h.orig 2010-05-25 09:58:49
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/openssl/openssl_missing.h 2024-03-20 19:22:17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,7 @@ typedef int i2d_of_void();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(PEM_read_bio_DSAPublicKey)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define PEM_read_bio_DSAPublicKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (char *(*)())d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(char **)x,cb,u)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (d2i_of_void *)d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(char **)x,cb,u)
</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;background:#e0ffe0;'>+ #if !defined(PEM_write_bio_DSAPublicKey)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,22 +45,22 @@ typedef int i2d_of_void();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(DSAPublicKey_dup)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((i2d_of_void *)i2d_DSAPublicKey, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (char *(*)())d2i_DSAPublicKey,(char *)dsa)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (d2i_of_void *)d2i_DSAPublicKey,(char *)dsa)
</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;background:#e0ffe0;'>+ #if !defined(X509_REVOKED_dup)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((i2d_of_void *)i2d_X509_REVOKED, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (char *(*)())d2i_X509_REVOKED, (char *)rev)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (d2i_of_void *)d2i_X509_REVOKED, (char *)rev)
</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;background:#e0ffe0;'>+ #if !defined(PKCS7_SIGNER_INFO_dup)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define PKCS7_SIGNER_INFO_dup(si) (PKCS7_SIGNER_INFO *)ASN1_dup((i2d_of_void *)i2d_PKCS7_SIGNER_INFO, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (char *(*)())d2i_PKCS7_SIGNER_INFO, (char *)si)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (d2i_of_void *)d2i_PKCS7_SIGNER_INFO, (char *)si)
</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;background:#e0ffe0;'>+ #if !defined(PKCS7_RECIP_INFO_dup)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define PKCS7_RECIP_INFO_dup(ri) (PKCS7_RECIP_INFO *)ASN1_dup((i2d_of_void *)i2d_PKCS7_RECIP_INFO, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (d2i_of_void *)d2i_PKCS7_RECIP_INFO, (char *)ri)
</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;background:#e0ffe0;'>+ #if !defined(HAVE_EVP_MD_CTX_INIT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/openssl/ossl_ssl.c.orig 2012-02-08 17:09:40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/openssl/ossl_ssl.c 2024-03-20 19:40:58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,7 +95,7 @@ struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SSL_METHOD *(*func)(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const SSL_METHOD *(*func)(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } ossl_ssl_method_tab[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSSL_SSL_METHOD_ENTRY(TLSv1),
</span></pre><pre style='margin:0'>
</pre>