Update to glib2-2.16.4.

Overview of Changes from GLib 2.16.3 to GLib 2.16.4
===================================================
* Bug fixes:
 528752 Win32 build and SSL not working
 539074 Cannot get exit status with g_spawn_command_line_sync()
 316221 G_LOCK warns about breaking strict-aliasing rules
 519137 g_slice_dup macro needs cast for 64-bit platform
 536158 also bump GHashTable version when a node is removed via
        g_hash_table_iter_remove()/g_hash_table_iter_steal()
 529321 make check fails in glib/pcre
 314453 Nautilus crashes in Solaris when browsing the attached
        file
 502511 g_assert_cmphex prints invalid message
 538119 glib's mainloop leaks a pipe to sub-processes
 540459 there are no way of getting the real number of bytes
        written in GMemoryOutputStream
 540423 unrecoverable error after g_seekable_truncate(seekable,0,...)
 530196 _g_local_file_has_trash_dir() doesn't handle st_dev == 0
 528600 g_dummy_file_get_parent("scheme://example.com/")
 536641 Filesystem querying in gio does not list AFS and autofs
        file systems
 537392 Additional colon in xattr name
 528433 gdesktopappinfo snafu ...
 526320 should not list mounts that the user doesn't have permiss...
 527132 nautilus crash when making ftp connection
 532852 totem_pl_parser_parse_with_base: assertion `...
 459905 Bug in wcwidth data
 534085 g_unichar_iswide_cjk() has a totally wrong table

4 files changed, 73 insertions, 106 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index aaeb69c30cd..038ea3a1faa 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.141 2008/05/29 08:03:58 wiz Exp $
+# $NetBSD: Makefile,v 1.142 2008/07/14 03:54:32 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.16.3
+DISTNAME=		glib-2.16.4
 PKGNAME=		${DISTNAME:S/glib/glib2/}
-PKGREVISION=		3
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.16/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.16/ \
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index d36cd9c191b..7620b406621 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.98 2008/05/29 12:41:35 tnn Exp $
+$NetBSD: distinfo,v 1.99 2008/07/14 03:54:32 tnn Exp $
 
-SHA1 (glib-2.16.3.tar.bz2) = f73fd53130a46f21ff4ee9faa69b9956787c571e
-RMD160 (glib-2.16.3.tar.bz2) = 72260f5f9022ee3f97b79b5705ad6117adc279fd
-Size (glib-2.16.3.tar.bz2) = 4540919 bytes
-SHA1 (patch-aa) = 8b7c478e2e88e2b8ea380878d5219569d9c9a068
+SHA1 (glib-2.16.4.tar.bz2) = 8d0d71a863f9db18b0c581b6382d37719ae3df50
+RMD160 (glib-2.16.4.tar.bz2) = d154f778cde25cc6ae1418c6d296e1b2ec71be62
+Size (glib-2.16.4.tar.bz2) = 4553784 bytes
+SHA1 (patch-aa) = 039c5f0596fffa9d60c004c16f2d801a2896eedd
 SHA1 (patch-ab) = e84c4928b5288b83f2203b4ffd28cdb9de730e98
 SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
@@ -16,5 +16,5 @@ SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e
 SHA1 (patch-ak) = 4eee3ce549ba0972ab5d5d8166d37d2b61320e68
 SHA1 (patch-al) = aa2dbd63d53298aab3a30ec6d27e836717c960e3
 SHA1 (patch-ba) = cea071d6477035e0a57636efe272e120ff6d40ee
-SHA1 (patch-ca) = e6d852bd79bae271245c94f2d083671bd52af71c
+SHA1 (patch-ca) = 83e5a1d117d381949ccdd6eabfeaf546d98bdc29
 SHA1 (patch-cb) = 0a58d38bc6361f9d5f6f66f83f2f000e812f0507
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index 33b55f1f73c..db517c8deb1 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.41 2008/04/10 12:13:49 drochner Exp $
+$NetBSD: patch-aa,v 1.42 2008/07/14 03:54:32 tnn Exp $
 
---- configure.orig	2008-04-08 05:51:40.000000000 +0200
+--- configure.orig	2008-07-02 03:31:24.000000000 +0200
 +++ configure
-@@ -959,6 +959,7 @@ G_MODULE_PLUGIN_LIBS
+@@ -984,6 +984,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.41 2008/04/10 12:13:49 drochner Exp $
  G_MODULE_NEED_USCORE
  GLIB_DEBUG_FLAGS
  GSPAWN
-@@ -36598,6 +36599,7 @@ else
+@@ -37456,6 +37457,7 @@ else
  fi
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -18,14 +18,14 @@ $NetBSD: patch-aa,v 1.41 2008/04/10 12:13:49 drochner Exp $
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -37393,6 +37395,84 @@ fi
+@@ -38289,6 +38291,87 @@ fi
  
  	LIBS="$LIBS_orig"
  fi
-+	{ echo "$as_me:$LINENO: checking for dlopen(NULL, 0) brokenness" >&5
-+echo $ECHO_N "checking for dlopen(NULL, 0) brokenness... $ECHO_C" >&6; }
++	{ $as_echo "$as_me:$LINENO: checking for dlopen(NULL, 0) brokenness" >&5
++$as_echo_n "checking for dlopen(NULL, 0) brokenness... " >&6; }
 +if test "${glib_cv_dlopennull_broken+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +else
 +
 +		if test "$cross_compiling" = yes; then
@@ -64,37 +64,40 @@ $NetBSD: patch-aa,v 1.41 2008/04/10 12:13:49 drochner Exp $
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>&5
 +  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_try") 2>&5
 +  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  glib_cv_dlopennull_broken=no
 +else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++$as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +( exit $ac_status )
 +glib_cv_dlopennull_broken=yes
 +fi
++rm -rf conftest.dSYM
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +fi
 +
 +
 +
 +fi
-+{ echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5
-+echo "${ECHO_T}$glib_cv_dlopennull_broken" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5
++$as_echo "$glib_cv_dlopennull_broken" >&6; }
 +	if test "x$glib_cv_dlopennull_broken" = "xyes"; then
 +		G_MODULE_BROKEN_DLOPEN_NULL=1
 +	else
@@ -103,16 +106,16 @@ $NetBSD: patch-aa,v 1.41 2008/04/10 12:13:49 drochner Exp $
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -37429,6 +37509,8 @@ fi
+@@ -38325,6 +38408,8 @@ fi
  
  
  
 +
 +
- { echo "$as_me:$LINENO: checking for gspawn implementation" >&5
- echo $ECHO_N "checking for gspawn implementation... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for gspawn implementation" >&5
+ $as_echo_n "checking for gspawn implementation... " >&6; }
  case "$host" in
-@@ -39087,110 +39169,8 @@ if test x"$have_threads" != xno; then
+@@ -40036,117 +40121,8 @@ if test x"$have_threads" != xno; then
          G_THREAD_LIBS="-lpthread -lthread"
          ;;
        *)
@@ -139,26 +142,30 @@ $NetBSD: patch-aa,v 1.41 2008/04/10 12:13:49 drochner Exp $
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_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
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 -  glib_flag_works=yes
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	glib_flag_works=no
 -fi
 -
+-rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -else
@@ -186,29 +193,32 @@ $NetBSD: patch-aa,v 1.41 2008/04/10 12:13:49 drochner Exp $
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_link") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && { ac_try='./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_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_try") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  glib_flag_works=yes
 -else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -( exit $ac_status )
 -glib_flag_works=no
 -fi
+-rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 -fi
 -
@@ -225,7 +235,7 @@ $NetBSD: patch-aa,v 1.41 2008/04/10 12:13:49 drochner Exp $
           ;;
      esac
    fi
-@@ -41303,6 +41283,10 @@ case $host in
+@@ -42335,6 +42311,10 @@ case $host in
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
@@ -236,32 +246,23 @@ $NetBSD: patch-aa,v 1.41 2008/04/10 12:13:49 drochner Exp $
  esac
  
  
-@@ -46418,10 +46402,10 @@ 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
-+G_MODULE_BROKEN_DLOPEN_NULL!$G_MODULE_BROKEN_DLOPEN_NULL$ac_delim
- G_MODULE_NEED_USCORE!$G_MODULE_NEED_USCORE$ac_delim
- GLIB_DEBUG_FLAGS!$GLIB_DEBUG_FLAGS$ac_delim
- GSPAWN!$GSPAWN$ac_delim
--GIO!$GIO$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -46463,6 +46447,7 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+GIO!$GIO$ac_delim
- GIO_MODULE_DIR!$GIO_MODULE_DIR$ac_delim
- SELINUX_LIBS!$SELINUX_LIBS$ac_delim
- HAVE_INOTIFY_TRUE!$HAVE_INOTIFY_TRUE$ac_delim
-@@ -46508,7 +46493,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` = 43; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -47568,9 +47548,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+   }
+   split(mac1, mac2, "(") #)
+   macro = mac2[1]
+-  prefix = substr(line, 1, index(line, defundef) - 1)
+   if (D_is_set[macro]) {
+     # Preserve the white space surrounding the "#".
++    prefix = substr(line, 1, index(line, defundef) - 1)
+     print prefix "define", macro P[macro] D[macro]
+     next
+   } else {
+@@ -47578,7 +47558,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+     # in the case of _POSIX_SOURCE, which is predefined and required
+     # on some systems where configure will not decide to define it.
+     if (defundef == "undef") {
+-      print "/*", prefix defundef, macro, "*/"
++      print "/*", line, "*/"
+       next
+     }
+   }
diff --git a/devel/glib2/patches/patch-ca b/devel/glib2/patches/patch-ca
index cd6ad066bde..b67853f4ed1 100644
--- a/devel/glib2/patches/patch-ca
+++ b/devel/glib2/patches/patch-ca
@@ -1,6 +1,6 @@
-$NetBSD: patch-ca,v 1.2 2008/05/19 19:08:36 tnn Exp $
+$NetBSD: patch-ca,v 1.3 2008/07/14 03:54:32 tnn Exp $
 
