<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/b1680bd8cfc9221fdde7ba8b8179c51f73dd4ca0">https://github.com/macports/macports-ports/commit/b1680bd8cfc9221fdde7ba8b8179c51f73dd4ca0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b1680bd8cfc9221fdde7ba8b8179c51f73dd4ca0
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Mon May 16 12:53:36 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> glib2-upstream: new port for testing latest upstream release
</span><span style='display:block; white-space:pre;color:#404040;'> * Includes updated patches
</span><span style='display:block; white-space:pre;color:#404040;'> * Add a fix for building for ppc on 10.6
</span><span style='display:block; white-space:pre;color:#404040;'> * Add legacysupport to get past the aligned memory access error on Leopard & Tiger
</span><span style='display:block; white-space:pre;color:#404040;'> * Primary maintainer will be @mascguy
</span>---
devel/glib2-upstream/Portfile | 193 +++++++++++++++++
devel/glib2-upstream/files/config.h.ed | 36 ++++
devel/glib2-upstream/files/libintl.patch | 23 ++
devel/glib2-upstream/files/patch-declarations.diff | 11 +
.../patch-get-launchd-dbus-session-address.diff | 128 +++++++++++
.../files/patch-gio-tests-meson.build.diff | 16 ++
.../files/patch-gio_gcredentialsprivate.h | 27 +++
devel/glib2-upstream/files/patch-gio_gsocket.h | 18 ++
.../files/patch-gio_xdgmime_xdgmime.c.diff | 11 +
.../files/patch-glib2-findfolders-before-Lion.diff | 83 ++++++++
.../files/patch-glib2-findfolders-before-SL.diff | 83 ++++++++
.../files/patch-glib_gunicollate.c.diff | 12 ++
.../files/patch-gmodule-gmodule-dl.c.diff | 30 +++
.../files/patch-meson-build-python-path.diff | 17 ++
...son_build-atomic-test-older-clang-versions.diff | 13 ++
.../patch-meson_build-meson_options-appinfo.diff | 94 +++++++++
devel/glib2-upstream/files/universal.patch | 234 +++++++++++++++++++++
17 files changed, 1029 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/Portfile b/devel/glib2-upstream/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5d7214e3e8c
</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/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,193 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup clang_dependency 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# to get past the aligned memory access error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Please keep the glib2 and glib2-devel ports as similar as possible.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name glib2-upstream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts glib2 glib2-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name glib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.72.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 48c867d89c423e6fd3c525e42a9e3ee41ea447a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c07e57147b254cef92ce80a0378dc0c02a4358e7de4702e9f403069781095fe2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4890672
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mascguy @mascguy} {ryandesign @ryandesign} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license LGPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://wiki.gnome.org/Projects/GLib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir glib2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Library with data structure functions and other constructs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Glib is a library which includes support routines \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for C, such as lists, trees, hashes, memory \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allocation, and many other things.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites gnome:sources/${my_name}/${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles libintl.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gio-tests-meson.build.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-glib_gunicollate.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gio_xdgmime_xdgmime.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-get-launchd-dbus-session-address.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gmodule-gmodule-dl.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson_build-meson_options-appinfo.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson-build-python-path.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson_build-atomic-test-older-clang-versions.diff \
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-declarations.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-gio_gcredentialsprivate.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gio_gsocket.h
</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 {${os.platform} eq "darwin" && ${os.major} == 10 && ${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-replace patch-glib2-findfolders-before-SL.diff patch-glib2-findfolders-before-Lion.diff
</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;'>+depends_build-append port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:xmllint:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver_nodot [string map {. {}} ${py_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libffi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${macosx_deployment_target} 10.9] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fatal error: error in backend: Cannot select: 0x103357f10: i8,ch = AtomicLoad 0x10334b410, 0x103354b10<Volatile LD1[@is_running.b]> [ID=18]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang < 500}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gcocoanotificationbackend.c:115:52: error: array subscript is not an integer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang < 600}
</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;'>+# https://bugzilla.gnome.org/show_bug.cgi?id=697017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append gcc-3.3 *gcc-4.0 *gcc-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -lresolv is needed at least on Tiger PPC.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -lresolv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -bind_at_load
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -fstrict-aliasing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -Ddefault_library=both \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dwarning_level=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl /usr/bin/perl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python${py_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append PERL_PATH=${configure.perl}
</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 {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my_arch {ppc ppc64 i386 x86_64 arm64} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # strip the automatic setting of host, meson does not accept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_host(${my_arch}) ""
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PYTHON@|${configure.python}|" meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#e0ffe0;'>+ reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.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><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;'>+# this edit does not, for some reason, apply against the build-arm64 config.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and should not be needed if we're using the muniversal PortGroup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# needs testing on 32 bit systems to be certain of this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# system "ed - ${build.dir}/config.h < ${filespath}/config.h.ed"
</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;'>+build.args-append --verbose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dirs {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend dirs ${workpath}/build-${arch}
</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;'>+ set dirs ${workpath}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir ${dirs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -lm is spuriously added by meson NYD to some builds (arm64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q {s| -lm||g} ${dir}/meson-private/glib-2.0.pc
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.args-append --verbose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/lib/charset.alias
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${prefix}/share/doc/${my_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING HACKING NEWS README.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${docdir}
</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;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Ddtrace=false
</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;'>+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><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz conflicts x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Dappinfo_backend=native
</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;'>+variant x11 conflicts quartz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Dappinfo_backend=generic
</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 {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset quartz] && ![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Either +x11 or +quartz is required"
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type gnome-with-unstable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.name ${my_name}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/files/config.h.ed b/devel/glib2-upstream/files/config.h.ed
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a34fabe6c5b
</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/config.h.ed
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/ G_VA_COPY_AS_ARRAY /c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define G_VA_COPY_AS_ARRAY 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* #undef G_VA_COPY_AS_ARRAY */
</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;'>+/ SIZEOF_LONG /c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define SIZEOF_LONG 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define SIZEOF_LONG 4
</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;'>+/ SIZEOF_SIZE_T /c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define SIZEOF_SIZE_T 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define SIZEOF_SIZE_T 4
</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;'>+/ SIZEOF_SSIZE_T /c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define SIZEOF_SSIZE_T 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define SIZEOF_SSIZE_T 4
</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;'>+/ SIZEOF_VOID_P /c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define SIZEOF_VOID_P 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define SIZEOF_VOID_P 4
</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;'>+w
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/files/libintl.patch b/devel/glib2-upstream/files/libintl.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..71ecbe2e266
</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/libintl.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Ensure libintl.h can be found even if -I/opt/local/include is not in CPPFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gi18n-lib.h.orig 2017-07-13 18:03:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gi18n-lib.h 2018-01-31 18:18:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <libintl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <@PREFIX@/include/libintl.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;'>+ #ifndef GETTEXT_PACKAGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gi18n.h.orig 2017-07-13 18:03:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gi18n.h 2018-01-31 18:18:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <libintl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <@PREFIX@/include/libintl.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;'>+ #define _(String) gettext (String)
</span><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..f2f795f3083
</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,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2022-04-04 05:56:47.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -475,7 +475,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;'>+- '-Werror=declaration-after-statement',
</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;'>+ ]
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..791c56a93a9
</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-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,128 @@
</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:#e0ffe0;'>+
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * MacPorts specific D-Bus implementation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * When building under MacPorts on darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * plaforms (including Mac OS X), the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * symbols G_OS_UNIX and __APPLE__ are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * asserted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * The D-Bus session daemon is controlled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * using the Apple launchd facility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * For launchd command details see
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * http://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * launchd(8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * launchctl(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * launchd.plist(5)
</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 defined (G_OS_UNIX) && defined (__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static gchar *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++get_session_address_macports_specific (GError **error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gchar *ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gchar *command_line;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gchar *launchctl_stdout;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gchar *launchctl_stderr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gint exit_status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ command_line = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ launchctl_stdout = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ launchctl_stderr = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ command_line = g_strdup ("launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (G_UNLIKELY (_g_dbus_debug_address ()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _g_dbus_debug_print_lock ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_print ("GDBus-debug:Address: launchctl command line: `%s'\n", command_line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _g_dbus_debug_print_unlock ();
</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 (g_spawn_command_line_sync (command_line,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ &launchctl_stdout,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ &launchctl_stderr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ &exit_status,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ error))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (g_spawn_check_exit_status (exit_status, error))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (launchctl_stdout != NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (G_UNLIKELY (_g_dbus_debug_address ()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gchar *s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _g_dbus_debug_print_lock ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_print ("GDBus-debug:Address: launchctl stdout:");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s = _g_dbus_hexdump (launchctl_stdout, strlen (launchctl_stdout) + 1, 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_print ("\n%s", s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_free (s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _g_dbus_debug_print_unlock ();
</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 (*launchctl_stdout != '\0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gchar *lastchar;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lastchar = launchctl_stdout + strlen(launchctl_stdout) - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (*lastchar == '\n') *lastchar = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = g_strdup_printf ("unix:path=%s", launchctl_stdout);
</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;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_set_error (error,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ G_IO_ERROR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ G_IO_ERROR_FAILED,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _("Session D-Bus not running. Try running `launchctl load -w /Library/LaunchAgents/org.freedesktop.dbus-session.plist'."));
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_prefix_error (error, _("Error spawning command line `%s': "), command_line);
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_free (command_line);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_free (launchctl_stdout);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_free (launchctl_stderr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ret;
</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;background:#e0ffe0;'>++/* ---------------------------------------------------------------------------------------------------- */
</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;'>+ get_session_address_platform_specific (GError **error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1251,7 +1348,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * X11 autolaunching; on Windows this means a different autolaunching
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * mechanism based on shared memory.
</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;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return get_session_address_macports_specific (error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return get_session_address_dbus_launch (error);
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ---------------------------------------------------------------------------------------------------- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1323,7 +1425,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ret == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret = g_strdup ("unix:path=/var/run/dbus/system_bus_socket");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = g_strdup ("unix:path=@PREFIX@/var/run/dbus/system_bus_socket");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</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-upstream/files/patch-gio-tests-meson.build.diff b/devel/glib2-upstream/files/patch-gio-tests-meson.build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..847db09d0a0
</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-gio-tests-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</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 2022-04-21 01:45:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/tests/meson.build 2022-04-21 01:52:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -170,7 +170,7 @@
</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;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;'>+ gio_tests += {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'debugcontroller' : {},
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/files/patch-gio_gcredentialsprivate.h b/devel/glib2-upstream/files/patch-gio_gcredentialsprivate.h
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..dda7593d093
</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-gio_gcredentialsprivate.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/gcredentialsprivate.h.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/gcredentialsprivate.h 2022-04-04 06:56:04.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,7 +135,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_USE_NETBSD_UNPCBID 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_NATIVE_TYPE G_CREDENTIALS_TYPE_NETBSD_UNPCBID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_NATIVE_SIZE (sizeof (struct unpcbid))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* #undef G_CREDENTIALS_UNIX_CREDENTIALS_MESSAGE_SUPPORTED */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_SPOOFING_SUPPORTED 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_HAS_PID 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,6 +160,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/ucred.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef SOL_LOCAL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SOL_LOCAL 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef LOCAL_PEERCRED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LOCAL_PEERCRED 0x001 /* retrieve peer credentails */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef LOCAL_PEERPID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LOCAL_PEERPID 0x002 /* retrieve peer pid */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_SUPPORTED 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_USE_APPLE_XUCRED 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_CREDENTIALS_NATIVE_TYPE G_CREDENTIALS_TYPE_APPLE_XUCRED
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/files/patch-gio_gsocket.h b/devel/glib2-upstream/files/patch-gio_gsocket.h
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..69f80fd7bb0
</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-gio_gsocket.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/gsocket.h.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/gsocket.h 2022-04-04 06:55:30.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,6 +43,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_SOCKET_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_TYPE_SOCKET, GSocketClass))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef LOCAL_PEERCRED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LOCAL_PEERCRED 0x001 /* retrieve peer credentails */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef LOCAL_PEERPID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LOCAL_PEERPID 0x002 /* retrieve peer pid */
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct _GSocketPrivate GSocketPrivate;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct _GSocketClass GSocketClass;
</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-upstream/files/patch-gio_xdgmime_xdgmime.c.diff b/devel/glib2-upstream/files/patch-gio_xdgmime_xdgmime.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a580158600f
</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-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/xdgmime/xdgmime.c.orig 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/xdgmime/xdgmime.c 2019-01-30 10:33:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -235,7 +235,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xdg_data_dirs = getenv ("XDG_DATA_DIRS");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (xdg_data_dirs == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xdg_data_dirs = "/usr/local/share/:/usr/share/";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xdg_data_dirs = "@PREFIX@/share/:/usr/share/";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Work out how many dirs we’re dealing with. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (xdg_data_home != NULL || home != NULL)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/files/patch-glib2-findfolders-before-Lion.diff b/devel/glib2-upstream/files/patch-glib2-findfolders-before-Lion.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3f86346b938
</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-glib2-findfolders-before-Lion.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,83 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gosxutils.m.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gosxutils.m 2022-04-04 05:41:18.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,17 +21,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;'>+ void 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;'>+ 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;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</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;'>+ 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;'>+@@ -39,6 +53,8 @@
</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;'>+@@ -47,10 +63,37 @@
</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 >= 1070
</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;'>++
</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;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/files/patch-glib2-findfolders-before-SL.diff b/devel/glib2-upstream/files/patch-glib2-findfolders-before-SL.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..94fd4ce6378
</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-glib2-findfolders-before-SL.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,83 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gosxutils.m.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gosxutils.m 2022-04-04 05:41:18.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,17 +21,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;'>+ void 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;'>+ 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;'>++#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;'>+ 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;'>+@@ -39,6 +53,8 @@
</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;'>+@@ -47,10 +63,37 @@
</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;'>++
</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;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/files/patch-glib_gunicollate.c.diff b/devel/glib2-upstream/files/patch-glib_gunicollate.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e37633c08a3
</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-glib_gunicollate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gunicollate.c.orig 2017-03-08 21:37:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gunicollate.c 2017-03-29 21:05:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wchar.h>
</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;'>++/* Carbon is not available on 64-bit */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef HAVE_CARBON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_CARBON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4b95eb6e1df
</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-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gmodule/gmodule-dl.c.orig 2022-04-14 19:15:25.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gmodule/gmodule-dl.c 2022-04-21 03:56:41.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,15 +180,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:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__BIONIC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (handle != RTLD_DEFAULT)
</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;'>+- lock_dlerror ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (dlclose (handle) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_module_set_error (fetch_dlerror (TRUE));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unlock_dlerror ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><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><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;'>+ static gpointer
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5f0aba55065
</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-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GLib2 tries to find "python3" and if it can't find it, it will go for "python"; if port select wasn't explicitly run, this will likely end-up with Python 2.7. As a fallback, meson can use whatever python it's running on if the argument to find_installation is empty.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2019-11-21 00:41:53.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2019-11-21 00:44:00.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1992,9 +1992,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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('python3')
</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;'>+ # used for '#!/usr/bin/env <name>'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-python_name = 'python3'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python_name = '@PYTHON@'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_version = python.language_version()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_version_req = '>=3.4'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/files/patch-meson_build-atomic-test-older-clang-versions.diff b/devel/glib2-upstream/files/patch-meson_build-atomic-test-older-clang-versions.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ca47c9a5172
</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-meson_build-atomic-test-older-clang-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.ken 2021-02-15 15:00:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2021-02-15 15:04:16.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1624,8 +1624,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We know that we can always use real ("lock free") atomic operations with MSVC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_atomic_lock_free = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if cc.get_id() == 'gcc' and not cc.compiles(atomicdefine, name : 'atomic ops define')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Old gcc release may provide
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' and not cc.compiles(atomicdefine, name : 'atomic ops define')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Old gcc and clang releases may provide
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # __sync_bool_compare_and_swap but doesn't define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib_conf.set('__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4', true)
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5eb70977384
</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-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,94 @@
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,12 +47,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib/gstdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(G_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(HAVE_COCOA) || defined(USE_APPINFO_GENERIC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gdesktopappinfo.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef HAVE_COCOA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(HAVE_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gosxappinfo.h"
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_COCOA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1088,7 +1089,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registered_extensions = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(G_OS_UNIX) && (!defined(HAVE_COCOA) || defined(USE_APPINFO_GENERIC))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !GLIB_CHECK_VERSION (3, 0, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_io_extension_point_set_required_type (ep, G_TYPE_DESKTOP_APP_INFO_LOOKUP);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1219,8 +1220,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_COCOA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_type_ensure (g_nextstep_settings_backend_get_type ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef USE_APPINFO_GENERIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_type_ensure (g_osx_app_info_get_type ());
</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;'>+ #ifdef G_OS_UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_type_ensure (_g_unix_volume_monitor_get_type ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_type_ensure (g_fdo_notification_backend_get_type ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson_options.txt.orig 2019-11-13 18:24:37.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson_options.txt 2019-11-13 18:27:07.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++option('appinfo_backend',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ type : 'combo',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ choices : ['generic', 'native'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ value : 'generic',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ description : 'appinfo backend to use; either freedesktop (for x11 based builds) or native (for quartz based builds)')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option('runtime_libdir',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type : 'string',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ value : '',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/meson.build.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/meson.build 2022-04-04 05:29:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -380,16 +380,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'gunixoutputstream.h',
</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;'>++ appinfo_backend = get_option('appinfo_backend')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if glib_have_cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ settings_sources += files('gnextstepsettingsbackend.m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- contenttype_sources += files('gosxcontenttype.m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- appinfo_sources += files('gosxappinfo.m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if appinfo_backend == 'native'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ contenttype_sources += files('gosxcontenttype.m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ appinfo_sources += files('gosxappinfo.m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ application_headers += files('gosxappinfo.h')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ contenttype_sources += files('gcontenttype.c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ appinfo_sources += files('gdesktopappinfo.c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gio_unix_include_headers += files('gdesktopappinfo.h')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ framework_dep = dependency('appleframeworks', modules : ['Foundation', 'CoreFoundation', 'AppKit'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform_deps += [framework_dep]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if glib_have_os_x_9_or_later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unix_sources += files('gcocoanotificationbackend.m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- application_headers += files('gosxappinfo.h')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ contenttype_sources += files('gcontenttype.c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appinfo_sources += files('gdesktopappinfo.c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -784,6 +791,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install_dir: bash_comp_inst_dir)
</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;'>++appinfo_backend = get_option('appinfo_backend')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if appinfo_backend == 'native'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ glib_conf.set('USE_APPINFO_NATIVE', 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ glib_conf.set('USE_APPINFO_GENERIC', 1)
</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 enable_dtrace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gio_dtrace_obj = dtrace_obj_gen.process('gio_probes.d')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gio_dtrace_hdr = dtrace_hdr_gen.process('gio_probes.d')
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5ea5aa67848
</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/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,234 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Allow universal builds. This is only part of the solution; the config.h.ed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+script is the other part. If new variables appear in the configure script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+that are affected by endianness or bitness, remember to handle them both
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+here and in config.h.ed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/glibconfig.h.in.orig 2019-11-17 14:17:08.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/glibconfig.h.in 2019-11-17 14:15:42.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,21 +58,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_HAVE_GINT64 1 /* deprecated, always true */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@glib_extension@typedef signed @gint64@ gint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@glib_extension@typedef unsigned @gint64@ guint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GINT64_CONSTANT(val) @gint64_constant@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GUINT64_CONSTANT(val) @guint64_constant@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef signed long gint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef unsigned long guint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_GNUC_EXTENSION typedef signed long long gint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++G_GNUC_EXTENSION typedef unsigned long long guint64;
</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;'>+-#define G_GINT64_MODIFIER @gint64_modifier@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GINT64_FORMAT @gint64_format@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GUINT64_FORMAT @guint64_format@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GINT64_CONSTANT(val) (val##L)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GUINT64_CONSTANT(val) (val##UL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
</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;'>++#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GINT64_MODIFIER "l"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GINT64_FORMAT "li"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GUINT64_FORMAT "lu"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GINT64_MODIFIER "ll"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GINT64_FORMAT "lli"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GUINT64_FORMAT "llu"
</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;'>+-#define GLIB_SIZEOF_VOID_P @glib_void_p@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GLIB_SIZEOF_LONG @glib_long@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GLIB_SIZEOF_SIZE_T @glib_size_t@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GLIB_SIZEOF_SSIZE_T @glib_ssize_t@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GLIB_SIZEOF_VOID_P 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GLIB_SIZEOF_LONG 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GLIB_SIZEOF_SIZE_T 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GLIB_SIZEOF_SSIZE_T 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GLIB_SIZEOF_VOID_P 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GLIB_SIZEOF_LONG 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GLIB_SIZEOF_SIZE_T 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GLIB_SIZEOF_SSIZE_T 4
</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;'>+ typedef signed @glib_size_type_define@ gssize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned @glib_size_type_define@ gsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,18 +117,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_POLLFD_FORMAT @g_pollfd_format@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GPOINTER_TO_INT(p) ((gint) @glib_gpi_cast@ (p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GPOINTER_TO_UINT(p) ((guint) @glib_gpui_cast@ (p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GPOINTER_TO_UINT(p) ((guint) (gulong) (p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GPOINTER_TO_INT(p) ((gint) (gint) (p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GPOINTER_TO_UINT(p) ((guint) (guint) (p))
</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;'>+-#define GINT_TO_POINTER(i) ((gpointer) @glib_gpi_cast@ (i))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT_TO_POINTER(u) ((gpointer) @glib_gpui_cast@ (u))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT_TO_POINTER(i) ((gpointer) (glong) (i))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT_TO_POINTER(u) ((gpointer) (gulong) (u))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT_TO_POINTER(i) ((gpointer) (gint) (i))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT_TO_POINTER(u) ((gpointer) (guint) (u))
</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;'>+-typedef signed @glib_intptr_type_define@ gintptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef unsigned @glib_intptr_type_define@ guintptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef signed long gintptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef unsigned long guintptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef signed int gintptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef unsigned int guintptr;
</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;'>+-#define G_GINTPTR_MODIFIER @gintptr_modifier@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GINTPTR_FORMAT @gintptr_format@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GUINTPTR_FORMAT @guintptr_format@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GINTPTR_MODIFIER "l"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GINTPTR_FORMAT "li"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GUINTPTR_FORMAT "lu"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GINTPTR_MODIFIER ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GINTPTR_FORMAT "i"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GUINTPTR_FORMAT "u"
</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;'>+ #define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,7 +157,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @glib_os@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@glib_vacopy@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__ppc64__) || defined(__x86_64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_VA_COPY_AS_ARRAY 1
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @g_have_iso_c_varargs@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @g_have_iso_cxx_varargs@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,34 +196,75 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #mesondefine G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #mesondefine G_ATOMIC_LOCK_FREE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GINT16_TO_@g_bs_native@(val) ((gint16) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT16_TO_@g_bs_native@(val) ((guint16) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GINT16_TO_@g_bs_alien@(val) ((gint16) GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT16_TO_@g_bs_alien@(val) (GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GINT32_TO_@g_bs_native@(val) ((gint32) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT32_TO_@g_bs_native@(val) ((guint32) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GINT32_TO_@g_bs_alien@(val) ((gint32) GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT32_TO_@g_bs_alien@(val) (GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GINT64_TO_@g_bs_native@(val) ((gint64) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT64_TO_@g_bs_native@(val) ((guint64) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GINT64_TO_@g_bs_alien@(val) ((gint64) GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT64_TO_@g_bs_alien@(val) (GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GLONG_TO_LE(val) ((glong) GINT@glongbits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GULONG_TO_LE(val) ((gulong) GUINT@glongbits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GLONG_TO_BE(val) ((glong) GINT@glongbits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GULONG_TO_BE(val) ((gulong) GUINT@glongbits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __BIG_ENDIAN__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT16_TO_BE(val) ((gint16) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT16_TO_BE(val) ((guint16) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT16_TO_LE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT16_TO_LE(val) (GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT16_TO_LE(val) ((gint16) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT16_TO_LE(val) ((guint16) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
</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;'>++#ifdef __BIG_ENDIAN__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT32_TO_BE(val) ((gint32) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT32_TO_BE(val) ((guint32) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT32_TO_LE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT32_TO_LE(val) (GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT32_TO_LE(val) ((gint32) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT32_TO_LE(val) ((guint32) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val))
</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;'>++#ifdef __BIG_ENDIAN__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT64_TO_BE(val) ((gint64) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT64_TO_BE(val) ((guint64) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT64_TO_LE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT64_TO_LE(val) (GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT64_TO_LE(val) ((gint64) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT64_TO_LE(val) ((guint64) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val))
</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;'>++#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GULONG_TO_LE(val) ((gulong) GUINT64_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GULONG_TO_BE(val) ((gulong) GUINT64_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GULONG_TO_LE(val) ((gulong) GUINT32_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GINT_TO_LE(val) ((gint) GINT@gintbits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GUINT_TO_LE(val) ((guint) GUINT@gintbits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GINT_TO_BE(val) ((gint) GINT@gintbits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GUINT_TO_BE(val) ((guint) GUINT@gintbits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GSIZE_TO_LE(val) ((gsize) GUINT@gsizebits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GSSIZE_TO_LE(val) ((gssize) GINT@gsizebits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GSIZE_TO_BE(val) ((gsize) GUINT@gsizebits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GSSIZE_TO_BE(val) ((gssize) GINT@gsizebits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_BYTE_ORDER @g_byte_order@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GSSIZE_TO_LE(val) ((gssize) GINT64_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GSIZE_TO_BE(val) ((gsize) GUINT64_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GSSIZE_TO_BE(val) ((gssize) GINT64_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GSIZE_TO_LE(val) ((gsize) GUINT32_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GSSIZE_TO_LE(val) ((gssize) GINT32_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GSIZE_TO_BE(val) ((gsize) GUINT32_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GSSIZE_TO_BE(val) ((gssize) GINT32_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __BIG_ENDIAN__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_BYTE_ORDER G_BIG_ENDIAN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_BYTE_ORDER G_LITTLE_ENDIAN
</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;'>++@glib_is_powerpc@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GLIB_SYSDEF_POLLIN =@g_pollin@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GLIB_SYSDEF_POLLOUT =@g_pollout@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2019-11-17 14:26:49.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2019-11-17 14:27:32.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1584,6 +1584,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glibconfig_conf.set(d[1], val)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++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'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++glibconfig_conf.set('glib_is_powerpc', glib_is_powerpc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We need to decide at configure time if GLib will use real atomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # operations ("lock free") or emulated ones with a mutex. This is
</span></pre><pre style='margin:0'>
</pre>