<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/dd7eafbbe991f1727e956427ecbfcfc4b84eacad">https://github.com/macports/macports-ports/commit/dd7eafbbe991f1727e956427ecbfcfc4b84eacad</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new dd7eafbbe99 glib2-upstream: obsolete
</span>dd7eafbbe99 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dd7eafbbe991f1727e956427ecbfcfc4b84eacad
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat May 13 10:49:03 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> glib2-upstream: obsolete
</span>---
devel/glib2-devel/Portfile | 2 +-
devel/glib2-upstream/Portfile | 218 +------------------
devel/glib2-upstream/files/config.h.ed | 36 ----
devel/glib2-upstream/files/libintl.patch | 23 --
devel/glib2-upstream/files/patch-declarations.diff | 10 -
.../patch-get-launchd-dbus-session-address.diff | 119 -----------
.../files/patch-gio-tests-meson.build.diff | 16 --
.../files/patch-gio_gcredentials.c.diff | 14 --
.../files/patch-gio_gcredentialsprivate.h.diff | 27 ---
.../glib2-upstream/files/patch-gio_gsocket.h.diff | 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 | 16 --
...son_build-atomic-test-older-clang-versions.diff | 13 --
.../patch-meson_build-meson_options-appinfo.diff | 95 ---------
devel/glib2-upstream/files/universal.patch | 235 ---------------------
devel/glib2/Portfile | 2 +-
20 files changed, 6 insertions(+), 1057 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/Portfile b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ff954a874d1..0d7b41cecf2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ PortGroup legacysupport 1.1
</span> # Please keep the glib2 and glib2-devel ports as similar as possible.
name glib2-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts glib2 glib2-upstream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts glib2
</span> set my_name glib
version 2.76.2
revision 0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/Portfile b/devel/glib2-upstream/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a8eb55d00f5..5beeee429f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-upstream/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,223 +1,13 @@
</span> # -*- 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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup clang_dependency 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup meson 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# to get past the aligned memory access error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Please keep the glib2 and glib2-devel ports as similar as possible.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span>
name glib2-upstream
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts glib2 glib2-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_name glib
</span> version 2.76.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 537272ca0c11b2a056b07a9d4dc089815402375a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 24f3847857b1d8674cdb0389a36edec0f13c666cd3ce727ecd340eb9da8aca9e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5273836
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span> categories devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {mascguy @mascguy} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license LGPL-2+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://wiki.gnome.org/Projects/GLib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir glib2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Library with data structure functions and other constructs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Glib is a library which includes support routines \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for C, such as lists, trees, hashes, memory \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allocation, and many other things.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites gnome:sources/${my_name}/${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append libintl.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gio-tests-meson.build.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-glib_gunicollate.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gio_xdgmime_xdgmime.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-get-launchd-dbus-session-address.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gmodule-gmodule-dl.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson_build-meson_options-appinfo.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson-build-python-path.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson_build-atomic-test-older-clang-versions.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-glib2-findfolders-before-SL.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-declarations.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-gio_gcredentialsprivate.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gio_gcredentials.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gio_gsocket.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} == 10 && ${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace patch-glib2-findfolders-before-SL.diff patch-glib2-findfolders-before-Lion.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin:xmllint:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set py_ver 3.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set py_ver_nodot [string map {. {}} ${py_ver}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libffi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pcre2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${py_ver_nodot} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Python only needed for scripts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python${py_ver_nodot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${macosx_deployment_target} 10.9] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#ffe0e0;'>- compiler.blacklist-append {clang < 500}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gcocoanotificationbackend.c:115:52: error: array subscript is not an integer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang < 600}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://bugzilla.gnome.org/show_bug.cgi?id=697017
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append gcc-3.3 *gcc-4.0 *gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -lresolv is needed at least on Tiger PPC.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -lresolv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -bind_at_load
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -fstrict-aliasing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# stop excessive warnings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -Wno-deprecated-declarations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.objcflags-append -Wno-deprecated-declarations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args -Ddefault_library=both \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dwarning_level=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.perl /usr/bin/perl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python${py_ver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append PERL_PATH=${configure.perl}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my_arch {ppc ppc64 i386 x86_64 arm64} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # strip the automatic setting of host, meson does not accept
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_host(${my_arch}) ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|@PYTHON@|${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gio/xdgmime/xdgmime.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glib/gi18n-lib.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glib/gi18n.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gio/gdbusaddress.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glib/gutils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glib/gutils.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glib/gspawn.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Upstream mixes three variations of Python shebangs, so account for all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match *.py ${f}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "patching testpath: ${f}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "s|/usr/bin/python3$|${configure.python}|" ${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "s|/usr/bin/env python$|${configure.python}|" ${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "s|/usr/bin/env python3$|${configure.python}|" ${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# this edit does not, for some reason, apply against the build-arm64 config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and should not be needed if we're using the muniversal PortGroup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# needs testing on 32 bit systems to be certain of this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# system "ed - ${build.dir}/config.h < ${filespath}/config.h.ed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append --verbose
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dirs {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend dirs ${workpath}/build-${arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dirs ${workpath}/build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir ${dirs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -lm is spuriously added by meson NYD to some builds (arm64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q {s| -lm||g} ${dir}/meson-private/glib-2.0.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.args-append --verbose
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/lib/charset.alias
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set docdir ${prefix}/share/doc/${my_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} COPYING NEWS README.md \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -Ddtrace=false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # some tests fail to build on 10.6.8 Rosetta: https://trac.macports.org/ticket/65517
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} == 10 && ${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -Dtests=false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # meson on Tiger cannot use rpaths, so we workaround with this to find dylibs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my_phase {build test destroot} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant quartz conflicts x11 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -Dappinfo_backend=native
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant x11 conflicts quartz {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -Dappinfo_backend=generic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +quartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset quartz] && ![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Either +x11 or +quartz is required"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type gnome
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.name ${my_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Obsolete Date: 2023-05-13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by glib2-devel
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a34fabe6c5b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/config.h.ed
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/ G_VA_COPY_AS_ARRAY /c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_VA_COPY_AS_ARRAY 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* #undef G_VA_COPY_AS_ARRAY */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/ SIZEOF_LONG /c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_LONG 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_LONG 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/ SIZEOF_SIZE_T /c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_SIZE_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_SIZE_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/ SIZEOF_SSIZE_T /c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_SSIZE_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_SSIZE_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/ SIZEOF_VOID_P /c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_VOID_P 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_VOID_P 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 71ecbe2e266..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/libintl.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>---- glib/gi18n-lib.h.orig 2017-07-13 18:03:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gi18n-lib.h 2018-01-31 18:18:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <glib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <libintl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <@PREFIX@/include/libintl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef GETTEXT_PACKAGE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gi18n.h.orig 2017-07-13 18:03:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gi18n.h 2018-01-31 18:18:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <glib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <libintl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <@PREFIX@/include/libintl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ec2e1501398..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-declarations.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2023-04-18 05:04:39.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2023-04-18 05:05:00.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -524,6 +524,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Due to pervasive use of things like GPOINTER_TO_UINT(), we do not support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # building with -Wbad-function-cast.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '-Wno-bad-function-cast',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '-Wno-declaration-after-statement',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '-Werror=implicit-function-declaration',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '-Werror=missing-prototypes',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '-Werror=pointer-sign',
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/files/patch-get-launchd-dbus-session-address.diff b/devel/glib2-upstream/files/patch-get-launchd-dbus-session-address.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c3ad85d5a02..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,119 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/gdbusaddress.c.orig 2020-10-01 07:43:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gdbusaddress.c 2021-12-15 18:20:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1223,6 +1223,103 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ---------------------------------------------------------------------------------------------------- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * MacPorts specific D-Bus implementation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * When building under MacPorts on darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * plaforms (including Mac OS X), the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * symbols G_OS_UNIX and __APPLE__ are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * asserted.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * The D-Bus session daemon is controlled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * using the Apple launchd facility.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * For launchd command details see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * http://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * launchd(8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * launchctl(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * launchd.plist(5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined (G_OS_UNIX) && defined (__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static gchar *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+get_session_address_macports_specific (GError **error)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gchar *ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gchar *command_line;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gchar *launchctl_stdout;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gchar *launchctl_stderr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gint exit_status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ret = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ command_line = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ launchctl_stdout = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ launchctl_stderr = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ command_line = g_strdup ("launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (G_UNLIKELY (_g_dbus_debug_address ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _g_dbus_debug_print_lock ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_print ("GDBus-debug:Address: launchctl command line: `%s'\n", command_line);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _g_dbus_debug_print_unlock ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (g_spawn_command_line_sync (command_line,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ &launchctl_stdout,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ &launchctl_stderr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ &exit_status,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ error))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (g_spawn_check_exit_status (exit_status, error))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (launchctl_stdout != NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (G_UNLIKELY (_g_dbus_debug_address ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gchar *s;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _g_dbus_debug_print_lock ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_print ("GDBus-debug:Address: launchctl stdout:");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s = _g_dbus_hexdump (launchctl_stdout, strlen (launchctl_stdout) + 1, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_print ("\n%s", s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_free (s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _g_dbus_debug_print_unlock ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (*launchctl_stdout != '\0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gchar *lastchar;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lastchar = launchctl_stdout + strlen(launchctl_stdout) - 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (*lastchar == '\n') *lastchar = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ret = g_strdup_printf ("unix:path=%s", launchctl_stdout);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_set_error (error,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ G_IO_ERROR,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ G_IO_ERROR_FAILED,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _("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:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_prefix_error (error, _("Error spawning command line `%s': "), command_line);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_free (command_line);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_free (launchctl_stdout);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_free (launchctl_stderr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* ---------------------------------------------------------------------------------------------------- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static gchar *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_session_address_platform_specific (GError **error)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1251,7 +1348,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * X11 autolaunching; on Windows this means a different autolaunching
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * mechanism based on shared memory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return get_session_address_macports_specific (error);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return get_session_address_dbus_launch (error);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ---------------------------------------------------------------------------------------------------- */
</span><span style='display:block; white-space:pre;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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 847db09d0a0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-gio-tests-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Disable tests that use dbus because we do not want to declare a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dependency on something only used to run optional tests and we do not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-want the test suite to find and use dbus opportunistically which could
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fail if glib2 is being built universal and dbus is not installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/tests/meson.build.orig 2022-04-21 01:45:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/tests/meson.build 2022-04-21 01:52:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -170,7 +170,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--have_dbus_daemon = find_program('dbus-daemon', required : false).found()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+have_dbus_daemon = false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if have_dbus_daemon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gio_tests += {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'debugcontroller' : {},
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/files/patch-gio_gcredentials.c.diff b/devel/glib2-upstream/files/patch-gio_gcredentials.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6451550cd22..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-gio_gcredentials.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-glib_typeof relies on C++11, so we need to fall back to regular typeof
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(supported by GCC and Clang) to build with older compilers.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/gcredentials.c.orig 2022-08-20 08:42:34.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gcredentials.c 2022-08-20 08:46:40.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -225,7 +225,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GString *ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if G_CREDENTIALS_USE_APPLE_XUCRED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- glib_typeof (credentials->native.cr_ngroups) i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typeof (credentials->native.cr_ngroups) i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_return_val_if_fail (G_IS_CREDENTIALS (credentials), NULL);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/files/patch-gio_gcredentialsprivate.h.diff b/devel/glib2-upstream/files/patch-gio_gcredentialsprivate.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dda7593d093..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-gio_gcredentialsprivate.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/gcredentialsprivate.h.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gcredentialsprivate.h 2022-04-04 06:56:04.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,7 +135,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define G_CREDENTIALS_USE_NETBSD_UNPCBID 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define G_CREDENTIALS_NATIVE_TYPE G_CREDENTIALS_TYPE_NETBSD_UNPCBID
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define G_CREDENTIALS_NATIVE_SIZE (sizeof (struct unpcbid))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* #undef G_CREDENTIALS_UNIX_CREDENTIALS_MESSAGE_SUPPORTED */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define G_CREDENTIALS_SPOOFING_SUPPORTED 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define G_CREDENTIALS_HAS_PID 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -160,6 +160,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/ucred.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef SOL_LOCAL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SOL_LOCAL 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef LOCAL_PEERCRED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define LOCAL_PEERCRED 0x001 /* retrieve peer credentails */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef LOCAL_PEERPID
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define LOCAL_PEERPID 0x002 /* retrieve peer pid */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define G_CREDENTIALS_SUPPORTED 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define G_CREDENTIALS_USE_APPLE_XUCRED 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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.diff b/devel/glib2-upstream/files/patch-gio_gsocket.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 69f80fd7bb0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-gio_gsocket.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/gsocket.h.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gsocket.h 2022-04-04 06:55:30.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,6 +43,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define G_SOCKET_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_TYPE_SOCKET, GSocketClass))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef LOCAL_PEERCRED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define LOCAL_PEERCRED 0x001 /* retrieve peer credentails */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef LOCAL_PEERPID
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define LOCAL_PEERPID 0x002 /* retrieve peer pid */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct _GSocketPrivate GSocketPrivate;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct _GSocketClass GSocketClass;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/files/patch-gio_xdgmime_xdgmime.c.diff b/devel/glib2-upstream/files/patch-gio_xdgmime_xdgmime.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a580158600f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/xdgmime/xdgmime.c.orig 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/xdgmime/xdgmime.c 2019-01-30 10:33:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,7 +235,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xdg_data_dirs = getenv ("XDG_DATA_DIRS");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (xdg_data_dirs == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- xdg_data_dirs = "/usr/local/share/:/usr/share/";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xdg_data_dirs = "@PREFIX@/share/:/usr/share/";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Work out how many dirs we’re dealing with. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3f86346b938..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-glib2-findfolders-before-Lion.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,83 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gosxutils.m.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gosxutils.m 2022-04-04 05:41:18.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,17 +21,31 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gutils.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gstrfuncs.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POOLSTART NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POOLEND [pool release];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POOLSTART
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POOLEND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void load_user_special_dirs_macos (gchar **table);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static gchar *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_folder (NSSearchPathDirectory type)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POOLSTART
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar *filename;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSString *path;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSArray *paths;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- paths = NSSearchPathForDirectoriesInDomains (type, NSUserDomainMask, YES);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path = [paths firstObject];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ path = [paths count] ? [paths objectAtIndex:0] : NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (path == nil)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,6 +53,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- filename = g_strdup ([path UTF8String]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POOLEND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return filename;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,10 +63,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_DESKTOP] = find_folder (NSDesktopDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_DOCUMENTS] = find_folder (NSDocumentDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDownloadsDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_MUSIC] = find_folder (NSMusicDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_PICTURES] = find_folder (NSPicturesDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_PUBLIC_SHARE] = find_folder (NSSharedPublicDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_TEMPLATES] = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_VIDEOS] = find_folder (NSMoviesDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POOLSTART
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* 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:#ffe0e0;'>-+ 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:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDownloadsDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* for Tiger there is no DownloadsDir, so we use Desktop as glib did previously */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDesktopDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ table[G_USER_DIRECTORY_MUSIC] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Music"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ table[G_USER_DIRECTORY_PICTURES] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Pictures"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ table[G_USER_DIRECTORY_PUBLIC_SHARE] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Public"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ table[G_USER_DIRECTORY_TEMPLATES] = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ table[G_USER_DIRECTORY_VIDEOS] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Movies"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POOLEND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 94fd4ce6378..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-glib2-findfolders-before-SL.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,83 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gosxutils.m.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gosxutils.m 2022-04-04 05:41:18.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,17 +21,31 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gutils.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gstrfuncs.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POOLSTART NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POOLEND [pool release];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POOLSTART
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POOLEND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void load_user_special_dirs_macos (gchar **table);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static gchar *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_folder (NSSearchPathDirectory type)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POOLSTART
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar *filename;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSString *path;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSArray *paths;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- paths = NSSearchPathForDirectoriesInDomains (type, NSUserDomainMask, YES);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path = [paths firstObject];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ path = [paths count] ? [paths objectAtIndex:0] : NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (path == nil)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,6 +53,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- filename = g_strdup ([path UTF8String]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POOLEND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return filename;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,10 +63,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_DESKTOP] = find_folder (NSDesktopDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_DOCUMENTS] = find_folder (NSDocumentDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDownloadsDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_MUSIC] = find_folder (NSMusicDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_PICTURES] = find_folder (NSPicturesDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_PUBLIC_SHARE] = find_folder (NSSharedPublicDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_TEMPLATES] = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table[G_USER_DIRECTORY_VIDEOS] = find_folder (NSMoviesDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POOLSTART
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* 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:#ffe0e0;'>-+ 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:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDownloadsDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* for Tiger there is no DownloadsDir, so we use Desktop as glib did previously */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDesktopDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ table[G_USER_DIRECTORY_MUSIC] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Music"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ table[G_USER_DIRECTORY_PICTURES] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Pictures"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ table[G_USER_DIRECTORY_PUBLIC_SHARE] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Public"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ table[G_USER_DIRECTORY_TEMPLATES] = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ table[G_USER_DIRECTORY_VIDEOS] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Movies"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POOLEND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e37633c08a3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-glib_gunicollate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gunicollate.c.orig 2017-03-08 21:37:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gunicollate.c 2017-03-29 21:05:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <wchar.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Carbon is not available on 64-bit */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef HAVE_CARBON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_CARBON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 152b17fa63d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gmodule/gmodule-dl.c.orig 2023-04-18 04:09:54.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gmodule/gmodule-dl.c 2023-04-18 04:10:21.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -182,15 +182,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _g_module_close (gpointer handle)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__BIONIC__) || defined(__NetBSD__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (handle != RTLD_DEFAULT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lock_dlerror ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (dlclose (handle) != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_module_set_error (fetch_dlerror (TRUE));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- unlock_dlerror ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Intentionally not dlclose()ing because it is safer to leave the library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * loaded in memory than to close it and possibly leave dangling pointers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * to things like atexit handlers, atfork handlers, blocks etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * See https://trac.macports.org/ticket/45309 for an example from when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * a library used by a module added a new dependency which had an
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * initializer which added a child atfork handler. The result is that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * after closing the module, the system had a dangling pointer for the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * atfork handler which would at best crash on the child side of fork()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * and at worst lead to arbitrary code execution of whatever happened to be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * at that location in memory at a later time in the process.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9a9d4668b40..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2022-10-25 20:53:22.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2022-10-27 06:00:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2279,9 +2279,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--python = import('python').find_installation()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+python = import('python').find_installation('')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # used for '#!/usr/bin/env <name>'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--python_name = 'python3'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+python_name = '@PYTHON@'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python_version = python.language_version()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python_version_req = '>=3.5'
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ca47c9a5172..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-meson_build-atomic-test-older-clang-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.ken 2021-02-15 15:00:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2021-02-15 15:04:16.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1624,8 +1624,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We know that we can always use real ("lock free") atomic operations with MSVC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- have_atomic_lock_free = true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if cc.get_id() == 'gcc' and not cc.compiles(atomicdefine, name : 'atomic ops define')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Old gcc release may provide
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>-+ # Old gcc and clang releases may provide
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # __sync_bool_compare_and_swap but doesn't define
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8a18482bb8e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,95 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/giomodule.c.orig 2023-03-22 19:28:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/giomodule.c 2023-04-18 04:46:12.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,12 +61,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <glib/gstdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(G_OS_UNIX) && !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(G_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(HAVE_COCOA) || defined(USE_APPINFO_GENERIC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gdesktopappinfo.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_COCOA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(HAVE_COCOA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gosxappinfo.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1192,7 +1193,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (g_once_init_enter (®istered_extensions))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(G_OS_UNIX) && !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(G_OS_UNIX) && (!defined(HAVE_COCOA) || defined(USE_APPINFO_GENERIC))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !GLIB_CHECK_VERSION (3, 0, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_io_extension_point_set_required_type (ep, G_TYPE_DESKTOP_APP_INFO_LOOKUP);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1359,8 +1360,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_COCOA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_type_ensure (g_nextstep_settings_backend_get_type ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef USE_APPINFO_GENERIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_type_ensure (g_osx_app_info_get_type ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef G_OS_UNIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_type_ensure (_g_unix_volume_monitor_get_type ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_type_ensure (g_debug_controller_dbus_get_type ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson_options.txt.orig 2019-11-13 18:24:37.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson_options.txt 2019-11-13 18:27:07.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option('appinfo_backend',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ type : 'combo',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ choices : ['generic', 'native'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ value : 'generic',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option('runtime_libdir',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- type : 'string',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- value : '',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/meson.build.orig 2022-03-17 23:01:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/meson.build 2022-04-04 05:29:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -380,16 +380,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'gunixoutputstream.h',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ appinfo_backend = get_option('appinfo_backend')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if glib_have_cocoa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- settings_sources += files('gnextstepsettingsbackend.m')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- contenttype_sources += files('gosxcontenttype.m')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- appinfo_sources += files('gosxappinfo.m')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if appinfo_backend == 'native'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ contenttype_sources += files('gosxcontenttype.m')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ appinfo_sources += files('gosxappinfo.m')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ application_headers += files('gosxappinfo.h')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ contenttype_sources += files('gcontenttype.c')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ appinfo_sources += files('gdesktopappinfo.c')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gio_unix_include_headers += files('gdesktopappinfo.h')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- framework_dep = dependency('appleframeworks', modules : ['Foundation', 'CoreFoundation', 'AppKit'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform_deps += [framework_dep]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if glib_have_os_x_9_or_later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unix_sources += files('gcocoanotificationbackend.m')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- application_headers += files('gosxappinfo.h')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- contenttype_sources += files('gcontenttype.c')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- appinfo_sources += files('gdesktopappinfo.c')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -784,6 +791,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install_dir: bash_comp_inst_dir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+appinfo_backend = get_option('appinfo_backend')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if appinfo_backend == 'native'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ glib_conf.set('USE_APPINFO_NATIVE', 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ glib_conf.set('USE_APPINFO_GENERIC', 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if enable_dtrace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gio_dtrace_obj = dtrace_obj_gen.process('gio_probes.d')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a15260a1157..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,235 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Allow universal builds. This is only part of the solution; the config.h.ed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-script is the other part. If new variables appear in the configure script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-that are affected by endianness or bitness, remember to handle them both
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-here and in config.h.ed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/glibconfig.h.in.orig 2023-03-22 19:28:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/glibconfig.h.in 2023-04-18 04:59:19.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,21 +62,43 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define G_HAVE_GINT64 1 /* deprecated, always true */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@glib_extension@typedef signed @gint64@ gint64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@glib_extension@typedef unsigned @gint64@ guint64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define G_GINT64_CONSTANT(val) @gint64_constant@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define G_GUINT64_CONSTANT(val) @guint64_constant@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef signed long gint64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef unsigned long guint64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+G_GNUC_EXTENSION typedef signed long long gint64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+G_GNUC_EXTENSION typedef unsigned long long guint64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define G_GINT64_MODIFIER @gint64_modifier@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define G_GINT64_FORMAT @gint64_format@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define G_GUINT64_FORMAT @guint64_format@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GINT64_CONSTANT(val) (val##L)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GUINT64_CONSTANT(val) (val##UL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GINT64_MODIFIER "l"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GINT64_FORMAT "li"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GUINT64_FORMAT "lu"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GINT64_MODIFIER "ll"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GINT64_FORMAT "lli"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GUINT64_FORMAT "llu"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GLIB_SIZEOF_VOID_P @glib_void_p@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GLIB_SIZEOF_LONG @glib_long@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GLIB_SIZEOF_SIZE_T @glib_size_t@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GLIB_SIZEOF_SSIZE_T @glib_ssize_t@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GLIB_SIZEOF_VOID_P 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GLIB_SIZEOF_LONG 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GLIB_SIZEOF_SIZE_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GLIB_SIZEOF_SSIZE_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GLIB_SIZEOF_VOID_P 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GLIB_SIZEOF_LONG 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GLIB_SIZEOF_SIZE_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GLIB_SIZEOF_SSIZE_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef signed @glib_size_type_define@ gssize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef unsigned @glib_size_type_define@ gsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,18 +121,39 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define G_POLLFD_FORMAT @g_pollfd_format@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GPOINTER_TO_INT(p) ((gint) @glib_gpi_cast@ (p))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GPOINTER_TO_UINT(p) ((guint) @glib_gpui_cast@ (p))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GPOINTER_TO_UINT(p) ((guint) (gulong) (p))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GPOINTER_TO_INT(p) ((gint) (gint) (p))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GPOINTER_TO_UINT(p) ((guint) (guint) (p))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GINT_TO_POINTER(i) ((gpointer) @glib_gpi_cast@ (i))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GUINT_TO_POINTER(u) ((gpointer) @glib_gpui_cast@ (u))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT_TO_POINTER(i) ((gpointer) (glong) (i))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT_TO_POINTER(u) ((gpointer) (gulong) (u))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT_TO_POINTER(i) ((gpointer) (gint) (i))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT_TO_POINTER(u) ((gpointer) (guint) (u))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--typedef signed @glib_intptr_type_define@ gintptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--typedef unsigned @glib_intptr_type_define@ guintptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef signed long gintptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef unsigned long guintptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef signed int gintptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef unsigned int guintptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define G_GINTPTR_MODIFIER @gintptr_modifier@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define G_GINTPTR_FORMAT @gintptr_format@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define G_GUINTPTR_FORMAT @guintptr_format@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GINTPTR_MODIFIER "l"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GINTPTR_FORMAT "li"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GUINTPTR_FORMAT "lu"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GINTPTR_MODIFIER ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GINTPTR_FORMAT "i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_GUINTPTR_FORMAT "u"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,7 +162,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @glib_os@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define G_VA_COPY va_copy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@glib_vacopy@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__ppc64__) || defined(__x86_64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_VA_COPY_AS_ARRAY 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define G_HAVE_ISO_VARARGS 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,34 +197,75 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #mesondefine G_ATOMIC_LOCK_FREE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GINT16_TO_@g_bs_native@(val) ((gint16) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GUINT16_TO_@g_bs_native@(val) ((guint16) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GINT16_TO_@g_bs_alien@(val) ((gint16) GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GUINT16_TO_@g_bs_alien@(val) (GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GINT32_TO_@g_bs_native@(val) ((gint32) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GUINT32_TO_@g_bs_native@(val) ((guint32) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GINT32_TO_@g_bs_alien@(val) ((gint32) GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GUINT32_TO_@g_bs_alien@(val) (GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GINT64_TO_@g_bs_native@(val) ((gint64) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GUINT64_TO_@g_bs_native@(val) ((guint64) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GINT64_TO_@g_bs_alien@(val) ((gint64) GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GUINT64_TO_@g_bs_alien@(val) (GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GLONG_TO_LE(val) ((glong) GINT@glongbits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GULONG_TO_LE(val) ((gulong) GUINT@glongbits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GLONG_TO_BE(val) ((glong) GINT@glongbits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GULONG_TO_BE(val) ((gulong) GUINT@glongbits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __BIG_ENDIAN__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT16_TO_BE(val) ((gint16) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT16_TO_BE(val) ((guint16) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT16_TO_LE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT16_TO_LE(val) (GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT16_TO_LE(val) ((gint16) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT16_TO_LE(val) ((guint16) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __BIG_ENDIAN__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT32_TO_BE(val) ((gint32) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT32_TO_BE(val) ((guint32) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT32_TO_LE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT32_TO_LE(val) (GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT32_TO_LE(val) ((gint32) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT32_TO_LE(val) ((guint32) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __BIG_ENDIAN__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT64_TO_BE(val) ((gint64) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT64_TO_BE(val) ((guint64) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT64_TO_LE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT64_TO_LE(val) (GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT64_TO_LE(val) ((gint64) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT64_TO_LE(val) ((guint64) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GULONG_TO_LE(val) ((gulong) GUINT64_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GULONG_TO_BE(val) ((gulong) GUINT64_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GULONG_TO_LE(val) ((gulong) GUINT32_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GINT_TO_LE(val) ((gint) GINT@gintbits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GUINT_TO_LE(val) ((guint) GUINT@gintbits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GINT_TO_BE(val) ((gint) GINT@gintbits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GUINT_TO_BE(val) ((guint) GUINT@gintbits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GSIZE_TO_LE(val) ((gsize) GUINT@gsizebits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GSSIZE_TO_LE(val) ((gssize) GINT@gsizebits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GSIZE_TO_BE(val) ((gsize) GUINT@gsizebits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GSSIZE_TO_BE(val) ((gssize) GINT@gsizebits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define G_BYTE_ORDER @g_byte_order@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GSSIZE_TO_LE(val) ((gssize) GINT64_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GSIZE_TO_BE(val) ((gsize) GUINT64_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GSSIZE_TO_BE(val) ((gssize) GINT64_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GSIZE_TO_LE(val) ((gsize) GUINT32_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GSSIZE_TO_LE(val) ((gssize) GINT32_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GSIZE_TO_BE(val) ((gsize) GUINT32_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GSSIZE_TO_BE(val) ((gssize) GINT32_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __BIG_ENDIAN__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_BYTE_ORDER G_BIG_ENDIAN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define G_BYTE_ORDER G_LITTLE_ENDIAN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@glib_is_powerpc@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GLIB_SYSDEF_POLLIN =@g_pollin@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GLIB_SYSDEF_POLLOUT =@g_pollout@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2022-09-18 08:59:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2022-09-18 09:02:33.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1851,6 +1851,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glibconfig_conf.set(d[1], val)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endforeach
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+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:#ffe0e0;'>-+glibconfig_conf.set('glib_is_powerpc', glib_is_powerpc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if host_system == 'windows'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_ipv6 = true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 56b709de3d4..f1295129c4e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ PortGroup legacysupport 1.1
</span> # Please keep the glib2 and glib2-devel ports as similar as possible.
name glib2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts glib2-devel glib2-upstream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts glib2-devel
</span> set my_name glib
version 2.76.2
revision 0
</pre><pre style='margin:0'>
</pre>