<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/b1902d012fe6c5e1391dee24ddcfb4a6b5ff8c67">https://github.com/macports/macports-ports/commit/b1902d012fe6c5e1391dee24ddcfb4a6b5ff8c67</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 b1902d012fe glib2-upstream: patch refinements, courtesy of @barracuda156 - Also bump revision, to update builds that previously succeeded
</span>b1902d012fe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b1902d012fe6c5e1391dee24ddcfb4a6b5ff8c67
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Apr 22 12:37:12 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> glib2-upstream: patch refinements, courtesy of @barracuda156
</span><span style='display:block; white-space:pre;color:#404040;'> - Also bump revision, to update builds that previously succeeded
</span>---
devel/glib2-upstream/Portfile | 52 ++++++++++++++++------
devel/glib2-upstream/files/patch-declarations.diff | 10 +++++
.../patch-get-launchd-dbus-session-address.diff | 17 ++-----
.../files/patch-gmodule-gmodule-dl.c.diff | 8 ++--
.../files/patch-meson-build-python-path.diff | 11 +++--
.../patch-meson_build-meson_options-appinfo.diff | 5 ++-
devel/glib2-upstream/files/universal.patch | 17 ++++---
7 files changed, 75 insertions(+), 45 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 b40be147d79..b46f8c8fc81 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;'>@@ -15,7 +15,7 @@ name glib2-upstream
</span> conflicts glib2 glib2-devel
set my_name glib
version 2.76.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> epoch 1
checksums rmd160 9ca9728bab7da012152717f78a036cd1883fc94a \
sha256 43dc0f6a126958f5b454136c4398eab420249c16171a769784486e25f2fda19f \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,22 +26,19 @@ categories devel
</span> maintainers {mascguy @mascguy} openmaintainer
license LGPL-2+
homepage https://wiki.gnome.org/Projects/GLib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> dist_subdir glib2
distname ${my_name}-${version}
use_xz yes
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-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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;'>@@ -51,7 +48,8 @@ patchfiles-append \
</span> patch-meson-build-python-path.diff \
patch-meson_build-atomic-test-older-clang-versions.diff \
universal.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-glib2-findfolders-before-SL.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-glib2-findfolders-before-SL.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-declarations.diff
</span>
platform darwin {
if {${os.major} < 11} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,9 +77,6 @@ depends_lib-append port:gettext-runtime \
</span> port:python${py_ver_nodot} \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# REVIEW: While technically not a lib dep, dbus is checked for at build time; but is this necessary?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/pkgconfig/dbus-1.pc:dbus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Python only needed for scripts
depends_skip_archcheck-append \
python${py_ver_nodot}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,10 +117,41 @@ 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;'>+ reinplace -W ${worksrcpath} "s|/usr/bin/env python3$|${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ docs/reference/gio/concat-files-helper.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gio/data-to-c.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib/update-gtranslit.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools/gen-visibility-macros.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set testpath_list [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/gio/tests \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/glib/tests \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/gobject/tests \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach p ${testpath_list} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse f ${p} {
</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_debug "patching testpath: ${f}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "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><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;color:#808080;'>diff --git a/devel/glib2-upstream/files/patch-declarations.diff b/devel/glib2-upstream/files/patch-declarations.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ec2e1501398
</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-declarations.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Due to pervasive use of things like GPOINTER_TO_UINT(), we do not support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # building with -Wbad-function-cast.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Wno-bad-function-cast',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-Wno-declaration-after-statement',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Werror=implicit-function-declaration',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Werror=missing-prototypes',
</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-upstream/files/patch-get-launchd-dbus-session-address.diff b/devel/glib2-upstream/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5465cdbec98..c3ad85d5a02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-upstream/files/patch-get-launchd-dbus-session-address.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;'>---- gio/gdbusaddress.c.orig 2023-03-22 07:28:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gdbusaddress.c 2023-04-18 17:59:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1230,6 +1230,103 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/gdbusaddress.c.orig 2020-10-01 07:43:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/gdbusaddress.c 2021-12-15 18:20:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1223,6 +1223,103 @@
</span>
/* ---------------------------------------------------------------------------------------------------- */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@
</span> static gchar *
get_session_address_platform_specific (GError **error)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1258,7 +1355,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1251,7 +1348,12 @@
</span> * X11 autolaunching; on Windows this means a different autolaunching
* mechanism based on shared memory.
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,12 +117,3 @@
</span> }
/* ---------------------------------------------------------------------------------------------------- */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1342,7 +1444,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * https://dbus.freedesktop.org/doc/dbus-specification.html#ftn.id-1.13.6.4.3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * or, on systems where /run is the same as /var/run, runstatedir:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/209 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ret = g_strdup ("unix:path=" GLIB_RUNSTATEDIR "/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-upstream/files/patch-gmodule-gmodule-dl.c.diff b/devel/glib2-upstream/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ccb2ec12fa8..152b17fa63d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-upstream/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gmodule/gmodule-dl.c.orig 2023-03-22 07:28:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gmodule/gmodule-dl.c 2023-04-18 18:04:29.000000000 -0400
</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> @@ -182,15 +182,18 @@
static void
_g_module_close (gpointer handle)
<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-upstream/files/patch-meson-build-python-path.diff b/devel/glib2-upstream/files/patch-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d58b33c7312..9a9d4668b40 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-upstream/files/patch-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,13 @@
</span> 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 style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2023-03-22 07:28:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2023-04-18 18:15:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2275,7 +2275,7 @@
</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-upstream/files/patch-meson_build-meson_options-appinfo.diff b/devel/glib2-upstream/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 41bd9f6ff06..8a18482bb8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-upstream/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/giomodule.c.orig 2023-03-22 07:28:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/giomodule.c 2023-04-18 18:11:29.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:#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-upstream/files/universal.patch b/devel/glib2-upstream/files/universal.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index de4d1937667..a15260a1157 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-upstream/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,8 @@ 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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/glibconfig.h.in.orig 2023-04-22 10:31:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/glibconfig.h.in 2023-04-22 10:30:17.000000000 -0400
</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> @@ -62,21 +62,43 @@
#define G_HAVE_GINT64 1 /* deprecated, always true */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,19 +109,18 @@ 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;'>-@@ -118,7 +161,11 @@
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@glib_vacopy@
</span> +#if defined(__ppc64__) || defined(__x86_64__)
+#define G_VA_COPY_AS_ARRAY 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define G_VA_COPY va_copy
</span> +#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- @glib_vacopy@
</span>
#define G_HAVE_ISO_VARARGS 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,34 +199,75 @@
</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>
#mesondefine G_ATOMIC_LOCK_FREE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -222,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>