<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/3326ac76067e82f492277383509423dd19559afa">https://github.com/macports/macports-ports/commit/3326ac76067e82f492277383509423dd19559afa</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 3326ac76067 glib2: update to 2.68.4
</span>3326ac76067 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3326ac76067e82f492277383509423dd19559afa
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Aug 10 10:13:14 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> glib2: update to 2.68.4
</span>---
devel/glib2/Portfile | 23 ++++++++++++------
.../files/patch-gio_gcredentialsprivate.h.diff | 27 ++++++++++++++++++++++
devel/glib2/files/patch-gio_gdbusprivate.c.diff | 20 ----------------
devel/glib2/files/patch-gio_gsocket.h.diff | 18 +++++++++++++++
devel/glib2/files/patch-tests-dupfd.diff | 16 +++++++++++++
5 files changed, 77 insertions(+), 27 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 3d88049a822..21de6ec1753 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;'>@@ -11,11 +11,11 @@ PortGroup muniversal 1.0
</span> name glib2
conflicts glib2-devel glib2-upstream
set my_name glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.66.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d0cf7cb648c93cfee7288c586960b164d5e85f21 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4845548
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.68.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cf4d834a0e8f5e77ba39d627290ac0263ba0f177 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4945212
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,6 @@ patchfiles libintl.patch \
</span> patch-gio-tests-meson.build.diff \
patch-glib_gunicollate.c.diff \
patch-gio_xdgmime_xdgmime.c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gio_gdbusprivate.c.diff \
</span> patch-get-launchd-dbus-session-address.diff \
patch-gmodule-gmodule-dl.c.diff \
patch-meson_build-meson_options-appinfo.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,10 +49,20 @@ patchfiles libintl.patch \
</span> universal.patch \
patch-glib2-findfolders-before-SL.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch for use of F_DUPFD_CLOEXEC. Fixed in previous and later versions, and exclusive to 2.68.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-tests-dupfd.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Patch for broken poll() on macOS; fix included in glib2 v2.72.1 and later
# See: https://trac.macports.org/ticket/63650
patchfiles-append patch-meson-build-broken_poll.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-gio_gcredentialsprivate.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gio_gsocket.h.diff
</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;'>+
</span> depends_build-append port:gettext \
bin:xmllint:libxml2 \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +118,7 @@ if {${universal_possible} && [variant_isset universal]} {
</span>
post-patch {
reinplace -W ${worksrcpath} "s|@PYTHON@|${configure.python}|" meson.build
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" gio/gdbusprivate.c gio/xdgmime/xdgmime.c glib/gi18n-lib.h glib/gi18n.h gio/gdbusaddress.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" gio/xdgmime/xdgmime.c glib/gi18n-lib.h glib/gi18n.h gio/gdbusaddress.c
</span> reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-gio_gcredentialsprivate.h.diff b/devel/glib2/files/patch-gio_gcredentialsprivate.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..dda7593d093
</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/files/patch-gio_gcredentialsprivate.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/gcredentialsprivate.h.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/gcredentialsprivate.h 2022-04-04 06:56:04.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,7 +135,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_USE_NETBSD_UNPCBID 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_NATIVE_TYPE G_CREDENTIALS_TYPE_NETBSD_UNPCBID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_NATIVE_SIZE (sizeof (struct unpcbid))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* #undef G_CREDENTIALS_UNIX_CREDENTIALS_MESSAGE_SUPPORTED */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_SPOOFING_SUPPORTED 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_HAS_PID 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,6 +160,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/ucred.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef SOL_LOCAL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SOL_LOCAL 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef LOCAL_PEERCRED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LOCAL_PEERCRED 0x001 /* retrieve peer credentails */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef LOCAL_PEERPID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LOCAL_PEERPID 0x002 /* retrieve peer pid */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_SUPPORTED 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_USE_APPLE_XUCRED 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_NATIVE_TYPE G_CREDENTIALS_TYPE_APPLE_XUCRED
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-gio_gdbusprivate.c.diff b/devel/glib2/files/patch-gio_gdbusprivate.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8991bbe08e6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/gdbusprivate.c.orig 2017-05-31 15:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gdbusprivate.c 2017-06-24 05:53:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2471,7 +2471,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* TODO: use PACKAGE_LOCALSTATEDIR ? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- first_error = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!g_file_get_contents ("/var/lib/dbus/machine-id",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!g_file_get_contents ("@PREFIX@/var/lib/dbus/machine-id",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &ret,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &first_error) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2481,7 +2481,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NULL))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_propagate_prefixed_error (error, first_error,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _("Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _("Unable to load @PREFIX@/var/lib/dbus/machine-id or /etc/machine-id: "));
</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;color:#808080;'>diff --git a/devel/glib2/files/patch-gio_gsocket.h.diff b/devel/glib2/files/patch-gio_gsocket.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..69f80fd7bb0
</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/files/patch-gio_gsocket.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/gsocket.h.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/gsocket.h 2022-04-04 06:55:30.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,6 +43,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_SOCKET_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_TYPE_SOCKET, GSocketClass))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef LOCAL_PEERCRED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LOCAL_PEERCRED 0x001 /* retrieve peer credentails */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef LOCAL_PEERPID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LOCAL_PEERPID 0x002 /* retrieve peer pid */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ typedef struct _GSocketPrivate GSocketPrivate;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct _GSocketClass GSocketClass;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-tests-dupfd.diff b/devel/glib2/files/patch-tests-dupfd.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..205475a3a7b
</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/files/patch-tests-dupfd.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/tests/spawn-singlethread.c.orig 2022-07-15 14:33:09.397854747 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/tests/spawn-singlethread.c 2022-07-15 14:33:49.402324725 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -451,7 +451,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < (n_fds - 1); ++i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int source = fcntl (tmp_fd, F_DUPFD_CLOEXEC, 3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int source;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef F_DUPFD_CLOEXEC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ source = fcntl (tmp_fd, F_DUPFD_CLOEXEC, 3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ source = dup (tmp_fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_assert_cmpint (source, >=, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ source_fds[i] = source;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_fds[i] = source + n_fds;
</span></pre><pre style='margin:0'>
</pre>