<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/3c156b3e2d1b51872e00f5e05259ea4d97fd4a24">https://github.com/macports/macports-ports/commit/3c156b3e2d1b51872e00f5e05259ea4d97fd4a24</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3c156b3e2d1b51872e00f5e05259ea4d97fd4a24
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Sep 16 10:30:31 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> glib2: update to 2.70.5
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/65743
</span>---
devel/glib2/Portfile | 12 +++-----
devel/glib2/files/implicit.patch | 37 -----------------------
devel/glib2/files/patch-gmodule-gmodule-dl.c.diff | 10 +++---
devel/glib2/files/patch-tests-dupfd.diff | 16 ----------
4 files changed, 10 insertions(+), 65 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 4f802392ccc..f6445770268 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.68.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.70.5
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cf4d834a0e8f5e77ba39d627290ac0263ba0f177 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4945212
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e22c130e1179f7ac716cf818f88eb8f9e5aed671 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f70bf76ebcc84e0705722f038be8e2f9a58d17e1a700810c635fcc18b8974b7e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4822784
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,6 @@ long_description Glib is a library which includes support routines \
</span> master_sites gnome:sources/${my_name}/${branch}/
patchfiles libintl.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- implicit.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:#e0e0e0;'>@@ -49,9 +48,6 @@ patchfiles libintl.patch \
</span> universal.patch \
patch-glib2-findfolders-before-SL.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 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:#ffe0e0;'>-patchfiles-append patch-tests-dupfd.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;color:#808080;'>diff --git a/devel/glib2/files/implicit.patch b/devel/glib2/files/implicit.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 98a51f1a6ed..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix implicit declaration of functions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2225
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2020-10-01 07:43:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2021-12-15 14:38:01.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -847,6 +847,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vsnprintf_c99_test_code = '''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- doit(char * s, ...)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -896,6 +897,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf_c99_test_code = '''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- doit()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -942,6 +944,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf_unix98_test_code = '''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2034,6 +2038,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __getcmdline (void)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff b/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d468e46013b..4b95eb6e1df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gmodule/gmodule-dl.c.orig 2020-10-01 07:43:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gmodule/gmodule-dl.c 2021-12-15 18:26:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -133,13 +133,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gmodule/gmodule-dl.c.orig 2022-04-14 19:15:25.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gmodule/gmodule-dl.c 2022-04-21 03:56:41.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,15 +180,18 @@
</span> static void
_g_module_close (gpointer handle)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,10 @@
</span> - if (handle != RTLD_DEFAULT)
-#endif
- {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- lock_dlerror ();
</span> - if (dlclose (handle) != 0)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_module_set_error (fetch_dlerror (TRUE));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_module_set_error (fetch_dlerror (TRUE));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unlock_dlerror ();
</span> - }
+ /* Intentionally not dlclose()ing because it is safer to leave the library
+ * loaded in memory than to close it and possibly leave dangling pointers
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 205475a3a7b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-tests-dupfd.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/tests/spawn-singlethread.c.orig 2022-07-15 14:33:09.397854747 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/tests/spawn-singlethread.c 2022-07-15 14:33:49.402324725 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -451,7 +451,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < (n_fds - 1); ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int source = fcntl (tmp_fd, F_DUPFD_CLOEXEC, 3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int source;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef F_DUPFD_CLOEXEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ source = fcntl (tmp_fd, F_DUPFD_CLOEXEC, 3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ source = dup (tmp_fd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_assert_cmpint (source, >=, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- source_fds[i] = source;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_fds[i] = source + n_fds;
</span></pre><pre style='margin:0'>
</pre>