<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/0a822bdb5a2d1eaa25f2301439128c4f2acde0a0">https://github.com/macports/macports-ports/commit/0a822bdb5a2d1eaa25f2301439128c4f2acde0a0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0a822bdb5a2d1eaa25f2301439128c4f2acde0a0
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Apr 14 15:26:23 2024 -0400

<span style='display:block; white-space:pre;color:#404040;'>    gtk4-devel: patch for 'gsk_standard_contour_init' conflicting types
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - Since patch applied unconditionally, rev-bump to rebuild
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/69732
</span>---
 gnome/gtk4-devel/Portfile                        |  6 +++++-
 gnome/gtk4-devel/files/patch-gsk-issue-6628.diff | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk4-devel/Portfile b/gnome/gtk4-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7861c33da8d..d26f1c115e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk4-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk4-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ set my_name         gtk4
</span> set gname           gtk
 
 version             4.14.2
<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          gnome
 license             LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +53,10 @@ patchfiles-append   patch-docs-rst2man.diff
</span> # See: https://trac.macports.org/ticket/67985
 patchfiles-append   patch-meson-build-debug.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Merged upstream patch, for gsk function signature mismatch. Remove for next release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/69732
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-gsk-issue-6628.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
     reinplace "s|@@PYTHON_VERSION@@|${python_branch}|" \
         docs/reference/gtk/meson.build
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk4-devel/files/patch-gsk-issue-6628.diff b/gnome/gtk4-devel/files/patch-gsk-issue-6628.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..76e67ed23f5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk4-devel/files/patch-gsk-issue-6628.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From ce030b1b36e7c63a3c120417cf9b3fdd9d3bdb80 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From: Matthias Clasen <mclasen@redhat.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: Sat, 13 Apr 2024 22:28:48 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Subject: [PATCH] gsk: Fix a minor type mismatch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Use the same types in the declaration of gsk_standard_contour_init.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Issue:         https://gitlab.gnome.org/GNOME/gtk/-/issues/6628
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Merge Request: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/7138
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gsk/gskcontour.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gsk/gskcontour.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -556,7 +556,7 @@ gsk_standard_contour_init (GskContour             *contour,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            gsize                   n_points,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            const gskpathop        *ops,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            gsize                   n_ops,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                           ptrdiff_t               offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                           gssize                  offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gsk_standard_contour_copy (const GskContour *contour,
</span></pre><pre style='margin:0'>

</pre>