<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4008d825550f7545a4fdd9f06e3633990ab6c625">https://github.com/macports/macports-ports/commit/4008d825550f7545a4fdd9f06e3633990ab6c625</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 4008d825550 glib2: update to 2.62.5
</span>4008d825550 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4008d825550f7545a4fdd9f06e3633990ab6c625
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Fri Aug 6 11:50:16 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> glib2: update to 2.62.5
</span>---
devel/glib2/Portfile | 87 +++++---
.../patch-configure-switch-for-gappinfo-impl.diff | 167 --------------
.../patch-get-launchd-dbus-session-address.diff | 6 +-
devel/glib2/files/patch-gio_gdbusprivate.c.diff | 4 +-
devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff | 8 +-
.../patch-glib2-allow-frexpl-test-to-pass.diff | 12 +
.../files/patch-glib2-findfolders-before-SL.diff | 85 +++++++
.../glib2/files/patch-meson-build-python-path.diff | 17 ++
...son_build-atomic-test-older-clang-versions.diff | 13 ++
.../patch-meson_build-meson_options-appinfo.diff | 95 ++++++++
devel/glib2/files/universal.patch | 245 ++++++++++++---------
11 files changed, 419 insertions(+), 320 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3af7f128151..c626e7ee6cf 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;'>@@ -3,17 +3,19 @@
</span> PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup clang_dependency 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span>
# Please keep the glib2 and glib2-devel ports as similar as possible.
name glib2
conflicts glib2-devel
set my_name glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.58.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3fafbb1e6288ff1e8146ecd0a14547ba779406e5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4863648
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.62.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b39d2775a3baccb8d3e777bfa8b23c06e7f646da \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b8d1cdafa46658b63d7512efbe2cd21bd36cd7be83140e44930c47b79f82452e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4702492
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,19 +43,23 @@ patchfiles libintl.patch \
</span> patch-gio_gdbusprivate.c.diff \
patch-get-launchd-dbus-session-address.diff \
patch-gmodule-gmodule-dl.c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure-switch-for-gappinfo-impl.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson_build-meson_options-appinfo.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson-build-python-path.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson_build-atomic-test-older-clang-versions.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-glib2-findfolders-before-SL.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin:xmllint:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this test fails (I believe wrongly) when configuring arm64 on Intel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-glib2-allow-frexpl-test-to-pass.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append bin:xmllint:libxml2 \
</span> port:pkgconfig
depends_lib port:gettext \
port:libffi \
port:libiconv \
port:pcre \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python39 \
</span> port:zlib
if {[vercmp ${macosx_deployment_target} 10.9] < 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,36 +79,47 @@ configure.ldflags-append -lresolv \
</span>
configure.cflags-append -fstrict-aliasing
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# stop excessive warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -Wno-deprecated-declarations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.objcflags-append -Wno-deprecated-declarations
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-static --disable-libelf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-compile-warnings \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gtk-doc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pcre=system \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_prog_AWK=/usr/bin/awk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_prog_GTKDOC_CHECK= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_path_GTKDOC_CHECK_PATH= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_path_GTKDOC_MKPDF= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_path_GTKDOC_REBASE=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -Ddefault_library=both \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dwarning_level=0
</span>
configure.perl /usr/bin/perl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python /usr/bin/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python3.9
</span> configure.env-append PERL_PATH=${configure.perl}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my_arch {ppc ppc64 i386 x86_64 arm64} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # strip the automatic setting of host, meson does not accept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_host(${my_arch}) ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PYTHON@|${configure.python}|" meson.build
</span> reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" gio/gdbusprivate.c gio/xdgmime/xdgmime.c glib/gi18n-lib.h glib/gi18n.h gio/gdbusaddress.c
reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "ed - ${worksrcpath}/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:#e0ffe0;'>+# this edit does not, for some reason, apply against the build-arm64 config.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and should not be needed if we're using the muniversal PortGroup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# needs testing on 32 bit systems to be certain of this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# system "ed - ${build.dir}/config.h < ${filespath}/config.h.ed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args V=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --verbose
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test.args-append --verbose
</span> test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target test
</span>
post-destroot {
delete ${destroot}${prefix}/lib/charset.alias
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,22 +131,22 @@ post-destroot {
</span> }
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-dtrace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Ddtrace=false
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} <= 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Requires python 2.7 as of 2.53.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://bugzilla.gnome.org/show_bug.cgi?id=785193
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # meson on Tiger cannot use rpaths, so we workaround with this to find dylibs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my_phase {build test destroot} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${my_phase}.env-append "DYLD_LIBRARY_PATH=${build_dir}/glib:${build_dir}/gobject:${build_dir}/gio:${build_dir}/gthread:${build_dir}/gmodule"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-appinfo-impl=native
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Dappinfo_backend=native
</span> }
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-appinfo-impl=generic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Dappinfo_backend=generic
</span> }
if {![variant_isset quartz]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-configure-switch-for-gappinfo-impl.diff b/devel/glib2/files/patch-configure-switch-for-gappinfo-impl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9c04bf24a52..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-configure-switch-for-gappinfo-impl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,167 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This file includes a patch to support switching between native and generic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-application information interfaces.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The native interface is used for Quartz-based builds of GTK+ and uses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-application bundle information, while the generic interface is the freedesktop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-implementation working with standard .desktop files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Both options are mutually exclusive, as glib (so far) only supports one
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-specific implementation that must be compiled and linked statically into the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-shared library at build time.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-For X11 builds of glib (our default), we want to support .desktop files.
</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/53911
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See: https://bugzilla.gnome.org/show_bug.cgi?id=781548
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2019-01-30 10:36:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1741,6 +1738,31 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(XATTR_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl ***********************************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl *** Check for gappinfo implementation (GIO) ***
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl ***********************************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_ARG_WITH(appinfo-impl,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AS_HELP_STRING([--appinfo-impl=@<:@native/generic@:>@],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [use appinfo implementation [native]])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [with_appinfo_impl='native'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "$with_appinfo_impl" != "native" && test "$with_appinfo_impl" != "generic"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ with_appinfo_impl="native"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AM_CONDITIONAL(APPINFO_IMPL_NATIVE, [test "$with_appinfo_impl" = "native"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AM_CONDITIONAL(APPINFO_IMPL_GENERIC, [test "$with_appinfo_impl" = "generic"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+case $with_appinfo_impl in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ native)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFINE(USE_APPINFO_NATIVE, 1, [Prefer the native application information implementation])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ generic)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFINE(USE_APPINFO_GENERIC, 1, [Prefer the generic (freedesktop-based) application information implementation])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl ************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl *** check for libelf ***
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl ************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/Makefile.am.orig 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/Makefile.am 2019-01-30 10:36:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -255,9 +255,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if OS_UNIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform_libadd += xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform_deps += xdgmime/libxdgmime.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if !OS_COCOA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if OS_COCOA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if APPINFO_IMPL_NATIVE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+appinfo_headers += gosxappinfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- appinfo_headers += gdesktopappinfo.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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unix_sources = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -303,7 +307,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gunixinputstream.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gunixoutputstream.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gunixsocketaddress.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(appinfo_headers) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(appinfo_headers) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if HAVE_NETLINK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -357,7 +361,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- win32/gwin32filemonitor.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--appinfo_sources += gwin32appinfo.c gwin32appinfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if APPINFO_IMPL_NATIVE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+appinfo_headers += gwin32appinfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+appinfo_sources += gwin32appinfo.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+appinfo_headers += gdesktopappinfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+appinfo_sources += gdesktopappinfo.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- contenttype_sources += gcontenttype-win32.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform_libadd += -lshlwapi -lws2_32 -ldnsapi -liphlpapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- win32_sources = $(win32_actual_sources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -367,6 +377,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- giowin32include_HEADERS = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gwin32inputstream.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gwin32outputstream.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(appinfo_headers) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(NULL)
</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;'>-@@ -407,7 +418,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if OS_UNIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if !OS_COCOA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if OS_COCOA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if !APPINFO_IMPL_NATIVE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+contenttype_sources += gcontenttype.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+appinfo_sources += gdesktopappinfo.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- contenttype_sources += gcontenttype.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- appinfo_sources += gdesktopappinfo.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -644,10 +660,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libgio_objc_2_0_la_CPPFLAGS = $(libgio_2_0_la_CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libgio_objc_2_0_la_SOURCES = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gnextstepsettingsbackend.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gnextstepsettingsbackend.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if APPINFO_IMPL_NATIVE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libgio_objc_2_0_la_SOURCES += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gosxcontenttype.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gosxappinfo.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gosxappinfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gosxappinfo.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if MAC_OS_X_9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libgio_objc_2_0_la_SOURCES += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcocoanotificationbackend.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/giomodule.c.orig 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/giomodule.c 2019-01-30 10:33:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,12 +43,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(HAVE_COCOA)
</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 HAVE_COCOA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1027,7 +1028,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registered_extensions = TRUE;
</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(HAVE_COCOA)
</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_GNUC_BEGIN_IGNORE_DEPRECATIONS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1168,8 +1169,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_fdo_notification_backend_get_type ());
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-get-launchd-dbus-session-address.diff b/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bb94bfe6652..d2a6f1af07d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- gio/gdbusaddress.c.orig 2018-02-06 09:44:20.000000000 -0600
+++ gio/gdbusaddress.c 2018-02-16 05:49:36.000000000 -0600
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1528,6 +1528,103 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1215,6 +1215,103 @@
</span>
/* ---------------------------------------------------------------------------------------------------- */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@
</span> static gchar *
get_session_address_platform_specific (GError **error)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1556,7 +1653,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1243,7 +1340,12 @@
</span> * X11 autolaunching; on Windows this means a different autolaunching
* mechanism based on shared memory.
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,7 +117,7 @@
</span> }
/* ---------------------------------------------------------------------------------------------------- */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1628,7 +1730,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1315,7 +1417,7 @@
</span> ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS"));
if (ret == NULL)
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-gio_gdbusprivate.c.diff b/devel/glib2/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d2b5b86f44e..8991bbe08e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- gio/gdbusprivate.c.orig 2017-05-31 15:16:11.000000000 -0500
+++ gio/gdbusprivate.c 2017-06-24 05:53:15.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2098,7 +2098,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2471,7 +2471,7 @@
</span> /* TODO: use PACKAGE_LOCALSTATEDIR ? */
ret = NULL;
first_error = NULL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> &ret,
NULL,
&first_error) &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2108,7 +2108,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2481,7 +2481,7 @@
</span> NULL))
{
g_propagate_prefixed_error (error, first_error,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff b/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bd44b6f8b26..a580158600f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> --- gio/xdgmime/xdgmime.c.orig 2019-01-21 07:38:50.000000000 -0600
+++ gio/xdgmime/xdgmime.c 2019-01-30 10:33:48.000000000 -0600
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -255,7 +255,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -235,7 +235,7 @@
</span> xdg_data_dirs = getenv ("XDG_DATA_DIRS");
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if (xdg_data_dirs == NULL)
- xdg_data_dirs = "/usr/local/share/:/usr/share/";
+ xdg_data_dirs = "@PREFIX@/share/:/usr/share/";
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ptr = xdg_data_dirs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Work out how many dirs we’re dealing with. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (xdg_data_home != NULL || home != NULL)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-glib2-allow-frexpl-test-to-pass.diff b/devel/glib2/files/patch-glib2-allow-frexpl-test-to-pass.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..716903bb0df
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-glib2-allow-frexpl-test-to-pass.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git glib/gnulib/gl_cv_func_frexpl_works/meson.build.orig glib/gnulib/gl_cv_func_frexpl_works/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 303ec63..50e614e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gnulib/gl_cv_func_frexpl_works/meson.build.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gnulib/gl_cv_func_frexpl_works/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (host_system.startswith ('aix') or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ host_system.startswith ('beos') or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- host_system.startswith ('darwin') or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ host_system.startswith ('irix'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_cv_func_frexpl_works = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_cv_func_frexpl_broken_beyond_repair = true
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-glib2-findfolders-before-SL.diff b/devel/glib2/files/patch-glib2-findfolders-before-SL.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..89f3885da1a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-glib2-findfolders-before-SL.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,85 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git glib/gosxutils.m.orig glib/gosxutils.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7a0d84d..1ba86cb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gosxutils.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gosxutils.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,15 +25,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gutils.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gstrfuncs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POOLSTART NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POOLEND [pool release];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POOLSTART
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POOLEND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static gchar *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_folder (NSSearchPathDirectory type)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POOLSTART
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar *filename;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSString *path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSArray *paths;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ paths = NSSearchPathForDirectoriesInDomains (type, NSUserDomainMask, YES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path = [paths firstObject];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ path = [paths count] ? [paths objectAtIndex:0] : NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (path == nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,6 +57,8 @@ find_folder (NSSearchPathDirectory type)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filename = g_strdup ([path UTF8String]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POOLEND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return filename;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,10 +67,37 @@ load_user_special_dirs_macos(gchar **table)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_DESKTOP] = find_folder (NSDesktopDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_DOCUMENTS] = find_folder (NSDocumentDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDownloadsDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_MUSIC] = find_folder (NSMusicDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_PICTURES] = find_folder (NSPicturesDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_PUBLIC_SHARE] = find_folder (NSSharedPublicDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_TEMPLATES] = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table[G_USER_DIRECTORY_VIDEOS] = find_folder (NSMoviesDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POOLSTART
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* for Tiger and Leopard we have to emulate some by finding the home folder and appending the needed SubFolder name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ even with different languages, these still have the same names to the system; they are just displayed differently
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDownloadsDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* for Tiger there is no DownloadsDir, so we use Desktop as glib did previously */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table[G_USER_DIRECTORY_DOWNLOAD] = find_folder (NSDesktopDirectory);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table[G_USER_DIRECTORY_MUSIC] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Music"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table[G_USER_DIRECTORY_PICTURES] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Pictures"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table[G_USER_DIRECTORY_PUBLIC_SHARE] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Public"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table[G_USER_DIRECTORY_TEMPLATES] = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table[G_USER_DIRECTORY_VIDEOS] = g_strdup ([[NSHomeDirectory() stringByAppendingPathComponent:@"Movies"] UTF8String]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POOLEND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-meson-build-python-path.diff b/devel/glib2/files/patch-meson-build-python-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5f0aba55065
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GLib2 tries to find "python3" and if it can't find it, it will go for "python"; if port select wasn't explicitly run, this will likely end-up with Python 2.7. As a fallback, meson can use whatever python it's running on if the argument to find_installation is empty.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2019-11-21 00:41:53.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2019-11-21 00:44:00.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1992,9 +1992,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-python = import('python').find_installation('python3')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python = import('python').find_installation('')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # used for '#!/usr/bin/env <name>'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-python_name = 'python3'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python_name = '@PYTHON@'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_version = python.language_version()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_version_req = '>=3.4'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-meson_build-atomic-test-older-clang-versions.diff b/devel/glib2/files/patch-meson_build-atomic-test-older-clang-versions.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ca47c9a5172
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-meson_build-atomic-test-older-clang-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.ken 2021-02-15 15:00:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2021-02-15 15:04:16.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1624,8 +1624,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We know that we can always use real ("lock free") atomic operations with MSVC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_atomic_lock_free = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if cc.get_id() == 'gcc' and not cc.compiles(atomicdefine, name : 'atomic ops define')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Old gcc release may provide
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' and not cc.compiles(atomicdefine, name : 'atomic ops define')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Old gcc and clang releases may provide
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # __sync_bool_compare_and_swap but doesn't define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glib_conf.set('__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4', true)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-meson_build-meson_options-appinfo.diff b/devel/glib2/files/patch-meson_build-meson_options-appinfo.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e81fbce7499
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,95 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/giomodule.c.orig 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/giomodule.c 2019-01-30 10:33:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,12 +47,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib/gstdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(G_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(HAVE_COCOA) || defined(USE_APPINFO_GENERIC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gdesktopappinfo.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef HAVE_COCOA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(HAVE_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gosxappinfo.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_COCOA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1088,7 +1089,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registered_extensions = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(G_OS_UNIX) && (!defined(HAVE_COCOA) || defined(USE_APPINFO_GENERIC))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !GLIB_CHECK_VERSION (3, 0, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_io_extension_point_set_required_type (ep, G_TYPE_DESKTOP_APP_INFO_LOOKUP);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1228,8 +1229,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_COCOA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_type_ensure (g_nextstep_settings_backend_get_type ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef USE_APPINFO_GENERIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_type_ensure (g_osx_app_info_get_type ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef G_OS_UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_type_ensure (_g_unix_volume_monitor_get_type ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_type_ensure (g_fdo_notification_backend_get_type ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson_options.txt.orig 2019-11-13 18:24:37.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson_options.txt 2019-11-13 18:27:07.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++option('appinfo_backend',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ type : 'combo',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ choices : ['generic', 'native'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ value : 'generic',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ description : 'appinfo backend to use; either freedesktop (for x11 based builds) or native (for quartz based builds)')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option('runtime_libdir',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type : 'string',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ value : '',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/meson.build.orig 2019-11-14 01:46:14.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/meson.build 2019-11-14 01:56:30.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -413,14 +413,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'gunixsocketaddress.h',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ appinfo_backend = get_option('appinfo_backend')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if glib_have_cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- settings_sources += files('gnextstepsettingsbackend.m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- contenttype_sources += files('gosxcontenttype.m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- appinfo_sources += files('gosxappinfo.m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ settings_sources += files('gnextstepsettingsbackend.m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if appinfo_backend == 'native'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ contenttype_sources += files('gosxcontenttype.m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ appinfo_sources += files('gosxappinfo.m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ application_headers += files('gosxappinfo.h')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ contenttype_sources += files('gcontenttype.c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ appinfo_sources += files('gdesktopappinfo.c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gio_unix_include_headers += files('gdesktopappinfo.h')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if glib_have_os_x_9_or_later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unix_sources += files('gcocoanotificationbackend.m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- application_headers += files('gosxappinfo.h')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ contenttype_sources += files('gcontenttype.c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appinfo_sources += files('gdesktopappinfo.c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2019-10-21 14:18:40.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2019-11-14 17:20:55.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2048,6 +2056,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ win32_ldflags = ['-luser32', '-lkernel32']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++appinfo_backend = get_option('appinfo_backend')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if appinfo_backend == 'native'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ glib_conf.set('USE_APPINFO_NATIVE', 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ glib_conf.set('USE_APPINFO_GENERIC', 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Tracing: dtrace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ want_dtrace = get_option('dtrace')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enable_dtrace = false
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/universal.patch b/devel/glib2/files/universal.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 7677bd0ec07..eaeaa0c853d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,24 +2,17 @@ Allow universal builds. This is only part of the solution; the config.h.ed
</span> script is the other part. If new variables appear in the configure script
that are affected by endianness or bitness, remember to handle them both
here and in config.h.ed.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2019-01-30 10:33:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -626,9 +626,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/glibconfig.h.in.orig 2019-11-17 14:17:08.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/glibconfig.h.in 2019-11-17 14:15:42.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,21 +58,43 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # check for bytesex stuff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_C_BIGENDIAN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test x$ac_cv_c_bigendian = xuniversal ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_ERROR([Universal builds not supported: see https://bugzilla.gnome.org/show_bug.cgi?id=742548])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</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;'>- # check for header files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2774,18 +2771,34 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>$outfile <<_______EOF
</span> #define G_HAVE_GINT64 1 /* deprecated, always true */
<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:#e0ffe0;'>+-@glib_extension@typedef signed @gint64@ gint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@glib_extension@typedef unsigned @gint64@ guint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GINT64_CONSTANT(val) @gint64_constant@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GUINT64_CONSTANT(val) @guint64_constant@
</span> +#ifdef __LP64__
+typedef signed long gint64;
+typedef unsigned long guint64;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +21,9 @@ here and in config.h.ed.
</span> +G_GNUC_EXTENSION typedef unsigned long long guint64;
+#endif
<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:#e0ffe0;'>+-#define G_GINT64_MODIFIER @gint64_modifier@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GINT64_FORMAT @gint64_format@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GUINT64_FORMAT @guint64_format@
</span> +#ifdef __LP64__
+#define G_GINT64_CONSTANT(val) (val##L)
+#define G_GUINT64_CONSTANT(val) (val##UL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,13 +31,7 @@ here and in config.h.ed.
</span> +#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
+#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- _______EOF
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if test x$gint64_format != x ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>$outfile <<_______EOF
</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> +#ifdef __LP64__
+#define G_GINT64_MODIFIER "l"
+#define G_GINT64_FORMAT "li"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,17 +41,11 @@ here and in config.h.ed.
</span> +#define G_GINT64_FORMAT "lli"
+#define G_GUINT64_FORMAT "llu"
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- _______EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>$outfile <<_______EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2797,10 +2810,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>$outfile <<_______EOF
</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:#e0ffe0;'>+-#define GLIB_SIZEOF_VOID_P @glib_void_p@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GLIB_SIZEOF_LONG @glib_long@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GLIB_SIZEOF_SIZE_T @glib_size_t@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GLIB_SIZEOF_SSIZE_T @glib_ssize_t@
</span> +#ifdef __LP64__
+#define GLIB_SIZEOF_VOID_P 8
+#define GLIB_SIZEOF_LONG 8
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,14 +58,14 @@ here and in config.h.ed.
</span> +#define GLIB_SIZEOF_SSIZE_T 4
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- _______EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef signed @glib_size_type_define@ gssize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned @glib_size_type_define@ gsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,18 +117,39 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2831,18 +2851,39 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$glib_unknown_void_p"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>$outfile <<_______EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_POLLFD_FORMAT @g_pollfd_format@
</span>
<span style='display:block; white-space:pre;background:#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:#e0ffe0;'>+-#define GPOINTER_TO_INT(p) ((gint) @glib_gpi_cast@ (p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GPOINTER_TO_UINT(p) ((guint) @glib_gpui_cast@ (p))
</span> +#ifdef __LP64__
+#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
+#define GPOINTER_TO_UINT(p) ((guint) (gulong) (p))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,8 +74,8 @@ here and in config.h.ed.
</span> +#define GPOINTER_TO_UINT(p) ((guint) (guint) (p))
+#endif
<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:#e0ffe0;'>+-#define GINT_TO_POINTER(i) ((gpointer) @glib_gpi_cast@ (i))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT_TO_POINTER(u) ((gpointer) @glib_gpui_cast@ (u))
</span> +#ifdef __LP64__
+#define GINT_TO_POINTER(i) ((gpointer) (glong) (i))
+#define GUINT_TO_POINTER(u) ((gpointer) (gulong) (u))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,8 +84,8 @@ here and in config.h.ed.
</span> +#define GUINT_TO_POINTER(u) ((gpointer) (guint) (u))
+#endif
<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:#e0ffe0;'>+-typedef signed @glib_intptr_type_define@ gintptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef unsigned @glib_intptr_type_define@ guintptr;
</span> +#ifdef __LP64__
+typedef signed long gintptr;
+typedef unsigned long guintptr;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,9 +94,9 @@ here and in config.h.ed.
</span> +typedef unsigned int guintptr;
+#endif
<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:#e0ffe0;'>+-#define G_GINTPTR_MODIFIER @gintptr_modifier@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GINTPTR_FORMAT @gintptr_format@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GUINTPTR_FORMAT @guintptr_format@
</span> +#ifdef __LP64__
+#define G_GINTPTR_MODIFIER "l"
+#define G_GINTPTR_FORMAT "li"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,46 +106,80 @@ here and in config.h.ed.
</span> +#define G_GINTPTR_FORMAT "i"
+#define G_GUINTPTR_FORMAT "u"
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- _______EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2937,7 +2978,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test x"$g_memory_barrier_needed" != xno; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo >>$outfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "#ifdef __BIG_ENDIAN__" >>$outfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "#endif" >>$outfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test x"$g_atomic_lock_free" = xyes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo >>$outfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2947,27 +2990,52 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_bit_sizes="16 32 64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for bits in $g_bit_sizes; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>$outfile <<_______EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GINT${bits}_TO_${g_bs_native}(val) ((gint${bits}) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GUINT${bits}_TO_${g_bs_native}(val) ((guint${bits}) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GINT${bits}_TO_${g_bs_alien}(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define GUINT${bits}_TO_${g_bs_alien}(val) (GUINT${bits}_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,7 +157,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @glib_os@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@glib_vacopy@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_VA_COPY_AS_ARRAY 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @g_have_iso_c_varargs@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @g_have_iso_cxx_varargs@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,34 +196,75 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #mesondefine G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #mesondefine G_ATOMIC_LOCK_FREE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GINT16_TO_@g_bs_native@(val) ((gint16) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT16_TO_@g_bs_native@(val) ((guint16) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GINT16_TO_@g_bs_alien@(val) ((gint16) GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT16_TO_@g_bs_alien@(val) (GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GINT32_TO_@g_bs_native@(val) ((gint32) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT32_TO_@g_bs_native@(val) ((guint32) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GINT32_TO_@g_bs_alien@(val) ((gint32) GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT32_TO_@g_bs_alien@(val) (GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GINT64_TO_@g_bs_native@(val) ((gint64) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT64_TO_@g_bs_native@(val) ((guint64) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GINT64_TO_@g_bs_alien@(val) ((gint64) GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT64_TO_@g_bs_alien@(val) (GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GLONG_TO_LE(val) ((glong) GINT@glongbits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GULONG_TO_LE(val) ((gulong) GUINT@glongbits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GLONG_TO_BE(val) ((glong) GINT@glongbits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GULONG_TO_BE(val) ((gulong) GUINT@glongbits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __BIG_ENDIAN__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT16_TO_BE(val) ((gint16) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT16_TO_BE(val) ((guint16) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT16_TO_LE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT16_TO_LE(val) (GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT16_TO_LE(val) ((gint16) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT16_TO_LE(val) ((guint16) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __BIG_ENDIAN__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT32_TO_BE(val) ((gint32) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT32_TO_BE(val) ((guint32) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT32_TO_LE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT32_TO_LE(val) (GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT32_TO_LE(val) ((gint32) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT32_TO_LE(val) ((guint32) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +#ifdef __BIG_ENDIAN__
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT${bits}_TO_BE(val) ((gint${bits}) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT${bits}_TO_BE(val) ((guint${bits}) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT${bits}_TO_LE(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT${bits}_TO_LE(val) (GUINT${bits}_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT64_TO_BE(val) ((gint64) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT64_TO_BE(val) ((guint64) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT64_TO_LE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT64_TO_LE(val) (GUINT64_SWAP_LE_BE (val))
</span> +#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT${bits}_TO_LE(val) ((gint${bits}) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT${bits}_TO_LE(val) ((guint${bits}) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GINT${bits}_TO_BE(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GUINT${bits}_TO_BE(val) (GUINT${bits}_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT64_TO_LE(val) ((gint64) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT64_TO_LE(val) ((guint64) (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val))
</span> +#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- _______EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>$outfile <<_______EOF
</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:#e0ffe0;'>++
</span> +#ifdef __LP64__
+#define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val))
+#define GULONG_TO_LE(val) ((gulong) GUINT64_TO_LE (val))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,15 +191,15 @@ here and in config.h.ed.
</span> +#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val))
+#define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val))
+#endif
<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${gssizebits}_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${gssizebits}_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:#e0ffe0;'>+ #define GINT_TO_LE(val) ((gint) GINT@gintbits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GUINT_TO_LE(val) ((guint) GUINT@gintbits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GINT_TO_BE(val) ((gint) GINT@gintbits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GUINT_TO_BE(val) ((guint) GUINT@gintbits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GSIZE_TO_LE(val) ((gsize) GUINT@gsizebits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GSSIZE_TO_LE(val) ((gssize) GINT@gsizebits@_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GSIZE_TO_BE(val) ((gsize) GUINT@gsizebits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GSSIZE_TO_BE(val) ((gssize) GINT@gsizebits@_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_BYTE_ORDER @g_byte_order@
</span> +#ifdef __LP64__
+#define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val))
+#define GSSIZE_TO_LE(val) ((gssize) GINT64_TO_LE (val))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -200,20 +216,31 @@ here and in config.h.ed.
</span> +#else
+#define G_BYTE_ORDER G_LITTLE_ENDIAN
+#endif
<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;'>-@@ -3199,10 +3267,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *) glib_vacopy=''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test x$glib_cv_va_val_copy = xno; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glib_vacopy="\$glib_vacopy
</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;'>--fi
</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;'>-+#endif"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_have_gnuc_varargs=$g_have_gnuc_varargs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_have_iso_c_varargs=$g_have_iso_c_varargs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@glib_is_powerpc@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GLIB_SYSDEF_POLLIN =@g_pollin@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GLIB_SYSDEF_POLLOUT =@g_pollout@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2019-11-17 14:26:49.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2019-11-17 14:27:32.000000000 -0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1584,17 +1584,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glibconfig_conf.set(d[1], val)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# We need a more robust approach here...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ host_cpu_family = host_machine.cpu_family()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if host_cpu_family == 'x86' or host_cpu_family == 'x86_64' or host_cpu_family == 's390' or host_cpu_family == 's390x' or host_cpu_family.startswith('arm') or host_cpu_family == 'aarch64' or host_cpu_family.startswith('crisv32') or host_cpu_family.startswith('etrax')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- glib_memory_barrier_needed = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elif host_cpu_family.startswith('sparc') or host_cpu_family.startswith('alpha') or host_cpu_family.startswith('powerpc') or host_cpu_family == 'ia64'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- glib_memory_barrier_needed = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- warning('Unknown host cpu: ' + host_cpu_family)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- glib_memory_barrier_needed = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-glibconfig_conf.set('G_ATOMIC_OP_MEMORY_BARRIER_NEEDED', glib_memory_barrier_needed)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++glib_is_powerpc = '#if (defined(__PPC__) || defined(__PPC64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(_ARCH_PPC) || defined(_ARCH_PPC64))\n#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#undef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#endif\n#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1\n#else\n#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#undef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#endif\n#endif'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++glibconfig_conf.set('glib_is_powerpc', glib_is_powerpc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We need to decide at configure time if GLib will use real atomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # operations ("lock free") or emulated ones with a mutex. This is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>\ No newline at end of file
</pre><pre style='margin:0'>
</pre>