Index: gio/glib-compile-schemas.c
--- gio/glib-compile-schemas.c.orig	2019-03-04 21:06:13.000000000 +0100
+++ gio/glib-compile-schemas.c	2019-04-14 10:41:19.003446000 +0200
@@ -1590,7 +1590,7 @@
 }
 /* Text {{{2 */
 static void
-text (GMarkupParseContext  *context,
+XXXtext (GMarkupParseContext  *context,
       const gchar          *text,
       gsize                 text_len,
       gpointer              user_data,
@@ -1771,7 +1771,7 @@
 parse_gschema_files (gchar    **files,
                      gboolean   strict)
 {
-  GMarkupParser parser = { start_element, end_element, text };
+  GMarkupParser parser = { start_element, end_element, XXXtext };
   ParseState state = { 0, };
   const gchar *filename;
   GError *error = NULL;
Index: gio/meson.build
--- gio/meson.build.orig	2019-03-04 21:06:14.000000000 +0100
+++ gio/meson.build	2019-04-14 10:41:19.003644000 +0200
@@ -993,4 +993,3 @@
 endif
 
 subdir('fam')
-subdir('tests')
Index: gio/tests/gdbus-peer.c
--- gio/tests/gdbus-peer.c.orig	2019-03-04 21:06:14.000000000 +0100
+++ gio/tests/gdbus-peer.c	2019-04-14 10:41:19.003908000 +0200
@@ -27,6 +27,7 @@
 /* for open(2) */
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/socket.h>
 #include <fcntl.h>
 #include <string.h>
 
Index: gio/tests/org.gtk.test.gschema.override
Index: gio/tests/org.gtk.test.gschema.xml
Index: gio/xdgmime/xdgmimecache.h
--- gio/xdgmime/xdgmimecache.h.orig	2019-03-04 21:06:14.000000000 +0100
+++ gio/xdgmime/xdgmimecache.h	2019-04-14 10:41:19.004038000 +0200
@@ -44,6 +44,9 @@
 #define _xdg_mime_cache_get_icon                      XDG_RESERVED_ENTRY(cache_get_icon)
 #define _xdg_mime_cache_get_generic_icon              XDG_RESERVED_ENTRY(cache_get_generic_icon)
 #define _xdg_mime_cache_glob_dump                     XDG_RESERVED_ENTRY(cache_glob_dump)
+#define _xdg_mime_cache_is_valid_mime_type            XDG_RESERVED_ENTRY(cache_is_valid_mime_type)
+#define _xdg_mime_cache_mime_type_equal               XDG_RESERVED_ENTRY(cache_mime_type_equal)
+#define _xdg_mime_cache_media_type_equal              XDG_RESERVED_ENTRY(cache_media_type_equal)
 #endif
 
 extern XdgMimeCache **_caches;
Index: glib/gatomic.c
--- glib/gatomic.c.orig	2019-03-04 21:06:14.000000000 +0100
+++ glib/gatomic.c	2019-04-14 10:41:19.004209000 +0200
@@ -19,6 +19,7 @@
 
 #include "config.h"
 
+#include "gthread.h"
 #include "gatomic.h"
 
 /**
Index: glib/gmem.c
--- glib/gmem.c.orig	2019-03-04 21:06:14.000000000 +0100
+++ glib/gmem.c	2019-04-14 10:41:19.004348000 +0200
@@ -38,6 +38,7 @@
 #include "gbacktrace.h"
 #include "gtestutils.h"
 #include "gthread.h"
+#include "gthreadprivate.h"
 #include "glib_trace.h"
 
 /* notes on macros:
Index: glib/gthread-posix.c
--- glib/gthread-posix.c.orig	2019-03-04 21:06:14.000000000 +0100
+++ glib/gthread-posix.c	2019-04-14 10:47:57.195967000 +0200
@@ -96,7 +96,7 @@
   if G_UNLIKELY (mutex == NULL)
     g_thread_abort (errno, "malloc");
 
-#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
+#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) && !defined(__FreeBSD__)
   pthread_mutexattr_init (&attr);
   pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
   pattr = &attr;
@@ -105,7 +105,7 @@
   if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0)
     g_thread_abort (status, "pthread_mutex_init");
 
-#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
+#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) && !defined(__FreeBSD__)
   pthread_mutexattr_destroy (&attr);
 #endif
 
@@ -277,10 +277,14 @@
   if G_UNLIKELY (mutex == NULL)
     g_thread_abort (errno, "malloc");
 
+#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) && !defined(__FreeBSD__)
   pthread_mutexattr_init (&attr);
   pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
   pthread_mutex_init (mutex, &attr);
   pthread_mutexattr_destroy (&attr);
+#else
+  pthread_mutex_init (mutex, NULL);
+#endif
 
   return mutex;
 }
Index: glib/meson.build
--- glib/meson.build.orig	2019-03-04 21:06:14.000000000 +0100
+++ glib/meson.build	2019-04-14 10:41:19.004721000 +0200
@@ -284,7 +284,7 @@
   include_directories : [configinc, glibinc])
 
 pkg.generate(libglib,
-  libraries : [libintl],
+  libraries : [],
   libraries_private : [osx_ldflags, win32_ldflags],
   subdirs : ['glib-2.0'],
   extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
@@ -371,4 +371,3 @@
     install : true)
 endif
 
-subdir('tests')
Index: gmodule/gmodule-dl.c
--- gmodule/gmodule-dl.c.orig	2019-03-04 21:06:14.000000000 +0100
+++ gmodule/gmodule-dl.c	2019-04-14 10:41:19.004849000 +0200
@@ -106,6 +106,7 @@
 static gpointer
 _g_module_self (void)
 {
+#ifndef __FreeBSD__
   gpointer handle;
   
   /* to query symbols from the program itself, special link options
@@ -128,6 +129,9 @@
     g_module_set_error (fetch_dlerror (TRUE));
   
   return handle;
+#else
+  return RTLD_DEFAULT;
+#endif
 }
 
 static void
Index: gobject/meson.build
--- gobject/meson.build.orig	2019-03-04 21:06:14.000000000 +0100
+++ gobject/meson.build	2019-04-14 10:41:19.004970000 +0200
@@ -166,4 +166,3 @@
     install : true)
 endif
 
-subdir('tests')
Index: meson.build
--- meson.build.orig	2019-03-04 21:06:14.000000000 +0100
+++ meson.build	2019-04-14 10:41:19.005249000 +0200
@@ -1987,7 +1987,6 @@
 subdir('gmodule')
 subdir('gio')
 subdir('fuzzing')
-subdir('tests')
 
 # xgettext is optional (on Windows for instance)
 if find_program('xgettext', required : get_option('nls')).found()