<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/45e1416a394fd312034baf75534f1b8b65f33e54">https://github.com/macports/macports-ports/commit/45e1416a394fd312034baf75534f1b8b65f33e54</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 45e1416a394fd312034baf75534f1b8b65f33e54
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Dec 25 14:03:13 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> glib2: Update to 2.64.6
</span>---
devel/glib2/Portfile | 16 ++++----
devel/glib2/files/implicit.patch | 12 +++---
.../patch-get-launchd-dbus-session-address.diff | 10 ++---
devel/glib2/files/patch-gio-tests-meson.build.diff | 10 ++---
devel/glib2/files/patch-glib-gmain.c.diff | 6 +--
devel/glib2/files/patch-gmodule-gmodule-dl.c.diff | 43 +++++++++-------------
devel/glib2/files/patch-meson_build-c-version.diff | 25 -------------
devel/glib2/files/universal.patch | 1 -
8 files changed, 45 insertions(+), 78 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 44158b79ebc..0dc53dd41f9 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
set my_name glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.62.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 24b9b58216a9d413b0bdb62f85c5b7d816cd133e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 104fa26fbefae8024ff898330c671ec23ad075c1c0bce45c325c6d5657d58b9c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4703424
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.64.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 27938fd75bdcd4ca0afc8ebce6b137ed3c1fe6a5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c36ee07a70164c71f046016fe6aaacd6368333c42590bc0cba47c344ffb853f1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4781576
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,6 @@ master_sites gnome:sources/${my_name}/${branch}/
</span>
patchfiles libintl.patch \
implicit.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson_build-c-version.diff \
</span> patch-gio-tests-meson.build.diff \
patch-glib-gmain.c.diff \
patch-glib_gunicollate.c.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,10 +54,11 @@ patchfiles libintl.patch \
</span> # this test fails (I believe wrongly) when configuring arm64 on Intel
patchfiles-append patch-glib2-allow-frexpl-test-to-pass.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append bin:xmllint:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:xmllint:libxml2 \
</span> port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:gettext-runtime \
</span> port:libffi \
port:libiconv \
port:pcre \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/implicit.patch b/devel/glib2/files/implicit.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c64b38d0626..ac78ab5e0b0 100644
</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;'>+++ b/devel/glib2/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> Fix implicit declaration of functions.
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2225
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2020-03-18 08:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2021-08-14 05:32:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -827,6 +827,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2020-10-01 07:43:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2021-12-15 14:38:01.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -847,6 +847,7 @@
</span> vsnprintf_c99_test_code = '''
#include <stdio.h>
#include <stdarg.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2225
</span>
int
doit(char * s, ...)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -876,6 +877,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -896,6 +897,7 @@
</span> snprintf_c99_test_code = '''
#include <stdio.h>
#include <stdarg.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2225
</span>
int
doit()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -922,6 +924,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -942,6 +944,8 @@
</span>
printf_unix98_test_code = '''
#include <stdio.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2225
</span>
int
main (void)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1948,6 +1952,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2034,6 +2038,7 @@
</span> #include <sys/stat.h>
#include <stdio.h>
#include <stdlib.h>
<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 d2a6f1af07d..791c56a93a9 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;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/gdbusaddress.c.orig 2018-02-06 09:44:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gdbusaddress.c 2018-02-16 05:49:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1215,6 +1215,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;'>-@@ -1243,7 +1340,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,7 +117,7 @@
</span> }
/* ---------------------------------------------------------------------------------------------------- */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1315,7 +1417,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1323,7 +1425,7 @@
</span> ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS"));
if (ret == NULL)
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-gio-tests-meson.build.diff b/devel/glib2/files/patch-gio-tests-meson.build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2f7c15c26e9..13e08678358 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-gio-tests-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-gio-tests-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,9 +3,9 @@ dependency on something only used to run optional tests and we do not
</span> want the test suite to find and use dbus opportunistically which could
fail if glib2 is being built universal and dbus is not installed
universal.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/tests/meson.build.orig 2020-03-18 08:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/tests/meson.build 2021-08-14 04:12:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,8 +95,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/tests/meson.build.orig 2020-10-01 07:43:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/tests/meson.build 2021-12-15 18:20:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,8 +99,7 @@
</span>
# Check for libdbus1 - Optional - is only used in the GDBus test cases
# 1.2.14 required for dbus_message_set_serial
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ universal.
</span> if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl'
# MSVC: Search for the DBus library by the configuration, which corresponds
# to the output of CMake builds of DBus. Note that debugoptimized
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,7 +107,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,7 +111,7 @@
</span> endif
endif
endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ universal.
</span> glib_conf.set('HAVE_DBUS1', 1)
gio_tests += {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -190,7 +189,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -202,7 +201,7 @@
</span> endif
# Test programs that need to bring up a session bus (requires dbus-daemon)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-glib-gmain.c.diff b/devel/glib2/files/patch-glib-gmain.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2994a1dd623..6bc704f3090 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-glib-gmain.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-glib-gmain.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,9 @@ Fix g_get_monotonic_time on non-Intel processors
</span> https://bugzilla.gnome.org/show_bug.cgi?id=728123
https://bug728123.bugzilla-attachments.gnome.org/attachment.cgi?id=275596
Fixed upstream in 2.65.1.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gmain.c.orig 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gmain.c 2019-01-30 10:36:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2759,46 +2759,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gmain.c.orig 2020-10-01 07:43:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gmain.c 2021-12-15 18:20:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2887,46 +2887,34 @@
</span> g_get_monotonic_time (void)
{
static mach_timebase_info_data_t timebase_info;
<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 e893ba376f8..d468e46013b 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,35 +1,28 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gmodule/gmodule-dl.c.orig 2017-10-27 19:42:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gmodule/gmodule-dl.c 2017-11-22 21:54:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -134,22 +134,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _g_module_close (gpointer handle,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gboolean is_unref)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gmodule/gmodule-dl.c.orig 2020-10-01 07:43:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gmodule/gmodule-dl.c 2021-12-15 18:26:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,13 +133,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _g_module_close (gpointer handle)
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* are there any systems out there that have dlopen()/dlclose()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * without a reference count implementation?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Intentionally not dlclose()ing because it is safer to leave the library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * loaded in memory than to close it and possibly leave dangling pointers
</span><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:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * See above for the Android special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * See https://trac.macports.org/ticket/45309 for an example from when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * a library used by a module added a new dependency which had an
</span><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:#ffe0e0;'>-+ * after closing the module, the system had a dangling pointer for the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * atfork handler which would at best crash on the child side of fork()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * and at worst lead to arbitrary code execution of whatever happened to be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * at that location in memory at a later time in the process.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span> -#if defined(__BIONIC__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- is_unref = (handle != RTLD_DEFAULT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- is_unref |= 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (handle != RTLD_DEFAULT)
</span> -#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (is_unref)
</span> - {
- if (dlclose (handle) != 0)
- g_module_set_error (fetch_dlerror (TRUE));
- }
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Intentionally not dlclose()ing because it is safer to leave the library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * loaded in memory than to close it and possibly leave dangling pointers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * to things like atexit handlers, atfork handlers, blocks, etc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * See https://trac.macports.org/ticket/45309 for an example from when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * a library used by a module added a new dependency which had an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * initializer which added a child atfork handler. The result is that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * after closing the module, the system had a dangling pointer for the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * atfork handler which would at best crash on the child side of fork()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * and at worst lead to arbitrary code execution of whatever happened to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * at that location in memory at a later time in the process.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span> }
static gpointer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-meson_build-c-version.diff b/devel/glib2/files/patch-meson_build-c-version.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9699273db51..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-meson_build-c-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 5b8ee178b30df3e6b1ec9a8d3a43d060976a8f0f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Emmanuel Fleury <emmanuel.fleury@u-bordeaux.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 22 Jan 2019 19:58:17 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Bump default build standard to gnu99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- meson.build | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/meson.build b/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 04ca8c2b0..b25df998e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@ project('glib', 'c', 'cpp',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_options : [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'buildtype=debugoptimized',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'warning_level=1',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'c_std=gnu89'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'c_std=gnu99'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GitLab
</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/universal.patch b/devel/glib2/files/universal.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index eaeaa0c853d..eb88c4a24bd 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;'>@@ -243,4 +243,3 @@ here and in config.h.ed.
</span>
# We need to decide at configure time if GLib will use real atomic
# operations ("lock free") or emulated ones with a mutex. This is
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>\ No newline at end of file
</pre><pre style='margin:0'>
</pre>