<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/ae7b2930564f5dc56f1b9584ea4c0e16b5bcc9ea">https://github.com/macports/macports-ports/commit/ae7b2930564f5dc56f1b9584ea4c0e16b5bcc9ea</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ae7b2930564f5dc56f1b9584ea4c0e16b5bcc9ea
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu Jul 7 11:28:51 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> glib2: update to 2.66.8
</span>---
devel/glib2/Portfile | 14 ++--
devel/glib2/files/implicit.patch | 4 +-
devel/glib2/files/patch-glib-gmain.c.diff | 74 ----------------------
.../patch-glib2-allow-frexpl-test-to-pass.diff | 12 ----
devel/glib2/files/universal.patch | 13 +---
5 files changed, 8 insertions(+), 109 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 ee51c7004fb..a03898fd048 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.64.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 27938fd75bdcd4ca0afc8ebce6b137ed3c1fe6a5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c36ee07a70164c71f046016fe6aaacd6368333c42590bc0cba47c344ffb853f1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4781576
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.66.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d0cf7cb648c93cfee7288c586960b164d5e85f21 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4845548
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,6 @@ master_sites gnome:sources/${my_name}/${branch}/
</span> patchfiles libintl.patch \
implicit.patch \
patch-gio-tests-meson.build.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-glib-gmain.c.diff \
</span> patch-glib_gunicollate.c.diff \
patch-gio_xdgmime_xdgmime.c.diff \
patch-gio_gdbusprivate.c.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,9 +50,6 @@ patchfiles libintl.patch \
</span> universal.patch \
patch-glib2-findfolders-before-SL.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# this test fails (I believe wrongly) when configuring arm64 on Intel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-glib2-allow-frexpl-test-to-pass.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append port:gettext \
bin:xmllint:libxml2 \
port:pkgconfig
<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 ac78ab5e0b0..98a51f1a6ed 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;'>@@ -32,6 +32,6 @@ https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2225
</span> #include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <assert.h>
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __getcmdline (void)
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6bc704f3090..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,74 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix g_get_monotonic_time on non-Intel processors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugzilla.gnome.org/show_bug.cgi?id=728123
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bug728123.bugzilla-attachments.gnome.org/attachment.cgi?id=275596
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixed upstream in 2.65.1.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gmain.c.orig 2020-10-01 07:43:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gmain.c 2021-12-15 18:20:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2887,46 +2887,34 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_get_monotonic_time (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static mach_timebase_info_data_t timebase_info;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static double absolute_to_micro;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (timebase_info.denom == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* This is a fraction that we must use to scale
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * mach_absolute_time() by in order to reach nanoseconds.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * We've only ever observed this to be 1/1, but maybe it could be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * 1000/1 if mach time is microseconds already, or 1/1000 if
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * picoseconds. Try to deal nicely with that.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* mach_absolute_time() returns "absolute time units", rather than
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ seconds; the mach_timebase_info_data_t struct provides a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fraction that can be used to convert these units into seconds.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mach_timebase_info (&timebase_info);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* We actually want microseconds... */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (timebase_info.numer % 1000 == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timebase_info.numer /= 1000;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timebase_info.denom *= 1000;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* We want to make the numer 1 to avoid having to multiply... */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (timebase_info.denom % timebase_info.numer == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timebase_info.denom /= timebase_info.numer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timebase_info.numer = 1;
</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;background:#ffe0e0;'>-- /* We could just multiply by timebase_info.numer below, but why
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * bother for a case that may never actually exist...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * Plus -- performing the multiplication would risk integer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * overflow. If we ever actually end up in this situation, we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * should more carefully evaluate the correct course of action.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mach_timebase_info (&timebase_info); /* Get a fresh copy for a better message */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_error ("Got weird mach timebase info of %d/%d. Please file a bug against GLib.",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timebase_info.numer, timebase_info.denom);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ absolute_to_micro = 1e-3 * timebase_info.numer / timebase_info.denom;
</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;'>-- return mach_absolute_time () / timebase_info.denom;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (timebase_info.denom == 1 && timebase_info.numer == 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* On Intel, the fraction has been 1/1 to date, so we can shortcut
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ the conversion into microseconds.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return mach_absolute_time () / 1000;
</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;background:#ffe0e0;'>-+ /* On ARM and PowerPC, the value is unpredictable and is hardware
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dependent, so we can't guess. Both the units and numer/denom
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ are extremely large, so the conversion number is stored as a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double in order to avoid integer overflow.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return mach_absolute_time () * absolute_to_micro;
</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;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gint64
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-glib2-allow-frexpl-test-to-pass.diff b/devel/glib2/files/patch-glib2-allow-frexpl-test-to-pass.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 716903bb0df..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-glib2-allow-frexpl-test-to-pass.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git glib/gnulib/gl_cv_func_frexpl_works/meson.build.orig glib/gnulib/gl_cv_func_frexpl_works/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 303ec63..50e614e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gnulib/gl_cv_func_frexpl_works/meson.build.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gnulib/gl_cv_func_frexpl_works/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,7 +120,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (host_system.startswith ('aix') or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- host_system.startswith ('beos') or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- host_system.startswith ('darwin') or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- host_system.startswith ('irix'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_cv_func_frexpl_works = false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_cv_func_frexpl_broken_beyond_repair = true
</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 5496393883d..5ea5aa67848 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;'>@@ -223,21 +223,10 @@ here and in config.h.ed.
</span> #define GLIB_SYSDEF_POLLOUT =@g_pollout@
--- meson.build.orig 2019-11-17 14:26:49.000000000 -0300
+++ meson.build 2019-11-17 14:27:32.000000000 -0300
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1584,17 +1584,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1584,6 +1584,8 @@
</span> glibconfig_conf.set(d[1], val)
endforeach
<span style='display:block; white-space:pre;background:#ffe0e0;'>--# We need a more robust approach here...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- host_cpu_family = host_machine.cpu_family()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if host_cpu_family == 'x86' or host_cpu_family == 'x86_64' or host_cpu_family == 's390' or host_cpu_family == 's390x' or host_cpu_family.startswith('arm') or host_cpu_family == 'aarch64' or host_cpu_family.startswith('crisv32') or host_cpu_family.startswith('etrax')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- glib_memory_barrier_needed = false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elif host_cpu_family.startswith('sparc') or host_cpu_family.startswith('alpha') or host_cpu_family.startswith('powerpc') or host_cpu_family == 'ia64'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- glib_memory_barrier_needed = true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- warning('Unknown host cpu: ' + host_cpu_family)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- glib_memory_barrier_needed = true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--glibconfig_conf.set('G_ATOMIC_OP_MEMORY_BARRIER_NEEDED', glib_memory_barrier_needed)
</span> +glib_is_powerpc = '#if (defined(__PPC__) || defined(__PPC64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(_ARCH_PPC) || defined(_ARCH_PPC64))\n#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#undef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#endif\n#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1\n#else\n#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#undef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#endif\n#endif'
+glibconfig_conf.set('glib_is_powerpc', glib_is_powerpc)
</pre><pre style='margin:0'>
</pre>