Update to glib2-2.14.5.

Overview of Changes from GLib 2.14.4 to GLib 2.14.5
===================================================

* Bugs fixed:
 482313 gregex: no way to tell why compilation failed
 315437 extern inline -> static inline
 480122 g_module_open fails to open modules with ".la" extension
 495589 gspawn.c failing to set FD_CLOEXEC
 500638 gkeyfile speedup ...
 503029 g_time_val_from_iso8601 parse non-ISO8601 dates
 503420 gkeyfile leaks a hash table

4 files changed, 54 insertions, 38 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index b06bc14f1b2..1d214b9a81b 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.128 2007/11/27 21:33:22 drochner Exp $
+# $NetBSD: Makefile,v 1.129 2008/01/08 23:31:56 tnn Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
-DISTNAME=		glib-2.14.4
+DISTNAME=		glib-2.14.5
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.14/ \
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index b7ed2243e27..a2d0d0aa691 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.91 2007/11/27 21:33:23 drochner Exp $
+$NetBSD: distinfo,v 1.92 2008/01/08 23:31:56 tnn Exp $
 
-SHA1 (glib-2.14.4.tar.bz2) = 29f5d74ab83c36f98e86f560b993fce5ac60dedf
-RMD160 (glib-2.14.4.tar.bz2) = c8bf528187a9ed90fb66ec5c89b17500f03ccef6
-Size (glib-2.14.4.tar.bz2) = 3350956 bytes
-SHA1 (patch-aa) = 1dfb9fbcb9d24d337f90bb1e1215e7ae862e774b
+SHA1 (glib-2.14.5.tar.bz2) = d8ae9dcb744ebfcb23809c3c552f4d724cb2458c
+RMD160 (glib-2.14.5.tar.bz2) = da45bc0999877515987cf6e6e139642f233b7145
+Size (glib-2.14.5.tar.bz2) = 3384904 bytes
+SHA1 (patch-aa) = 31483f81cdbb50b26bbcb090d357cfeeb68de05a
 SHA1 (patch-ab) = e84c4928b5288b83f2203b4ffd28cdb9de730e98
 SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
 SHA1 (patch-af) = a60aefb2e9e381984e001cd28fb714ff58edd6ee
-SHA1 (patch-ag) = 7d92e6e9e91605a761f7ad7761474e4eb45bd2e9
+SHA1 (patch-ag) = c1a10b07f22c20199e35989eac950819284eb4af
 SHA1 (patch-ah) = 76c7337b707de496591dd881ce4cd32f3222f53b
 SHA1 (patch-ai) = e615c6b37cc9d6247940023aefb7bf75bcddc7a5
 SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index 6c00aee74fe..de4a612082d 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.38 2007/11/25 23:38:51 wiz Exp $
+$NetBSD: patch-aa,v 1.39 2008/01/08 23:31:56 tnn Exp $
 
---- configure.orig	2007-11-24 06:41:59.000000000 +0000
+--- configure.orig	2008-01-08 02:42:16.000000000 +0100
 +++ configure
-@@ -945,6 +945,7 @@ G_MODULE_PLUGIN_LIBS
+@@ -929,6 +929,7 @@ G_MODULE_PLUGIN_LIBS
  G_MODULE_LDFLAGS
  G_MODULE_HAVE_DLERROR
  G_MODULE_BROKEN_RTLD_GLOBAL
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.38 2007/11/25 23:38:51 wiz Exp $
  G_MODULE_NEED_USCORE
  GLIB_DEBUG_FLAGS
  GSPAWN
-@@ -33910,6 +33911,7 @@ else
+@@ -36703,6 +36704,7 @@ else
  fi
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.38 2007/11/25 23:38:51 wiz Exp $
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -34705,6 +34707,84 @@ fi
+@@ -37626,6 +37628,84 @@ fi
  
  	LIBS="$LIBS_orig"
  fi
@@ -103,7 +103,7 @@ $NetBSD: patch-aa,v 1.38 2007/11/25 23:38:51 wiz Exp $
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -34741,6 +34821,8 @@ fi
+@@ -37662,6 +37742,8 @@ fi
  
  
  
@@ -112,7 +112,7 @@ $NetBSD: patch-aa,v 1.38 2007/11/25 23:38:51 wiz Exp $
  { echo "$as_me:$LINENO: checking for gspawn implementation" >&5
  echo $ECHO_N "checking for gspawn implementation... $ECHO_C" >&6; }
  case "$host" in
-@@ -35088,110 +35170,8 @@ if test x"$have_threads" != xno; then
+@@ -38060,126 +38142,8 @@ if test x"$have_threads" != xno; then
          G_THREAD_LIBS="-lpthread -lthread"
          ;;
        *)
