<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/afd850d194d7e19342c9cbf73eaac966a546a433">https://github.com/macports/macports-ports/commit/afd850d194d7e19342c9cbf73eaac966a546a433</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 afd850d194d glib2: update to 2.76.2
</span>afd850d194d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit afd850d194d7e19342c9cbf73eaac966a546a433
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat May 13 10:32:55 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> glib2: update to 2.76.2
</span>---
devel/glib2/Portfile | 42 ++++++++++++++++------
devel/glib2/files/patch-declarations.diff | 9 +++--
.../patch-get-launchd-dbus-session-address.diff | 9 -----
devel/glib2/files/patch-gmodule-gmodule-dl.c.diff | 12 +++----
.../glib2/files/patch-meson-build-python-path.diff | 13 ++++---
.../patch-meson_build-meson_options-appinfo.diff | 15 ++++----
devel/glib2/files/universal.patch | 22 ++++++------
7 files changed, 69 insertions(+), 53 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 4f5fdc7eda4..56b709de3d4 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;'>@@ -14,11 +14,11 @@ PortGroup legacysupport 1.1
</span> name glib2
conflicts glib2-devel glib2-upstream
set my_name glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.74.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.76.2
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0b778d88789937ac218f9780643a182362eb2569 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 196ab86c27127a61b7a70c3ba6af7b97bdc01c07cd3b21abd5e778b955eccb1b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5207684
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 537272ca0c11b2a056b07a9d4dc089815402375a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 24f3847857b1d8674cdb0389a36edec0f13c666cd3ce727ecd340eb9da8aca9e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5273836
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,14 +31,13 @@ use_xz yes
</span> use_parallel_build yes
description Library with data structure functions and other constructs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> long_description Glib is a library which includes support routines \
for C, such as lists, trees, hashes, memory \
allocation, and many other things.
master_sites gnome:sources/${my_name}/${branch}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles libintl.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 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:#e0e0e0;'>@@ -119,10 +118,31 @@ if {${universal_possible} && [variant_isset universal]} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|@PYTHON@|${configure.python}|" meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" gio/xdgmime/xdgmime.c glib/gi18n-lib.h glib/gi18n.h gio/gdbusaddress.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PYTHON@|${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gio/xdgmime/xdgmime.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib/gi18n-lib.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib/gi18n.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gio/gdbusaddress.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib/gutils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib/gutils.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib/gspawn.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Upstream mixes three variations of Python shebangs, so account for all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *.py ${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "patching testpath: ${f}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|/usr/bin/python3$|${configure.python}|" ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|/usr/bin/env python$|${configure.python}|" ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|/usr/bin/env python3$|${configure.python}|" ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# this edit does not, for some reason, apply against the build-arm64 config.h
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,7 +178,7 @@ post-destroot {
</span>
set docdir ${prefix}/share/doc/${my_name}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} COPYING HACKING NEWS README.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} COPYING NEWS README.md \
</span> ${destroot}${docdir}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-declarations.diff b/devel/glib2/files/patch-declarations.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f2f795f3083..ec2e1501398 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-declarations.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-declarations.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2022-04-04 05:56:47.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -475,7 +475,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2023-04-18 05:04:39.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2023-04-18 05:05:00.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -524,6 +524,7 @@
</span> # Due to pervasive use of things like GPOINTER_TO_UINT(), we do not support
# building with -Wbad-function-cast.
'-Wno-bad-function-cast',
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- '-Werror=declaration-after-statement',
</span> + '-Wno-declaration-after-statement',
'-Werror=implicit-function-declaration',
'-Werror=missing-prototypes',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Werror=pointer-sign',
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-get-launchd-dbus-session-address.diff b/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 791c56a93a9..c3ad85d5a02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,12 +117,3 @@
</span> }
/* ---------------------------------------------------------------------------------------------------- */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1323,7 +1425,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ret == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ret = g_strdup ("unix:path=/var/run/dbus/system_bus_socket");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ret = g_strdup ("unix:path=@PREFIX@/var/run/dbus/system_bus_socket");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</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-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 4b95eb6e1df..152b17fa63d 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,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gmodule/gmodule-dl.c.orig 2022-04-14 19:15:25.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gmodule/gmodule-dl.c 2022-04-21 03:56:41.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,15 +180,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gmodule/gmodule-dl.c.orig 2023-04-18 04:09:54.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gmodule/gmodule-dl.c 2023-04-18 04:10:21.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -182,15 +182,18 @@
</span> static void
_g_module_close (gpointer handle)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__BIONIC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__BIONIC__) || defined(__NetBSD__)
</span> - if (handle != RTLD_DEFAULT)
-#endif
- {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,11 +15,11 @@
</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;background:#ffe0e0;'>-+ * to things like atexit handlers, atfork handlers, blocks, etc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * to things like atexit handlers, atfork handlers, blocks etc.
</span> + *
+ * See https://trac.macports.org/ticket/45309 for an example from when
+ * a library used by a module added a new dependency which had an
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * initializer which added a child atfork handler. The result is that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * initializer which added a child atfork handler. The result is that
</span> + * after closing the module, the system had a dangling pointer for the
+ * atfork handler which would at best crash on the child side of fork()
+ * and at worst lead to arbitrary code execution of whatever happened to be
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-meson-build-python-path.diff b/devel/glib2/files/patch-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6af6fd34af5..9a9d4668b40 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2023-04-14 06:42:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2023-04-18 17:35:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2290,7 +2290,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GLib2 tries to find "python3" and if it can't find it, it will go for "python"; if port select wasn't explicitly run, this will likely end-up with Python 2.7. As a fallback, meson can use whatever python it's running on if the argument to find_installation is empty.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2022-10-25 20:53:22.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2022-10-27 06:00:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2279,9 +2279,9 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- python = import('python').find_installation()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-python = import('python').find_installation()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python = import('python').find_installation('')
</span> # used for '#!/usr/bin/env <name>'
-python_name = 'python3'
+python_name = '@PYTHON@'
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-meson_build-meson_options-appinfo.diff b/devel/glib2/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e227d0c2d5..8a18482bb8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/giomodule.c.orig 2022-09-17 14:38:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/giomodule.c 2022-09-18 08:55:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/giomodule.c.orig 2023-03-22 19:28:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/giomodule.c 2023-04-18 04:46:12.000000000 +0800
</span> @@ -61,12 +61,13 @@
#endif
#include <glib/gstdio.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(G_OS_UNIX) && !defined(__APPLE__)
</span> +#if defined(G_OS_UNIX)
+#if !defined(HAVE_COCOA) || defined(USE_APPINFO_GENERIC)
#include "gdesktopappinfo.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,18 +15,18 @@
</span> #endif
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_COCOA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span> #include <AvailabilityMacros.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1183,7 +1184,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1192,7 +1193,7 @@
</span>
if (g_once_init_enter (®istered_extensions))
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(G_OS_UNIX) && !defined(__APPLE__)
</span> +#if defined(G_OS_UNIX) && (!defined(HAVE_COCOA) || defined(USE_APPINFO_GENERIC))
#if !GLIB_CHECK_VERSION (3, 0, 0)
ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
g_io_extension_point_set_required_type (ep, G_TYPE_DESKTOP_APP_INFO_LOOKUP);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1327,8 +1328,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1359,8 +1360,10 @@
</span> #endif
#ifdef HAVE_COCOA
g_type_ensure (g_nextstep_settings_backend_get_type ());
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +37,7 @@
</span> #ifdef G_OS_UNIX
g_type_ensure (_g_unix_volume_monitor_get_type ());
g_type_ensure (g_debug_controller_dbus_get_type ());
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- meson_options.txt.orig 2019-11-13 18:24:37.000000000 -0300
+++ meson_options.txt 2019-11-13 18:27:07.000000000 -0300
@@ -1,3 +1,9 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/universal.patch b/devel/glib2/files/universal.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ca3990bd27..a15260a1157 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,9 @@ Allow universal builds. This is only part of the solution; the config.h.ed
</span> script is the other part. If new variables appear in the configure script
that are affected by endianness or bitness, remember to handle them both
here and in config.h.ed.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/glibconfig.h.in.orig 2019-11-17 14:17:08.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/glibconfig.h.in 2019-11-17 14:15:42.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,21 +58,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/glibconfig.h.in.orig 2023-03-22 19:28:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/glibconfig.h.in 2023-04-18 04:59:19.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,21 +62,43 @@
</span>
#define G_HAVE_GINT64 1 /* deprecated, always true */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,7 @@ here and in config.h.ed.
</span>
typedef signed @glib_size_type_define@ gssize;
typedef unsigned @glib_size_type_define@ gsize;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,18 +117,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,18 +121,39 @@
</span>
#define G_POLLFD_FORMAT @g_pollfd_format@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,20 +109,19 @@ here and in config.h.ed.
</span>
#define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
#define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,7 +157,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,7 +162,9 @@
</span> @glib_os@
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_VA_COPY va_copy
</span> -@glib_vacopy@
+#if defined(__ppc64__) || defined(__x86_64__)
+#define G_VA_COPY_AS_ARRAY 1
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- @g_have_iso_c_varargs@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @g_have_iso_cxx_varargs@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -150,34 +196,75 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #mesondefine G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_HAVE_ISO_VARARGS 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -152,34 +197,75 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #mesondefine G_ATOMIC_LOCK_FREE
-#define GINT16_TO_@g_bs_native@(val) ((gint16) (val))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,6 +220,7 @@ here and in config.h.ed.
</span>
#define GLIB_SYSDEF_POLLIN =@g_pollin@
#define GLIB_SYSDEF_POLLOUT =@g_pollout@
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- meson.build.orig 2022-09-18 08:59:25.000000000 -0400
+++ meson.build 2022-09-18 09:02:33.000000000 -0400
@@ -1851,6 +1851,9 @@
</pre><pre style='margin:0'>
</pre>