glib: Update snapshot version to 2.38.2

This is the latest stable release from upstream. Patches have been
refreshed, including putting the removal of most pkg-config checks into
the glib-only patch. A few more files, most notably the large NEWS file,
have also been removed from the repo to keep the size of the snapshot
down.

7 files changed, 313 insertions, 195 deletions

diff --git a/glib-patches/cross-compiling.patch b/glib-patches/cross-compiling.patch
index 9550e65..1b85e95 100644
--- a/glib-patches/cross-compiling.patch
+++ b/glib-patches/cross-compiling.patch
@@ -1,8 +1,8 @@
 diff --git a/glib/configure.ac b/glib/configure.ac
-index 27a4a23..160f57d 100644
+index e73f7f9..e53020c 100644
 --- a/glib/configure.ac
 +++ b/glib/configure.ac
-@@ -2427,30 +2427,6 @@ int error = EILSEQ;
+@@ -2460,30 +2460,6 @@ int error = EILSEQ;
  ], have_eilseq=yes, have_eilseq=no);
  AC_MSG_RESULT($have_eilseq)
  
@@ -13,7 +13,7 @@ index 27a4a23..160f57d 100644
 -
 -AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
 -
--if test $cross_compiling = yes; then
+-AS_IF([ test $cross_compiling = yes ], [
 -  AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
 -  if test x$GLIB_GENMARSHAL = xno; then
 -    AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
@@ -28,7 +28,7 @@ index 27a4a23..160f57d 100644
 -  if test x$GLIB_COMPILE_RESOURCES = xno; then
 -    AC_MSG_ERROR(Could not find a glib-compile-resources in your PATH)
 -  fi
--fi
+-])
 -
  dnl ************************************
  dnl *** Enable lcov coverage reports ***
diff --git a/glib-patches/foreign-automake.patch b/glib-patches/foreign-automake.patch
index ca2c75e..c06de51 100644
--- a/glib-patches/foreign-automake.patch
+++ b/glib-patches/foreign-automake.patch
@@ -1,13 +1,13 @@
 diff --git a/glib/configure.ac b/glib/configure.ac
-index ca862c5..8970f2c 100644
+index 295e008..8e45480 100644
 --- a/glib/configure.ac
 +++ b/glib/configure.ac
 @@ -63,7 +63,7 @@ AC_CONFIG_MACRO_DIR([m4macros])
  # Save this value here, since automake will set cflags later
  cflags_set=${CFLAGS+set}
  
--AM_INIT_AUTOMAKE([1.11 no-define no-dist-gzip dist-xz tar-ustar])
-+AM_INIT_AUTOMAKE([1.11 no-define no-dist-gzip dist-xz tar-ustar foreign])
+-AM_INIT_AUTOMAKE([1.11 -Wno-portability no-define no-dist-gzip dist-xz tar-ustar])
++AM_INIT_AUTOMAKE([1.11 -Wno-portability no-define no-dist-gzip dist-xz tar-ustar foreign])
  AM_MAINTAINER_MODE([enable])
  
  # Support silent build rules. Disable
diff --git a/glib-patches/glib-only.patch b/glib-patches/glib-only.patch
index efcef59..1efce0d 100644
--- a/glib-patches/glib-only.patch
+++ b/glib-patches/glib-only.patch
@@ -1,21 +1,25 @@
 diff --git a/glib/Makefile.am b/glib/Makefile.am
-index f5c510d..95c71de 100644
+index 4f60a02..583b914 100644
 --- a/glib/Makefile.am
 +++ b/glib/Makefile.am
-@@ -6,10 +6,8 @@ include $(top_srcdir)/Makefile.decl
+@@ -6,14 +6,8 @@ include $(top_srcdir)/glib.mk
  
  ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
  
--SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
 -DIST_SUBDIRS = $(SUBDIRS) build
 -
 -bin_SCRIPTS = glib-gettextize
+-
+-if OS_LINUX
+-TESTS += check-abis.sh
+-endif
 +SUBDIRS = . m4macros glib
 +DIST_SUBDIRS = $(SUBDIRS)
  
  AM_CPPFLAGS = 					\
  	-DG_LOG_DOMAIN=g_log_domain_glib 	\
-@@ -18,85 +16,18 @@ AM_CPPFLAGS = 					\
+@@ -22,85 +16,19 @@ AM_CPPFLAGS = 					\
  	-DGLIB_COMPILATION
  
  EXTRA_DIST += 			\
@@ -41,8 +45,9 @@ index f5c510d..95c71de 100644
 -	README.win32		\
 -	HACKING			\
 -	autogen.sh		\
- 	Makefile.decl		\
--	mkinstalldirs		\
+ 	glib.mk			\
+-	glib-tap.mk		\
+-	tap-test		\
 -	makefile.msc		\
 -	msvc_recommended_pragmas.h \
 -	config.h.win32.in	\
@@ -55,18 +60,19 @@ index f5c510d..95c71de 100644
 -	gthread-2.0.pc.in	\
 -	gio-2.0.pc.in		\
 -	gio-unix-2.0.pc.in	\
--	gio-windows-2.0.pc.in
-+	mkinstalldirs
+-	gio-windows-2.0.pc.in	\
+-	check-abis.sh		\
+-	gtk-doc.make		\
+ 	$(NULL)
  
  
  # These may be in the builddir too
- BUILT_EXTRA_DIST = 		\
--	README			\
+ BUILT_EXTRA_DIST += 		\
+ 	README			\
 -	INSTALL			\
 -	ChangeLog		\
 -	config.h.win32		\
