<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0519ce19a5703e6dc556d87a782059c53bcb7698">https://github.com/macports/macports-ports/commit/0519ce19a5703e6dc556d87a782059c53bcb7698</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0519ce19a5703e6dc556d87a782059c53bcb7698
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Apr 6 14:54:19 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    glib2: fix section of universal.patch impacting ARM64 to match glib2-devel
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Ref (should close, but let's get external feedback):
</span><span style='display:block; white-space:pre;color:#404040;'>    https://trac.macports.org/ticket/64377
</span><span style='display:block; white-space:pre;color:#404040;'>    https://trac.macports.org/ticket/64192
</span><span style='display:block; white-space:pre;color:#404040;'>    https://trac.macports.org/ticket/63891
</span>---
 devel/glib2/Portfile              | 2 +-
 devel/glib2/files/universal.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eda7a5271b5..877c06730e7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ name                        glib2
</span> conflicts                   glib2-devel
 set my_name                 glib
 version                     2.64.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision                    1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision                    2
</span> checksums                   rmd160  27938fd75bdcd4ca0afc8ebce6b137ed3c1fe6a5 \
                             sha256  c36ee07a70164c71f046016fe6aaacd6368333c42590bc0cba47c344ffb853f1 \
                             size    4781576
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/universal.patch b/devel/glib2/files/universal.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index eb88c4a24bd..5496393883d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,7 +114,7 @@ here and in config.h.ed.
</span>  @glib_os@
  
 -@glib_vacopy@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__ppc64__) || defined(__x86_64__)
</span> +#define G_VA_COPY_AS_ARRAY 1
 +#endif
 +
</pre><pre style='margin:0'>

</pre>