@@ -146,11 +146,27 @@ $NetBSD: patch-aa,v 1.38 2007/11/25 23:38:51 wiz Exp $
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
 -  glib_flag_works=yes
 -else
 -  echo "$as_me: failed program was:" >&5
@@ -159,7 +175,7 @@ $NetBSD: patch-aa,v 1.38 2007/11/25 23:38:51 wiz Exp $
 -	glib_flag_works=no
 -fi
 -
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -225,7 +241,7 @@ $NetBSD: patch-aa,v 1.38 2007/11/25 23:38:51 wiz Exp $
           ;;
      esac
    fi
-@@ -37152,6 +37132,10 @@ case $host in
+@@ -40504,6 +40468,10 @@ case $host in
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
@@ -236,7 +252,7 @@ $NetBSD: patch-aa,v 1.38 2007/11/25 23:38:51 wiz Exp $
  esac
  
  
-@@ -42232,6 +42216,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI
+@@ -46274,6 +46242,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI
  G_MODULE_LDFLAGS!$G_MODULE_LDFLAGS$ac_delim
  G_MODULE_HAVE_DLERROR!$G_MODULE_HAVE_DLERROR$ac_delim
  G_MODULE_BROKEN_RTLD_GLOBAL!$G_MODULE_BROKEN_RTLD_GLOBAL$ac_delim
@@ -244,28 +260,28 @@ $NetBSD: patch-aa,v 1.38 2007/11/25 23:38:51 wiz Exp $
  G_MODULE_NEED_USCORE!$G_MODULE_NEED_USCORE$ac_delim
  GLIB_DEBUG_FLAGS!$GLIB_DEBUG_FLAGS$ac_delim
  GSPAWN!$GSPAWN$ac_delim
-@@ -42249,7 +42234,6 @@ G_THREAD_LIBS_EXTRA!$G_THREAD_LIBS_EXTRA
- ENABLE_REGEX_TRUE!$ENABLE_REGEX_TRUE$ac_delim
+@@ -46292,7 +46261,6 @@ ENABLE_REGEX_TRUE!$ENABLE_REGEX_TRUE$ac_
  ENABLE_REGEX_FALSE!$ENABLE_REGEX_FALSE$ac_delim
  USE_SYSTEM_PCRE_TRUE!$USE_SYSTEM_PCRE_TRUE$ac_delim
--USE_SYSTEM_PCRE_FALSE!$USE_SYSTEM_PCRE_FALSE$ac_delim
+ USE_SYSTEM_PCRE_FALSE!$USE_SYSTEM_PCRE_FALSE$ac_delim
+-PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -42291,6 +42275,7 @@ _ACEOF
+@@ -46334,6 +46302,7 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
-+USE_SYSTEM_PCRE_FALSE!$USE_SYSTEM_PCRE_FALSE$ac_delim
- PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim
++PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim
  PCRE_LIBS!$PCRE_LIBS$ac_delim
  PCRE_REQUIRES!$PCRE_REQUIRES$ac_delim
-@@ -42314,7 +42299,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+ PCRE_WARN_CFLAGS!$PCRE_WARN_CFLAGS$ac_delim
+@@ -46356,7 +46325,7 @@ LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/devel/glib2/patches/patch-ag b/devel/glib2/patches/patch-ag
index c95e2c55c42..81912879da2 100644
--- a/devel/glib2/patches/patch-ag
+++ b/devel/glib2/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.13 2007/11/26 00:26:22 tron Exp $
+$NetBSD: patch-ag,v 1.14 2008/01/08 23:31:56 tnn Exp $
 
---- glib/gutils.h.orig	2007-11-07 05:11:58.000000000 +0000
-+++ glib/gutils.h	2007-11-25 23:54:06.000000000 +0000
-@@ -96,6 +96,8 @@
+--- glib/gutils.h.orig	2008-01-08 02:39:49.000000000 +0100
++++ glib/gutils.h
+@@ -108,6 +108,8 @@ G_BEGIN_DECLS
  #ifdef G_IMPLEMENT_INLINES
  #  define G_INLINE_FUNC
  #  undef  G_CAN_INLINE
 +#elif defined (__APPLE__)
 +#  define G_INLINE_FUNC static inline
  #elif defined (__GNUC__) 
- #  define G_INLINE_FUNC extern inline
- #elif defined (G_CAN_INLINE) 
+ #  if __GNUC_PREREQ (4,2) && defined (__STDC_VERSION__) \
+    && __STDC_VERSION__ >= 199901L