--	gtk-doc.make
-+	README
+ 	$(NULL)
  
  CONFIGURE_DEPENDENCIES = acglib.m4
  
@@ -96,14 +102,10 @@ index f5c510d..95c71de 100644
 -
 -$(pkgconfig_DATA): config.status
 -
--# install mkinstalldirs for glib-gettextize's benefit
--gettextdir = $(datadir)/glib-2.0/gettext
--gettext_SCRIPTS = mkinstalldirs
--
  # build documentation when doing distcheck
  DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man --disable-maintainer-mode
  
-@@ -107,7 +38,7 @@ distclean-local: lcov-clean
+@@ -111,7 +39,7 @@ distclean-local: lcov-clean
  	    rm -f $(BUILT_EXTRA_DIST); \
  	fi
  
@@ -113,10 +115,30 @@ index f5c510d..95c71de 100644
  files:
  	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
 diff --git a/glib/configure.ac b/glib/configure.ac
-index cadd925..f7a1632 100644
+index 797cb92..295e008 100644
 --- a/glib/configure.ac
 +++ b/glib/configure.ac
-@@ -474,8 +474,6 @@ dnl
+@@ -435,28 +435,9 @@ AS_IF([ test x"$glib_native_win32" = xyes], [
+ ])
+ 
+ dnl
+-dnl zlib support
+-dnl
+-PKG_CHECK_MODULES([ZLIB], [zlib], [found_zlib=yes], [found_zlib=no])
+-AS_IF([test "x$found_zlib" = "xno"], [
+-  AC_CHECK_LIB(z, inflate, [AC_CHECK_HEADER(zlib.h, found_zlib=yes)])
+-  if test "x$found_zlib" = "xno" ; then
+-    AC_MSG_ERROR([*** Working zlib library and headers not found ***])
+-  fi
+-  ZLIB_LIBS='-lz'
+-  AC_SUBST(ZLIB_LIBS)
+-])
+-
+-PKG_CHECK_MODULES(LIBFFI, [libffi >= 3.0.0])
+-AC_SUBST(LIBFFI_CFLAGS)
+-AC_SUBST(LIBFFI_LIBS)
+-
+-dnl
  dnl gettext support
  dnl
  
@@ -125,7 +147,35 @@ index cadd925..f7a1632 100644
  GLIB_GNU_GETTEXT
  
  if test "$gt_cv_have_gettext" != "yes" ; then
-@@ -1724,37 +1722,6 @@ int main() { return 0; } ]])],
+@@ -1739,27 +1720,6 @@ AC_ARG_WITH(gio-module-dir,
+ GIO_MODULE_DIR=$with_gio_module_dir
+ AC_SUBST(GIO_MODULE_DIR)
+ 
+-dnl **********************************
+-dnl *** Check for libselinux (GIO) ***
+-dnl **********************************
+-AC_ARG_ENABLE(selinux,
+-              AS_HELP_STRING([--disable-selinux],
+-                             [build without selinux support]))
+-msg_selinux=no
+-SELINUX_LIBS=
+-AS_IF([ test "x$enable_selinux" != "xno"], [
+-
+- AC_CHECK_LIB(selinux, is_selinux_enabled,
+-   [AC_CHECK_HEADERS(selinux/selinux.h,
+-     [AC_CHECK_LIB(selinux, lgetfilecon_raw, 
+-       [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available])
+-        SELINUX_LIBS="-lselinux"
+-        msg_selinux=yes])
+-     ])
+-   ])
+-])
+-AC_SUBST(SELINUX_LIBS)
+-
+ dnl *****************************
+ dnl ** Check for inotify (GIO) **
+ dnl *****************************
+@@ -1799,118 +1759,6 @@ int main() { return 0; } ]])],
  
  AM_CONDITIONAL(HAVE_FEN, [test "$fen_support" = "yes"])
  
