<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/72961c7bf8abdbf89fe0e38dc2e4753931c7dc67">https://github.com/macports/macports-ports/commit/72961c7bf8abdbf89fe0e38dc2e4753931c7dc67</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 72961c7bf8a glib2, glib2-devel: Update to 2.62.6
</span>72961c7bf8a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 72961c7bf8abdbf89fe0e38dc2e4753931c7dc67
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Aug 14 08:06:26 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> glib2, glib2-devel: Update to 2.62.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add a patch to disable the optional dbus-based tests.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63363
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix implicit declaration of functions in meson feature tests.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Reduce differences between glib2 and glib2-devel.
</span>---
devel/glib2-devel/Portfile | 27 +++++--
devel/glib2-devel/files/implicit.patch | 37 ++++++++++
.../files/patch-gio-tests-meson.build.diff | 35 +++++++++
devel/glib2-devel/files/patch-glib-gmain.c.diff | 1 +
.../files/patch-glib2-findfolders-before-SL.diff | 85 ++++++++++++++++++++++
.../patch-meson_build-meson_options-appinfo.diff | 6 +-
devel/glib2/Portfile | 10 ++-
devel/glib2/files/implicit.patch | 37 ++++++++++
devel/glib2/files/patch-gio-tests-meson.build.diff | 35 +++++++++
devel/glib2/files/patch-glib-gmain.c.diff | 1 +
.../patch-meson_build-meson_options-appinfo.diff | 6 +-
11 files changed, 263 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/Portfile b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e5f1ea706d9..278d787a8bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,11 +10,11 @@ PortGroup muniversal 1.0
</span> name glib2-devel
conflicts glib2
set my_name glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.62.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.62.6
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b39d2775a3baccb8d3e777bfa8b23c06e7f646da \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b8d1cdafa46658b63d7512efbe2cd21bd36cd7be83140e44930c47b79f82452e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4702492
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 24b9b58216a9d413b0bdb62f85c5b7d816cd133e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 104fa26fbefae8024ff898330c671ec23ad075c1c0bce45c325c6d5657d58b9c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4703424
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +36,8 @@ 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:#e0ffe0;'>+ implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gio-tests-meson.build.diff \
</span> patch-glib-gmain.c.diff \
patch-glib_gunicollate.c.diff \
patch-gio_xdgmime_xdgmime.c.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,11 +47,12 @@ patchfiles libintl.patch \
</span> patch-meson_build-meson_options-appinfo.diff \
patch-meson-build-python-path.diff \
patch-meson_build-atomic-test-older-clang-versions.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- universal.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-glib2-findfolders-before-SL.diff
</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;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append bin:xmllint:libxml2 \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,6 +80,9 @@ configure.ldflags-append -lresolv \
</span>
configure.cflags-append -fstrict-aliasing
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# stop excessive warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -Wno-deprecated-declarations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.objcflags-append -Wno-deprecated-declarations
</span>
configure.args -Ddefault_library=both \
-Dwarning_level=0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +106,7 @@ post-patch {
</span> reinplace -W ${worksrcpath} "s|@PYTHON@|${configure.python}|" meson.build
reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" gio/gdbusprivate.c gio/xdgmime/xdgmime.c glib/gi18n-lib.h glib/gi18n.h gio/gdbusaddress.c
reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
<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 "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
</span> }
# this edit does not, for some reason, apply against the build-arm64 config.h
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,6 +135,13 @@ platform darwin {
</span> configure.args-append -Ddtrace=false
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # meson on Tiger cannot use rpaths, so we workaround with this to find dylibs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my_phase {build test destroot} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${my_phase}.env-append "DYLD_LIBRARY_PATH=${build_dir}/glib:${build_dir}/gobject:${build_dir}/gio:${build_dir}/gthread:${build_dir}/gmodule"
</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> variant quartz conflicts x11 {
configure.args-append -Dappinfo_backend=native
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/implicit.patch b/devel/glib2-devel/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c64b38d0626
</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-devel/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix implicit declaration of functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2225
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2020-03-18 08:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2021-08-14 05:32:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -827,6 +827,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vsnprintf_c99_test_code = '''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doit(char * s, ...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -876,6 +877,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ snprintf_c99_test_code = '''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doit()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -922,6 +924,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf_unix98_test_code = '''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1948,6 +1952,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef NDEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <assert.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-gio-tests-meson.build.diff b/devel/glib2-devel/files/patch-gio-tests-meson.build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2f7c15c26e9
</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-devel/files/patch-gio-tests-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Disable tests that use dbus because we do not want to declare a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dependency on something only used to run optional tests and we do not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+want the test suite to find and use dbus opportunistically which could
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fail if glib2 is being built universal and dbus is not installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/tests/meson.build.orig 2020-03-18 08:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/tests/meson.build 2021-08-14 04:12:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,8 +95,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check for libdbus1 - Optional - is only used in the GDBus test cases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 1.2.14 required for dbus_message_set_serial
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dbus1_dep = dependency('dbus-1', required : false, version : '>= 1.2.14')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if not dbus1_dep.found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MSVC: Search for the DBus library by the configuration, which corresponds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to the output of CMake builds of DBus. Note that debugoptimized
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,7 +107,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if dbus1_dep.found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib_conf.set('HAVE_DBUS1', 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gio_tests += {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -190,7 +189,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Test programs that need to bring up a session bus (requires dbus-daemon)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- have_dbus_daemon = find_program('dbus-daemon', required : false).found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ have_dbus_daemon = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if have_dbus_daemon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ annotate_args = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '--annotate', 'org.project.Bar', 'Key1', 'Value1',
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-glib-gmain.c.diff b/devel/glib2-devel/files/patch-glib-gmain.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dae309a845c..2994a1dd623 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-glib-gmain.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-glib-gmain.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span> Fix g_get_monotonic_time on non-Intel processors
https://bugzilla.gnome.org/show_bug.cgi?id=728123
https://bug728123.bugzilla-attachments.gnome.org/attachment.cgi?id=275596
<span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixed upstream in 2.65.1.
</span> --- glib/gmain.c.orig 2019-01-21 07:38:50.000000000 -0600
+++ glib/gmain.c 2019-01-30 10:36:31.000000000 -0600
@@ -2759,46 +2759,34 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-glib2-findfolders-before-SL.diff b/devel/glib2-devel/files/patch-glib2-findfolders-before-SL.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..89f3885da1a
</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-devel/files/patch-glib2-findfolders-before-SL.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,85 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git glib/gosxutils.m.orig glib/gosxutils.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7a0d84d..1ba86cb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gosxutils.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gosxutils.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,15 +25,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gutils.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gstrfuncs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POOLSTART NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POOLEND [pool release];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POOLSTART
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POOLEND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static gchar *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_folder (NSSearchPathDirectory type)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POOLSTART
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar *filename;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSString *path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSArray *paths;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ paths = NSSearchPathForDirectoriesInDomains (type, NSUserDomainMask, YES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path = [paths firstObject];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ path = [paths count] ? [paths objectAtIndex:0] : NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (path == nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,6 +57,8 @@ find_folder (NSSearchPathDirectory type)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filename = g_strdup ([path UTF8String]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POOLEND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return filename;
</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;'>+@@ -49,10 +67,37 @@ load_user_special_dirs_macos(gchar **table)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_DESKTOP] = find_folder (NSDesktopDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_DOCUMENTS] = find_folder (NSDocumentDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDownloadsDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_MUSIC] = find_folder (NSMusicDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_PICTURES] = find_folder (NSPicturesDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_PUBLIC_SHARE] = find_folder (NSSharedPublicDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_TEMPLATES] = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_VIDEOS] = find_folder (NSMoviesDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POOLSTART
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* for Tiger and Leopard we have to emulate some by finding the home folder and appending the needed SubFolder name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ even with different languages, these still have the same names to the system; they are just displayed differently
</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;'>++# if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDownloadsDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* for Tiger there is no DownloadsDir, so we use Desktop as glib did previously */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDesktopDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table[G_USER_DIRECTORY_MUSIC] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Music"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table[G_USER_DIRECTORY_PICTURES] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Pictures"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table[G_USER_DIRECTORY_PUBLIC_SHARE] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Public"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table[G_USER_DIRECTORY_TEMPLATES] = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table[G_USER_DIRECTORY_VIDEOS] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Movies"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POOLEND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-meson_build-meson_options-appinfo.diff b/devel/glib2-devel/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e81fbce7499..31b0349a0d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/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 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/giomodule.c 2019-01-30 10:33:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/giomodule.c.orig 2020-03-18 08:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/giomodule.c 2021-08-14 00:05:07.000000000 -0500
</span> @@ -47,12 +47,13 @@
#endif
#include <glib/gstdio.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@
</span> #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;'>-@@ -1228,8 +1229,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1219,8 +1220,10 @@
</span> #endif
#ifdef HAVE_COCOA
g_type_ensure (g_nextstep_settings_backend_get_type ());
<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 c626e7ee6cf..59997c2ebb1 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.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.62.6
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b39d2775a3baccb8d3e777bfa8b23c06e7f646da \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b8d1cdafa46658b63d7512efbe2cd21bd36cd7be83140e44930c47b79f82452e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4702492
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 24b9b58216a9d413b0bdb62f85c5b7d816cd133e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 104fa26fbefae8024ff898330c671ec23ad075c1c0bce45c325c6d5657d58b9c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4703424
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +37,8 @@ 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:#e0ffe0;'>+ implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gio-tests-meson.build.diff \
</span> patch-glib-gmain.c.diff \
patch-glib_gunicollate.c.diff \
patch-gio_xdgmime_xdgmime.c.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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c64b38d0626
</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/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix implicit declaration of functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2225
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2020-03-18 08:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2021-08-14 05:32:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -827,6 +827,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vsnprintf_c99_test_code = '''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doit(char * s, ...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -876,6 +877,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ snprintf_c99_test_code = '''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doit()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -922,6 +924,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf_unix98_test_code = '''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1948,6 +1952,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef NDEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <assert.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2f7c15c26e9
</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/files/patch-gio-tests-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Disable tests that use dbus because we do not want to declare a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dependency on something only used to run optional tests and we do not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+want the test suite to find and use dbus opportunistically which could
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fail if glib2 is being built universal and dbus is not installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/tests/meson.build.orig 2020-03-18 08:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/tests/meson.build 2021-08-14 04:12:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,8 +95,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check for libdbus1 - Optional - is only used in the GDBus test cases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 1.2.14 required for dbus_message_set_serial
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dbus1_dep = dependency('dbus-1', required : false, version : '>= 1.2.14')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if not dbus1_dep.found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MSVC: Search for the DBus library by the configuration, which corresponds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to the output of CMake builds of DBus. Note that debugoptimized
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,7 +107,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if dbus1_dep.found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib_conf.set('HAVE_DBUS1', 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gio_tests += {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -190,7 +189,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Test programs that need to bring up a session bus (requires dbus-daemon)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- have_dbus_daemon = find_program('dbus-daemon', required : false).found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ have_dbus_daemon = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if have_dbus_daemon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ annotate_args = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '--annotate', 'org.project.Bar', 'Key1', 'Value1',
</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><span style='display:block; white-space:pre;color:#808080;'>index dae309a845c..2994a1dd623 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;'>@@ -1,6 +1,7 @@
</span> Fix g_get_monotonic_time on non-Intel processors
https://bugzilla.gnome.org/show_bug.cgi?id=728123
https://bug728123.bugzilla-attachments.gnome.org/attachment.cgi?id=275596
<span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixed upstream in 2.65.1.
</span> --- glib/gmain.c.orig 2019-01-21 07:38:50.000000000 -0600
+++ glib/gmain.c 2019-01-30 10:36:31.000000000 -0600
@@ -2759,46 +2759,34 @@
<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 e81fbce7499..31b0349a0d1 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,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/giomodule.c.orig 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/giomodule.c 2019-01-30 10:33:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/giomodule.c.orig 2020-03-18 08:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/giomodule.c 2021-08-14 00:05:07.000000000 -0500
</span> @@ -47,12 +47,13 @@
#endif
#include <glib/gstdio.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@
</span> #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;'>-@@ -1228,8 +1229,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1219,8 +1220,10 @@
</span> #endif
#ifdef HAVE_COCOA
g_type_ensure (g_nextstep_settings_backend_get_type ());
</pre><pre style='margin:0'>
</pre>