---- gio/glocalfile.c.orig	2008-04-08 05:47:30.000000000 +0200
+--- gio/glocalfile.c.orig	2008-07-02 00:30:15.000000000 +0200
 +++ gio/glocalfile.c
 @@ -53,7 +53,7 @@
  #if defined(HAVE_STATFS) && defined(HAVE_STATVFS)
@@ -11,7 +11,7 @@ $NetBSD: patch-ca,v 1.2 2008/05/19 19:08:36 tnn Exp $
     /* on solaris, statfs doesn't even have the
        f_bavail field */
  #  define USE_STATVFS
-@@ -1004,8 +1004,12 @@ g_local_file_query_filesystem_info (GFil
+@@ -1008,8 +1008,12 @@ g_local_file_query_filesystem_info (GFil
  #if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME)
    fstype = g_strdup(statfs_buffer.f_fstypename);
  #else
@@ -24,36 +24,3 @@ $NetBSD: patch-ca,v 1.2 2008/05/19 19:08:36 tnn Exp $
    if (fstype &&
        g_file_attribute_matcher_matches (attribute_matcher,
  					G_FILE_ATTRIBUTE_FILESYSTEM_TYPE))
-@@ -1580,7 +1584,8 @@ escape_trash_name (char *name)
- gboolean
- _g_local_file_has_trash_dir (const char *dirname, dev_t dir_dev)
- {
--  static gsize home_dev = 0;
-+  static gsize home_dev_set = 0;
-+  static dev_t home_dev;
-   char *topdir, *globaldir, *trashdir, *tmpname;
-   uid_t uid;
-   char uid_str[32];
-@@ -1588,18 +1593,17 @@ _g_local_file_has_trash_dir (const char 
-   gboolean res;
-   int statres;
-       
--  if (g_once_init_enter (&home_dev))
-+  if (g_once_init_enter (&home_dev_set))
-     {
--      gsize setup_value = 0;
-       struct stat home_stat;
-       
-       g_stat (g_get_home_dir (), &home_stat);
--      setup_value = home_stat.st_dev;
--      g_once_init_leave (&home_dev, setup_value);
-+      home_dev = home_stat.st_dev;
-+      g_once_init_leave (&home_dev_set, 1);
-     }
- 
-   /* Assume we can trash to the home */
--  if (dir_dev == (dev_t)home_dev)
-+  if (dir_dev == home_dev)
-     return TRUE;
- 
-   topdir = find_mountpoint_for (dirname, dir_dev);