@@ -136,7 +186,7 @@ index cadd925..f7a1632 100644
 -should_disable_fam=no
 -
 -AC_ARG_ENABLE(fam,
--              AC_HELP_STRING([--disable-fam],
+-              AS_HELP_STRING([--disable-fam],
 -                             [don't use fam for file system monitoring]),
 -                         [
 -                                if test "x$enable_fam" = "xno"; then
@@ -160,41 +210,152 @@ index cadd925..f7a1632 100644
 -fi
 -AM_CONDITIONAL(HAVE_FAM, [test "$fam_support" = "yes"])
 -
+-
+-dnl *****************************
+-dnl *** Check for xattr (GIO) ***
+-dnl *****************************
+-AC_ARG_ENABLE(xattr,
+-              AS_HELP_STRING([--disable-xattr], [build without xattr support]))
+-msg_xattr=no
+-XATTR_LIBS=
+-AS_IF([ test "x$enable_xattr" != "xno"], [
+-
+-dnl either glibc or libattr can provide xattr support
+-
+-dnl for both of them, we check for getxattr being in
+-dnl the library and a valid xattr header.
+-
+-dnl try glibc
+- AC_CHECK_LIB(c, getxattr,
+-   [AC_CHECK_HEADERS(sys/xattr.h,
+-     [AC_DEFINE(HAVE_XATTR, 1, [Define to 1 if xattr is available])
+-      msg_xattr=yes])
+-   ])
+-
+-  AS_IF([ test "x$msg_xattr" != "xyes"], [
+-dnl   failure. try libattr
+-   AC_CHECK_LIB(attr, getxattr,
+-      [AC_CHECK_HEADERS(attr/xattr.h,
+-       [AC_DEFINE(HAVE_XATTR, 1, [Define to 1 if xattr is available])
+-        XATTR_LIBS="-lattr"
+-        msg_xattr=yes])
+-      ])
+-  ])
+-
+-  AS_IF([ test "x$msg_xattr" = "xyes"], [
+-    AC_MSG_CHECKING([for XATTR_NOFOLLOW])
+-    AC_TRY_COMPILE([
+-      #include <stdio.h>
+-      #ifdef HAVE_SYS_TYPES_H
+-      #include <sys/types.h>
+-      #endif
+-      #ifdef HAVE_SYS_XATTR_H
+-      #include <sys/xattr.h>
+-      #elif HAVE_ATTR_XATTR_H
+-      #include <attr/xattr.h>
+-      #endif
+-    ],
+-    [ssize_t len = getxattr("", "", NULL, 0, 0, XATTR_NOFOLLOW);],
+-    [
+-      AC_DEFINE([HAVE_XATTR_NOFOLLOW], [1], [Define to 1 if xattr API uses XATTR_NOFOLLOW])
+-      AC_MSG_RESULT([yes])
+-    ],
+-    [AC_MSG_RESULT([no])]
+-    )
+-  ])
+-])
+-AC_SUBST(XATTR_LIBS)
+-
+-dnl ************************
+-dnl *** check for libelf ***
+-dnl ************************
+-AC_ARG_ENABLE(libelf,
+-              AS_HELP_STRING([--disable-libelf], [build without libelf support]))
+-AS_IF([ test "x$enable_libelf" != "xno"],[
+-PKG_CHECK_MODULES([LIBELF], [libelf >= 0.8.12], [have_libelf=yes], [have_libelf=maybe])
+-AS_IF([ test $have_libelf = maybe ], [
+-  glib_save_LIBS=$LIBS
+-  AC_CHECK_LIB([elf], [elf_begin], [:], [have_libelf=no])
+-  AC_CHECK_LIB([elf], [elf_getshdrstrndx], [:], [have_libelf=no])
+-  AC_CHECK_LIB([elf], [elf_getshdrnum], [:], [have_libelf=no])
+-  AC_CHECK_HEADER([libelf.h], [:], [have_libelf=no])
+-  LIBS=$glib_save_LIBS
+-
+-  if test $have_libelf != no; then
+-    LIBELF_LIBS=-lelf
+-    have_libelf=yes
+-  fi
+-])
+-])
+-
+-if test x$have_libelf = xyes; then
+-  AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available])
+-fi
  
- dnl *****************************
- dnl *** Check for xattr (GIO) ***
-@@ -2585,92 +2552,6 @@ if test $cross_compiling = yes; then
+ dnl ****************************************
+ dnl *** platform dependent source checks ***
+@@ -2707,122 +2555,6 @@ AS_IF([ test $cross_compiling = yes ], [
    fi
- fi
+ ])
  
 -dnl **************************
 -dnl *** Checks for gtk-doc ***
 -dnl **************************
--
+-# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
+-# it on it's own line.
+-m4_ifdef([GTK_DOC_CHECK], [
 -GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
+-],[
+-AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
+-])
 -
 -AC_ARG_ENABLE(man,
--              [AC_HELP_STRING([--enable-man],
--                              [regenerate man pages from Docbook [default=no]])],enable_man=yes,
--              enable_man=no)
+-              [AS_HELP_STRING([--enable-man],
+-                              [generate man pages [default=auto]])],,
+-              enable_man=maybe)
 -
--if test "${enable_man}" != no; then
--dnl
--dnl Check for xsltproc
--dnl
--AC_PATH_PROG([XSLTPROC], [xsltproc])
--  if test -z "$XSLTPROC"; then
+-AS_IF([test "$enable_man" != no], [
+-  AC_PATH_PROG([XSLTPROC], [xsltproc])
+-  AS_IF([test -z "$XSLTPROC"], [
+-    AS_IF([test "$enable_man" = yes], [
+-      AC_MSG_ERROR([xsltproc is required for --enable-man])
+-    ])
 -    enable_man=no
--  fi
+-  ])
+-])
 -
--  dnl check for DocBook DTD and stylesheets in the local catalog.
+-AS_IF([ test "$enable_man" != no ], [
+-  dnl check for DocBook DTD in the local catalog
 -  JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
--     [DocBook XML DTD V4.1.2],,enable_man=no)
+-     [DocBook XML DTD V4.1.2], [have_docbook_dtd=yes], [have_docbook_dtd=no])
+-  AS_IF([test "$have_docbook_dtd" != yes], [
+-    AS_IF([test "$enable_man" = yes ], [
+-      AC_MSG_ERROR([DocBook DTD is required for --enable-man])
+-    ])
+-    enable_man=no
+-  ])
+-])
+-
+-AS_IF([test "$enable_man" != no], [
+-  dnl check for DocBook XSL stylesheets in the local catalog
 -  JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
--     [DocBook XSL Stylesheets],,enable_man=no)
--fi
+-     [DocBook XSL Stylesheets], [have_docbook_style=yes],[have_docbook_style=no])
+-  AS_IF([ test "$have_docbook_dtd" != yes ], [
+-    AS_IF([ test "$enable_man" = yes ], [
+-      AC_MSG_ERROR([DocBook XSL Stylesheets are required for --enable-man])
+-    ])
+-    enable_man=no
+-  ])
+-])
 -
--AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
+-AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
+-
+-AC_MSG_CHECKING([whether to generate man pages])
+-AS_IF([ test "$enable_man" != no ], [
+-  AC_MSG_RESULT([yes])
+-], [
+-  AC_MSG_RESULT([no])
+-])
 -
 -dnl
 -dnl Tracing
@@ -205,7 +366,7 @@ index cadd925..f7a1632 100644
 -                              [include tracing support for dtrace])])
 -have_dtrace=no
 -AC_MSG_CHECKING([whether to include dtrace tracing support])
--if test "x$enable_dtrace" != xno; then
+-AS_IF([ test "x$enable_dtrace" != xno], [
 -  if test x$glib_have_carbon = xyes; then
 -    AC_MSG_RESULT([no (not yet compatible with MacOS dtrace)])
 -  else 
@@ -222,9 +383,9 @@ index cadd925..f7a1632 100644
 -                       fi])
 -    fi
 -  fi
--else
+-], [
 -  AC_MSG_RESULT([no])
--fi
+-])
 -if test "x$have_dtrace" = xyes; then
 -  AC_DEFINE([HAVE_DTRACE], [1], [Define to 1 if using dtrace probes.])
 -fi
@@ -256,7 +417,28 @@ index cadd925..f7a1632 100644
  dnl ************************************
  dnl *** Enable lcov coverage reports ***
  dnl ************************************
