<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/19afd2a36c34b0c8fab901836f6cb086969ff4f2">https://github.com/macports/macports-ports/commit/19afd2a36c34b0c8fab901836f6cb086969ff4f2</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 19afd2a36c3 glib2-upstream: patch for peerpid build error See: https://trac.macports.org/ticket/65262
</span>19afd2a36c3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 19afd2a36c34b0c8fab901836f6cb086969ff4f2
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue May 31 14:03:52 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> glib2-upstream: patch for peerpid build error
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/65262
</span>---
devel/glib2-upstream/Portfile | 11 +++++++++++
.../files/patch-gio-gsocket.c-peerpid.diff | 21 +++++++++++++++++++++
2 files changed, 32 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/Portfile b/devel/glib2-upstream/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf7dbdf7501..32ded8a9ba5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-upstream/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +53,17 @@ patchfiles libintl.patch \
</span> patch-glib2-findfolders-before-SL.diff \
patch-declarations.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#--------------------------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch for LOCAL_PEERID build issue on 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Ticket:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# * https://trac.macports.org/ticket/65262
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Discussion with upstream:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# * https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2362#note_1468389
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#--------------------------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-gio-gsocket.c-peerpid.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin" && ${os.major} < 11} {
patchfiles-append patch-gio_gcredentialsprivate.h \
patch-gio_gsocket.h
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/files/patch-gio-gsocket.c-peerpid.diff b/devel/glib2-upstream/files/patch-gio-gsocket.c-peerpid.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..79b57d34730
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-upstream/files/patch-gio-gsocket.c-peerpid.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/gsocket.c.orig 2022-05-31 13:53:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/gsocket.c 2022-05-31 13:54:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6068,16 +6068,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = g_credentials_new ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_credentials_set_native (ret,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_CREDENTIALS_NATIVE_TYPE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &cred);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef LOCAL_PEERPID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (getsockopt (socket->priv->fd,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOL_LOCAL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOCAL_PEERPID,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &pid,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &optlen) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _g_credentials_set_local_peerid (ret, pid);
</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;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_set_error (error,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_IO_ERROR,
</span></pre><pre style='margin:0'>
</pre>