<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/2e58745b4009075676e7e9ff0f975c91747d54a3">https://github.com/macports/macports-ports/commit/2e58745b4009075676e7e9ff0f975c91747d54a3</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 2e58745b400 glib2-upstream: update to 2.72.3 - Remove patch for peerpid issue; now included by upstream
</span>2e58745b400 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2e58745b4009075676e7e9ff0f975c91747d54a3
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Jul 5 14:53:23 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> glib2-upstream: update to 2.72.3
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove patch for peerpid issue; now included by upstream
</span>---
devel/glib2-upstream/Portfile | 20 ++++----------------
.../files/patch-gio-gsocket.c-peerpid.diff | 21 ---------------------
2 files changed, 4 insertions(+), 37 deletions(-)
<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 424c50665d6..f8224b40270 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;'>@@ -14,12 +14,12 @@ PortGroup legacysupport 1.1
</span> name glib2-upstream
conflicts glib2 glib2-devel
set my_name glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.72.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.72.3
</span> revision 0
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 68e3b1f591489667f0dc3f0a683c89ab00929010 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4891264
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a2432f98501fe132d14e5ae1c44367d4030529c4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4893484
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,18 +53,6 @@ patchfiles libintl.patch \
</span> patch-glib2-findfolders-before-SL.diff \
patch-declarations.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#--------------------------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch for LOCAL_PEERID build issue on 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Ticket:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# * https://trac.macports.org/ticket/65262
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Status:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# * Patch accepted by upstream, and will be included in future glib2 releases. That includes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 2.72.x, as well as 2.73.x and beyond. Details in ticket referenced above.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#--------------------------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-gio-gsocket.c-peerpid.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 79b57d34730..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-gio-gsocket.c-peerpid.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/gsocket.c.orig 2022-05-31 13:53:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gsocket.c 2022-05-31 13:54:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6068,16 +6068,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = g_credentials_new ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_credentials_set_native (ret,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_CREDENTIALS_NATIVE_TYPE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &cred);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef LOCAL_PEERPID
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (getsockopt (socket->priv->fd,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOL_LOCAL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOCAL_PEERPID,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &pid,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &optlen) == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _g_credentials_set_local_peerid (ret, pid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_set_error (error,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_IO_ERROR,
</span></pre><pre style='margin:0'>
</pre>