-@@ -3529,87 +3410,22 @@ AC_SUBST(gio_INCLUDES)
+@@ -3630,20 +3362,6 @@ typedef unsigned $gint64 guint64;])
+ AC_CHECK_TYPE([unsigned long])
+ AC_CHECK_ALIGNOF([unsigned long])
+ 
+-# Check for libdbus1 - Optional - is only used in the GDBus test cases
+-#
+-# 1.2.14 required for dbus_message_set_serial
+-PKG_CHECK_MODULES(DBUS1,
+-     dbus-1 >= 1.2.14,
+-     [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available]) have_dbus1=yes],
+-     have_dbus1=no)
+-AC_SUBST(DBUS1_CFLAGS)
+-AC_SUBST(DBUS1_LIBS)
+-AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
+-
+-AC_CHECK_PROGS([DBUS_DAEMON], [dbus-daemon])
+-AM_CONDITIONAL([HAVE_DBUS_DAEMON], [test x$DBUS_DAEMON = xdbus-daemon ])
+-
+ dnl
+ dnl Check for -Bsymbolic-functions linker flag used to avoid
+ dnl intra-library PLT jumps, if available.
+@@ -3751,92 +3469,22 @@ AC_SUBST(gio_INCLUDES)
  
  
  AC_CONFIG_FILES([
@@ -277,6 +459,7 @@ index cadd925..f7a1632 100644
 -build/win32/dirent/Makefile
 -build/win32/vs9/Makefile
 -build/win32/vs10/Makefile
+-build/win32/vs11/Makefile
  glib/Makefile
 -glib/glib.stp
  glib/libcharset/Makefile
@@ -294,13 +477,17 @@ index cadd925..f7a1632 100644
 -gio/Makefile
 -gio/gdbus-2.0/codegen/Makefile
 -gio/gdbus-2.0/codegen/config.py
+-gio/gnetworking.h
 -gio/xdgmime/Makefile
 -gio/inotify/Makefile
+-gio/kqueue/Makefile
 -gio/fen/Makefile
 -gio/fam/Makefile
 -gio/win32/Makefile
 -gio/tests/Makefile
 -gio/tests/gdbus-object-manager-example/Makefile
+-gio/tests/services/Makefile
+-gio/tests/services/org.gtk.GDBus.Examples.ObjectManager.service
 -po/Makefile.in
 -docs/Makefile
 -docs/reference/Makefile
@@ -345,30 +532,21 @@ index cadd925..f7a1632 100644
  fi
  
 diff --git a/glib/glib/Makefile.am b/glib/glib/Makefile.am
-index ac73a8c..6fb3a34 100644
+index 1330755..07b0141 100644
 --- a/glib/glib/Makefile.am
 +++ b/glib/glib/Makefile.am
-@@ -35,9 +35,9 @@ else
+@@ -31,8 +31,8 @@ else
  MAYBE_PCRE = pcre 
  endif
  
 -SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
-+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
- 
 -DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
++SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
 +DIST_SUBDIRS = libcharset gnulib pcre update-pcre
  
  AM_CPPFLAGS = 				\
  	$(glib_INCLUDES) 		\
-@@ -53,7 +53,6 @@ glib.def: glib.symbols
- if OS_LINUX
- if HAVE_GNUC_VISIBILITY
- TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)"
--TESTS = abicheck.sh
- endif
- endif
- 
-@@ -66,12 +65,10 @@ MIRRORING_TAB_SOURCE = 				\
+@@ -53,12 +53,10 @@ MIRRORING_TAB_SOURCE = 				\
  # The compilation of GRegex can be disabled, but the source files must
  # be distributed.
  EXTRA_DIST += 			\
@@ -378,19 +556,19 @@ index ac73a8c..6fb3a34 100644
  	gen-unicode-tables.pl	\
  	gen-script-table.pl	\
 -	glibconfig.h.win32.in	\
- 	abicheck.sh		\
- 	glib.symbols		\
  	gregex.c		\
-@@ -86,8 +83,6 @@ CLEANFILES= libglib-gdb.py
+ 	gregex.h		\
+ 	win_iconv.c		\
+@@ -71,8 +69,6 @@ CLEANFILES += libglib-gdb.py
  
  # These may be in the builddir too
- BUILT_EXTRA_DIST = 		\
+ BUILT_EXTRA_DIST += 		\
 -	makefile.msc		\
 -	glibconfig.h.win32	\
  	glib.rc
  
  lib_LTLIBRARIES = libglib-2.0.la
-@@ -116,7 +111,6 @@ deprecated_sources = \
+@@ -101,7 +97,6 @@ deprecated_sources = \
  
  libglib_2_0_la_SOURCES = 	\
  	$(deprecated_sources)	\
@@ -398,19 +576,24 @@ index ac73a8c..6fb3a34 100644
  	garray.c		\
  	gasyncqueue.c		\
  	gasyncqueueprivate.h	\
-@@ -382,24 +376,6 @@ libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
+@@ -359,29 +354,6 @@ libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
  
  INSTALL_PROGS=
  
 -if ENABLE_DTRACE
--glib_probes.h: glib_probes.d Makefile
+-DTCOMPILE = $(patsubst -W%,,$(LTCOMPILE))
+-DTCFLAGS = $(patsubst -W%,,$(CFLAGS))
+-
+-glib_probes.h: glib_probes.d
 -	$(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
 -	@$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
--glib_probes.o: glib_probes.d Makefile
--	$(AM_V_GEN) $(DTRACE) -G -s $< -o $@
--BUILT_SOURCES += glib_probes.h glib_probes.o
+-
+-glib_probes.lo: glib_probes.d
+-	$(AM_V_GEN) env CC="$(DTCOMPILE)" CFLAGS="$(DTCFLAGS)" $(DTRACE) -G -s $< -o $@
+-
+-BUILT_SOURCES += glib_probes.h glib_probes.lo
 -CLEANFILES += glib_probes.h glib_probes.h.tmp
--libglib_2_0_la_LIBADD += glib_probes.o
+-libglib_2_0_la_LIBADD += glib_probes.lo
 -endif
 -
 -if ENABLE_SYSTEMTAP
@@ -423,7 +606,7 @@ index ac73a8c..6fb3a34 100644
  gspawn-win32-helper-console.c:
  	echo '#define HELPER_CONSOLE' >$@
  	echo '#include "gspawn-win32-helper.c"' >>$@
-@@ -461,7 +437,7 @@ endif
+@@ -443,7 +415,7 @@ endif
  glib-2.0.lib: libglib-2.0.la glib.def
  	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/glib.def -out:$@
  
@@ -433,10 +616,10 @@ index ac73a8c..6fb3a34 100644
  	for f in $$files; do \
  	  if test -f $$f; then d=.; else d=$(srcdir); fi; \
 diff --git a/glib/glib/gnulib/Makefile.am b/glib/glib/gnulib/Makefile.am
-index ae8283d..a8666ff 100644
+index 931230e..06ce41c 100644
 --- a/glib/glib/gnulib/Makefile.am
 +++ b/glib/glib/gnulib/Makefile.am
-@@ -17,6 +17,3 @@ libgnulib_la_SOURCES = 	\
+@@ -22,6 +22,3 @@ libgnulib_la_SOURCES = 	\
  	printf.c \
  	printf.h \
  	g-gnulib.h
diff --git a/glib-patches/no-gregex.patch b/glib-patches/no-gregex.patch
index ebf3690..5b39f90 100644
--- a/glib-patches/no-gregex.patch
+++ b/glib-patches/no-gregex.patch
@@ -1,8 +1,8 @@
 diff --git a/glib/configure.ac b/glib/configure.ac
-index 8970f2c..41780cd 100644
+index 8e45480..4653090 100644
 --- a/glib/configure.ac
 +++ b/glib/configure.ac
-@@ -2431,64 +2431,6 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+@@ -2444,64 +2444,6 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
    [broken_poll="no (cross compiling)"])
  AC_MSG_RESULT($broken_poll)
  
@@ -10,16 +10,16 @@ index 8970f2c..41780cd 100644
 -dnl *** GRegex checks ***
 -dnl *********************
 -
--PCRE_REQUIRED_VERSION=8.11
+-PCRE_REQUIRED_VERSION=8.13
 -
 -# Check if we should use the internal or the system-supplied pcre
 -AC_ARG_WITH(pcre,
--            [AC_HELP_STRING([--with-pcre=@<:@internal/system@:>@],
+-            [AS_HELP_STRING([--with-pcre=@<:@internal/system@:>@],
 -                            [whether to use system PCRE [default=internal]])])
 -
 -AM_CONDITIONAL(USE_SYSTEM_PCRE, [test "x$with_pcre" = xsystem])
 -
--if test "x$with_pcre" = xsystem; then
+-AS_IF([ test "x$with_pcre" = xsystem], [
 -  PKG_CHECK_MODULES(PCRE,
 -                    libpcre >= $PCRE_REQUIRED_VERSION)
 -  AC_CACHE_CHECK([for Unicode support in PCRE],glib_cv_pcre_has_unicode,[
@@ -51,23 +51,23 @@ index 8970f2c..41780cd 100644
 -  AC_DEFINE(USE_SYSTEM_PCRE, [], [using the system-supplied PCRE library])
 -  PCRE_REQUIRES=libpcre
 -  AC_SUBST(PCRE_REQUIRES)
--else
+-], [
 -  # If using gcc 4 pass -Wno-pointer-sign when compiling the internal PCRE
--  if test x"$GCC" = xyes; then
+-  AS_IF([ test x"$GCC" = xyes], [
 -    AC_MSG_CHECKING([whether compiler understands -Wno-pointer-sign])
 -    save_CFLAGS="$CFLAGS"
 -    CFLAGS="$CFLAGS -Wno-pointer-sign"
 -    AC_TRY_COMPILE([],[],[PCRE_WARN_CFLAGS="$PCRE_WARN_CFLAGS -Wno-pointer-sign"
 -                          AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 -    CFLAGS="$save_CFLAGS"
--  fi
--fi
+-  ])
+-])
 -AC_SUBST(PCRE_WARN_CFLAGS)
 -
  dnl **********************
  dnl *** Win32 API libs ***
  dnl **********************
-@@ -3446,8 +3388,6 @@ Makefile
+@@ -3473,8 +3415,6 @@ Makefile
  glib/Makefile
  glib/libcharset/Makefile
  glib/gnulib/Makefile
@@ -77,10 +77,10 @@ index 8970f2c..41780cd 100644
  ])
  
 diff --git a/glib/glib/Makefile.am b/glib/glib/Makefile.am
-index e0ace06..005b9b2 100644
+index c16051d..d46e39b 100644
 --- a/glib/glib/Makefile.am
 +++ b/glib/glib/Makefile.am
-@@ -30,14 +30,9 @@ PRINTF_SUBDIR = gnulib
+@@ -26,13 +26,8 @@ PRINTF_SUBDIR = gnulib
  printf_la = gnulib/libgnulib.la
  endif 
  
@@ -90,14 +90,13 @@ index e0ace06..005b9b2 100644
 -endif
 -
 -SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
-+SUBDIRS = libcharset $(PRINTF_SUBDIR) .
- 
 -DIST_SUBDIRS = libcharset gnulib pcre update-pcre
++SUBDIRS = libcharset $(PRINTF_SUBDIR) .
 +DIST_SUBDIRS = libcharset gnulib
  
  AM_CPPFLAGS = 				\
  	$(glib_INCLUDES) 		\
-@@ -62,8 +57,6 @@ MIRRORING_TAB_SOURCE = 				\
+@@ -50,15 +45,11 @@ MIRRORING_TAB_SOURCE = 				\
  	glib-mirroring-tab/packtab.h		\
  	glib-mirroring-tab/packtab.c
  
@@ -106,24 +105,22 @@ index e0ace06..005b9b2 100644
  EXTRA_DIST += 			\
  	glib.rc.in		\
  	gen-iswide-table.py	\
-@@ -71,8 +64,6 @@ EXTRA_DIST += 			\
+ 	gen-unicode-tables.pl	\
  	gen-script-table.pl	\
- 	abicheck.sh		\
- 	glib.symbols		\
 -	gregex.c		\
 -	gregex.h		\
  	win_iconv.c		\
- 	libglib-gdb.py.in	\
  	docs.c			\
-@@ -162,7 +153,6 @@ libglib_2_0_la_SOURCES = 	\
- 	gqsort.c		\
+ 	gconstructor.h		\
+@@ -148,7 +139,6 @@ libglib_2_0_la_SOURCES = 	\
+ 	gquark.c		\
  	gqueue.c		\
  	grand.c			\
 -	gregex.c		\
  	gscanner.c		\
  	gscripttable.h		\
  	gsequence.c		\
-@@ -288,7 +278,6 @@ noinst_HEADERS += \
+@@ -277,7 +267,6 @@ noinst_HEADERS += \
  	gquark.h	\
  	gqueue.h	\
  	grand.h		\
@@ -131,8 +128,8 @@ index e0ace06..005b9b2 100644
  	gscanner.h	\
  	gsequence.h	\
  	gshell.h	\
-@@ -349,14 +338,6 @@ uninstall-def-file:
- export_symbols = $(LIBTOOL_EXPORT_OPTIONS)
+@@ -323,14 +312,6 @@ glib_win32_res = glib-win32-res.o
+ glib_win32_res_ldflag = -Wl,$(glib_win32_res)
  endif
  
 -if USE_SYSTEM_PCRE
@@ -143,11 +140,11 @@ index e0ace06..005b9b2 100644
 -pcre_inc =
 -endif
 -
+ libglib_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS)
  libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD)
  libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def)
- 
 diff --git a/glib/glib/glib.h b/glib/glib/glib.h
-index 77abf23..1ba1f47 100644
+index ce7447e..6f53fcd 100644
 --- a/glib/glib/glib.h
 +++ b/glib/glib/glib.h
 @@ -71,7 +71,6 @@
diff --git a/glib-patches/no-installed-files.patch b/glib-patches/no-installed-files.patch
index 8f416cc..f763ffe 100644
--- a/glib-patches/no-installed-files.patch
+++ b/glib-patches/no-installed-files.patch
@@ -1,8 +1,8 @@
 diff --git a/glib/glib/Makefile.am b/glib/glib/Makefile.am
-index 6fb3a34..1cf80a2 100644
+index 07b0141..c16051d 100644
 --- a/glib/glib/Makefile.am
 +++ b/glib/glib/Makefile.am
-@@ -16,7 +16,7 @@ CLEANFILES =
+@@ -12,7 +12,7 @@ include $(top_srcdir)/glib.mk
  DISTCLEANFILES += glibconfig-stamp glibconfig.h
  BUILT_SOURCES += glibconfig-stamp
  configexecincludedir = $(libdir)/glib-2.0/include
@@ -11,7 +11,7 @@ index 6fb3a34..1cf80a2 100644
  glibconfig-stamp: ../config.status
  	$(AM_V_GEN) cd $(top_builddir) && \
  	  $(SHELL) ./config.status glib/glibconfig.h
-@@ -74,18 +74,15 @@ EXTRA_DIST += 			\
+@@ -60,18 +60,15 @@ EXTRA_DIST += 			\
  	gregex.c		\
  	gregex.h		\
  	win_iconv.c		\
@@ -20,10 +20,10 @@ index 6fb3a34..1cf80a2 100644
  	gconstructor.h		\
  	$(MIRRORING_TAB_SOURCE)
  
--CLEANFILES= libglib-gdb.py
+-CLEANFILES += libglib-gdb.py
 -
  # These may be in the builddir too
- BUILT_EXTRA_DIST = 		\
+ BUILT_EXTRA_DIST += 		\
  	glib.rc
  
 -lib_LTLIBRARIES = libglib-2.0.la
@@ -31,7 +31,7 @@ index 6fb3a34..1cf80a2 100644
  
  if OS_WIN32_AND_DLL_COMPILATION
  if MS_LIB_AVAILABLE
-@@ -228,13 +225,13 @@ EXTRA_libglib_2_0_la_SOURCES = \
+@@ -220,13 +217,13 @@ EXTRA_libglib_2_0_la_SOURCES = \
  	gwin32.c
  
  glibincludedir=$(includedir)/glib-2.0
@@ -47,7 +47,7 @@ index 6fb3a34..1cf80a2 100644
  	deprecated/gallocator.h		\
  	deprecated/gcache.h		\
  	deprecated/gcompletion.h	\
-@@ -243,7 +240,7 @@ deprecatedinclude_HEADERS = \
+@@ -235,7 +232,7 @@ deprecatedinclude_HEADERS = \
  	deprecated/gthread.h
  
  glibsubincludedir=$(includedir)/glib-2.0/glib
@@ -56,35 +56,35 @@ index 6fb3a34..1cf80a2 100644
  	galloca.h	\
  	garray.h	\
  	gasyncqueue.h	\
-@@ -325,15 +322,6 @@ CLEANFILES += glib-public-headers.txt
+@@ -317,15 +314,6 @@ CLEANFILES += glib-public-headers.txt
  
  all-local: glib-public-headers.txt
  
--install-data-local: install-ms-lib install-def-file
+-install-data-local: install-ms-lib
 -	@if test -f $(glibincludedir)/glist.h ; then					\
 -	  echo "*** Old headers found in $(glibincludedir). You should remove the" ;	\
 -	  echo "*** contents of this directory and type 'make install' again." ;	\
 -	  false ;									\
 -	fi
 -
--uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-gdb
+-uninstall-local: uninstall-ms-lib uninstall-gdb
 -
  if PLATFORM_WIN32
  no_undefined = -no-undefined
  endif
-@@ -371,11 +359,8 @@ libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAW
+@@ -349,11 +337,8 @@ libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAW
  
  libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
  	 $(glib_win32_res_ldflag) \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- 	-export-dynamic $(no_undefined) $(export_symbols)
+ 	-export-dynamic $(no_undefined)
  
 -INSTALL_PROGS=
 -
  gspawn-win32-helper-console.c:
  	echo '#define HELPER_CONSOLE' >$@
  	echo '#include "gspawn-win32-helper.c"' >>$@
-@@ -388,50 +373,17 @@ gspawn-win64-helper-console.c:
+@@ -366,50 +351,17 @@ gspawn-win64-helper-console.c:
  	echo '#include "gspawn-win32-helper.c"' >>$@
  
  
@@ -126,7 +126,7 @@ index 6fb3a34..1cf80a2 100644
 -	  mv -f "$(DESTDIR)$(bindir)/$$sf" "$(DESTDIR)$(bindir)/$$sf".tmp \
 -	  && sed < "$(DESTDIR)$(bindir)/$$sf".tmp > "$(DESTDIR)$(bindir)/$$sf" \
 -	    -e '1,24s|^ *#@PKGINSTALL_CONFIGVARS_IN24LINES@|  ${CONFIGVARS}|' \
--	    -e '1,1s|#! /usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' \
+-	    -e '1,1s|#! /usr/bin/env python.*|#!${PYTHON}|' \
 -	  || exit $$? ; \
 -	  chmod a+x $(DESTDIR)$(bindir)/$$sf ; \
 -	  rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \
@@ -135,7 +135,7 @@ index 6fb3a34..1cf80a2 100644
  endif
  
  glib-2.0.lib: libglib-2.0.la glib.def
-@@ -478,25 +430,3 @@ dist-hook: $(BUILT_EXTRA_DIST)
+@@ -456,25 +408,3 @@ dist-hook: $(BUILT_EXTRA_DIST)
  	done >libglib.vs10.sourcefiles.filters
  	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin >$@	
  	rm libglib.vs10.sourcefiles.filters
@@ -162,10 +162,10 @@ index 6fb3a34..1cf80a2 100644
 -uninstall-gdb:
 -	-rm -r $(DESTDIR)$(datadir)/gdb
 diff --git a/glib/glib/libcharset/Makefile.am b/glib/glib/libcharset/Makefile.am
-index f5362df..f45e498 100644
+index 642f75c..abf32cb 100644
 --- a/glib/glib/libcharset/Makefile.am
 +++ b/glib/glib/libcharset/Makefile.am
-@@ -24,31 +24,6 @@ EXTRA_DIST += 			\
+@@ -26,31 +26,6 @@ EXTRA_DIST += 			\
  
  charset_alias = $(DESTDIR)$(libdir)/charset.alias
  charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
@@ -198,7 +198,7 @@ index f5362df..f45e498 100644
  charset.alias: config.charset
  	$(AM_V_GEN) $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
 diff --git a/glib/m4macros/Makefile.am b/glib/m4macros/Makefile.am
-index 75a9ca0..10a2f5f 100644
+index 971871c..0e6164c 100644
 --- a/glib/m4macros/Makefile.am
 +++ b/glib/m4macros/Makefile.am
 @@ -5,4 +5,4 @@ installed_m4= glib-2.0.m4 glib-gettext.m4 gsettings.m4
diff --git a/glib-patches/no-pkg-config.patch b/glib-patches/no-pkg-config.patch
index 07a6712..7d2dc88 100644
--- a/glib-patches/no-pkg-config.patch
+++ b/glib-patches/no-pkg-config.patch
@@ -1,8 +1,8 @@
 diff --git a/glib/configure.ac b/glib/configure.ac
-index 99de9f7..e582232 100644
+index 4653090..8fc86ed 100644
 --- a/glib/configure.ac
 +++ b/glib/configure.ac
-@@ -294,8 +294,6 @@ AC_PROG_INSTALL
+@@ -293,8 +293,6 @@ AC_PROG_INSTALL
  
  AC_SYS_LARGEFILE
  
@@ -11,72 +11,3 @@ index 99de9f7..e582232 100644
  if test "x$enable_debug" = "xyes"; then
    if test x$cflags_set != xset ; then
        case " $CFLAGS " in
-@@ -454,23 +452,6 @@ AC_MSG_RESULT($enable_iconv_cache)
- 
- 
- dnl
--dnl zlib support
--dnl
--PKG_CHECK_MODULES([ZLIB], [zlib], [found_zlib=yes], [found_zlib=no])
--if test "x$found_zlib" = "xno" ; then
--  AC_CHECK_LIB(z, inflate, [AC_CHECK_HEADER(zlib.h, found_zlib=yes)])
--  if test "x$found_zlib" = "xno" ; then
--    AC_MSG_ERROR([*** Working zlib library and headers not found ***])
--  fi
--  ZLIB_LIBS='-lz'
--  AC_SUBST(ZLIB_LIBS)
--fi
--
--PKG_CHECK_MODULES(LIBFFI, [libffi >= 3.0.0])
--AC_SUBST(LIBFFI_CFLAGS)
--AC_SUBST(LIBFFI_LIBS)
--
--dnl
- dnl gettext support
- dnl
- 
-@@ -1779,30 +1760,6 @@ dnl   failure. try libattr
- fi
- AC_SUBST(XATTR_LIBS)
- 
--dnl ************************
--dnl *** check for libelf ***
--dnl ************************
--
--PKG_CHECK_MODULES([LIBELF], [libelf >= 0.8.12], [have_libelf=yes], [have_libelf=maybe])
--
--if test $have_libelf = maybe; then
--  glib_save_LIBS=$LIBS
--  AC_CHECK_LIB([elf], [elf_begin], , [have_libelf=no])
--  AC_CHECK_LIB([elf], [elf_getshdrstrndx], , [have_libelf=no])
--  AC_CHECK_LIB([elf], [elf_getshdrnum], , [have_libelf=no])
--  AC_CHECK_HEADER([libelf.h], , [have_libelf=no])
--  LIBS=$glib_save_LIBS
--
--  if test $have_libelf != no; then
--    LIBELF_LIBS=-lelf
--    have_libelf=yes
--  fi
--fi
--
--if test $have_libelf = yes; then
--  AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available])
--fi
--
- dnl ****************************************
- dnl *** platform dependent source checks ***
- dnl ****************************************
-@@ -3280,12 +3237,7 @@ AC_CHECK_ALIGNOF([unsigned long])
- # Check for libdbus1 - Optional - is only used in the GDBus test cases
- #
- # 1.2.14 required for dbus_message_set_serial
--PKG_CHECK_MODULES(DBUS1,
--                  dbus-1 >= 1.2.14,
--                  [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available]) have_dbus1=yes],
--                  have_dbus1=no)
--AC_SUBST(DBUS1_CFLAGS)
--AC_SUBST(DBUS1_LIBS)
-+have_dbus1=no
- AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
- 
- dnl
diff --git a/glib-patches/update-glib.sh b/glib-patches/update-glib.sh
index 1b80a2c..d7aa085 100755
--- a/glib-patches/update-glib.sh
+++ b/glib-patches/update-glib.sh
@@ -4,7 +4,7 @@ GIT=${GIT-git}
 PATCH=${PATCH-patch}
 SED=${SED-sed}
 repo=
-tag=2.32.4
+tag=2.38.2
 commit=n
 
 usage()
@@ -83,14 +83,21 @@ rm -f \
     glib/INSTALL.in \
     glib/README.commits \
     glib/HACKING \
+    glib/NEWS \
     glib/NEWS.pre-1-3 \
     glib/README.win32 \
+    glib/.dir-locals.el \
+    glib/check-abis.sh \
     glib/config.h.win32.in \
+    glib/glib-gettextize.in \
+    glib/glib-tap.mk \
     glib/glib-zip.in \
     glib/sanity_check \
+    glib/tap-test \
     glib/glib/glib.stp \
     glib/glib/glib_probes.d \
     glib/glib/glibconfig.h.win32.in \
+    glib/glib/gregex.[ch] \
     glib/msvc_recommended_pragmas.h \
     glib/win32-fixup.pl \
     glib/glib/libglib-gdb.py.in