<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2883f4b47033ba5908784e90dd2cd03186665c09">https://github.com/macports/macports-ports/commit/2883f4b47033ba5908784e90dd2cd03186665c09</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 2883f4b4703 ofc: add a patch from upstream
</span>2883f4b4703 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2883f4b47033ba5908784e90dd2cd03186665c09
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Thu Feb 2 19:58:03 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> ofc: add a patch from upstream
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Sergey Fedorov <vital.had@gmail.com>
</span>---
lang/ofc/Portfile | 7 ++--
lang/ofc/files/patch-upstream.diff | 74 ++++++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ofc/Portfile b/lang/ofc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 214993f8897..755d40a12c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ofc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ofc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ PortGroup makefile 1.0
</span> legacysupport.newest_darwin_requires_legacy 10
github.setup CodethinkLabs ofc 1 release/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories lang
license Apache-2
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,12 +23,13 @@ checksums rmd160 3435ba4379233f0a55014aa9509d68f5979dfac7 \
</span> size 196221
installs_libs no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://github.com/CodethinkLabs/ofc/issues/45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-upstream.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.blacklist *gcc-4.* {clang < 421}
post-patch {
reinplace "s|/usr/local|${prefix}|" ${worksrcpath}/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/CodethinkLabs/ofc/issues/45
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-Werror||" ${worksrcpath}/Makefile
</span>
if {${os.platform} eq "darwin" && ${os.major} < 11} {
reinplace "s|LDFLAGS = -lm|LDFLAGS = -lm -lMacportsLegacySupport|" ${worksrcpath}/Makefile
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ofc/files/patch-upstream.diff b/lang/ofc/files/patch-upstream.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b2b53f4b0ea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ofc/files/patch-upstream.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,74 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/colstr.c.orig 2017-10-24 19:11:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/colstr.c 2023-02-02 19:44:09.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,6 +179,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* prefix, char quote,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* base, unsigned size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!base)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (size < 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ofc_colstr_atomic_writef(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/file.c.orig 2017-10-24 19:11:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/file.c 2023-02-02 19:45:17.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -286,6 +286,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case '\r':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Support Windows line endings when running on cygwin. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (file->strz[i + 1] == '\n') i++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __attribute__ ((fallthrough));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case '\n':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r += 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/sema/typeval.c.orig 2017-10-24 19:11:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/sema/typeval.c 2023-02-02 19:46:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1116,6 +1116,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ofc_sema_typeval_t tv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tv.type = type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tv.src = typeval->src;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tv.integer = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned tsize, csize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!ofc_sema_type_base_size(typeval->type, &tsize)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1158,7 +1159,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ofc_sparse_ref_warning(typeval->src,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Casting CHARACTER to INTEGER");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tv.integer = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(&tv.integer, typeval->character, csize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ofc_sema_typeval__alloc(tv);
</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;'>+--- src/parse/lhs.c.orig 2017-10-24 19:11:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/parse/lhs.c 2023-02-02 19:48:52.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,7 +65,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!src || !dst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ofc_parse_lhs_t clone;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ofc_parse_lhs_t clone = {0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clone.type = src->type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clone.src = src->src;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -456,7 +456,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</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;'>+- lhs->type = OFC_PARSE_EXPR_IMPLICIT_DO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lhs->type = OFC_PARSE_LHS_IMPLICIT_DO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lhs->src = ofc_sparse_ref(src, ptr, l);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lhs->implicit_do = id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/sema/expr.c.orig 2017-10-24 19:11:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/sema/expr.c 2023-02-02 19:48:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2405,7 +2405,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < list->count; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ofc_sema_expr_t* expr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((list->expr[i]->type == OFC_PARSE_EXPR_IMPLICIT_DO))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (list->expr[i]->type == OFC_PARSE_EXPR_IMPLICIT_DO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!allow_implicit_do)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>
</pre>