  @NAMESER_COMPAT_INCLUDE@
  
  #ifndef T_SRV
-diff -ruwN source/gio/gresolver.c source-new/gio/gresolver.c
---- source/gio/gresolver.c	2018-12-23 06:10:41.000000000 -0700
-+++ source-new/gio/gresolver.c	2019-01-05 12:51:56.587550105 -0700
-@@ -342,7 +342,7 @@
-     {
-       g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND,
-                    _("Error resolving “%s”: %s"),
--                   hostname, gai_strerror (EAI_NONAME));
-+                   hostname, "EAI_NONAME");
-       return TRUE;
-     }
- 
 diff -ruwN source/gio/gsocket.c source-new/gio/gsocket.c
 --- source/gio/gsocket.c	2018-12-23 06:10:41.000000000 -0700
 +++ source-new/gio/gsocket.c	2019-01-05 13:34:30.178211038 -0700

 
 #if defined __BIONIC__ && !defined BIND_4_COMPAT
 /* Copy from bionic/libc/private/arpa_nameser_compat.h
@@ -920,6 +935,12 @@
                    gpointer       task_data,
                    GCancellable  *cancellable)
 {

 static GList *
 _g_get_unix_mount_points (void)
 {
diff -ruwN source/glib/gthread-posix.c source-new/glib/gthread-posix.c
--- source/glib/gthread-posix.c	2018-12-23 06:10:41.000000000 -0700
+++ source-new/glib/gthread-posix.c	2019-01-05 11:40:57.454759289 -0700
