Update to 2.10.1:

Overview of Changes from GLib 2.10.0 to GLib 2.10.1
===================================================

* Bugs fixed:
 314794 Broken pthread detection on Darwin [Gregor Riepl]
 322476 Missing check for .dylib [Vladimir Panov]
 333651 Inconsistent _g_charset_get_aliases prototype [Julio
        M. Merino Vidal]
 333761 GInitiallyUnowned breaks application code [Sven Herzberg]

* Win32 changes:
 - Fix g_listenv() implementation.
 - Allow up to 100 GPrivate structs

* Translation updates (fr,hu,lt,pl,sv)

5 files changed, 21 insertions, 35 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 9cb7bb6032c..e98fa60d5ff 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2006/02/25 13:34:01 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2006/03/08 07:25:04 wiz Exp $
 
-DISTNAME=		glib-2.10.0
+DISTNAME=		glib-2.10.1
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.10/ \
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 20f068603b1..e56d7aedbae 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.59 2006/03/06 19:38:15 jmmv Exp $
+$NetBSD: distinfo,v 1.60 2006/03/08 07:25:04 wiz Exp $
 
-SHA1 (glib-2.10.0.tar.bz2) = 550c22448ff99bba4ab69624b023b9786b0da101
-RMD160 (glib-2.10.0.tar.bz2) = 8007ae316cf7217d5673235eb420475cef9afb3b
-Size (glib-2.10.0.tar.bz2) = 2758837 bytes
-SHA1 (patch-aa) = 817596f99a4a171b6c5b3681cf01953ebfbf5668
+SHA1 (glib-2.10.1.tar.bz2) = b68592f0e7d461cebf7cd62dc1b2c8449760fe65
+RMD160 (glib-2.10.1.tar.bz2) = df4c6fa6f03f76ee92a7d1a2d4eb070f1e41b5f8
+Size (glib-2.10.1.tar.bz2) = 2759771 bytes
+SHA1 (patch-aa) = 3c9357a4cb2ea86726cac754edea419089b79bd9
 SHA1 (patch-ab) = a765c6e43856ce858f23f237ffd5b48cb6d029e6
 SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
 SHA1 (patch-af) = 192998d1e2188c0210d7a471786495b758c437ae
 SHA1 (patch-ag) = 8d8f815c0a4bc54edace835205a07d389e6e4261
-SHA1 (patch-ah) = 1445636945d7c830077a68ccde96124c9cafeb4e
-SHA1 (patch-ai) = 2b4dd79f220722285ee808fdcf51a2aae869380b
+SHA1 (patch-ah) = b77a04abeb3fa70e7f8cd5a46aeb6a55f6f18851
 SHA1 (patch-aj) = f0c15174e83dae88cca50d040d0c09438ee9053b
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index 4c552f752ef..0551420917c 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.22 2006/02/25 13:31:03 wiz Exp $
+$NetBSD: patch-aa,v 1.23 2006/03/08 07:25:04 wiz Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=140329
 http://bugzilla.gnome.org/show_bug.cgi?id=141256
 
---- configure.orig	2006-02-24 15:29:13.000000000 +0100
+--- configure.orig	2006-03-07 17:42:20.000000000 +0000
 +++ configure
 @@ -465,7 +465,7 @@ ac_includes_default="\
  # include <unistd.h>
@@ -95,8 +95,8 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  	echo "$as_me:$LINENO: checking for preceeding underscore in symbols" >&5
  echo $ECHO_N "checking for preceeding underscore in symbols... $ECHO_C" >&6
  if test "${glib_cv_uscore+set}" = set; then
-@@ -34364,9 +34431,34 @@ if test x"$have_threads" != xno; then
-          # skip cygwin -pthread or -pthreads test
+@@ -34367,9 +34434,34 @@ if test x"$have_threads" != xno; then
+          # skip cygwin and darwin -pthread or -pthreads test
           ;;
        *)
 -        for flag in pthread pthreads mt; do
@@ -132,7 +132,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
            if test "$cross_compiling" = yes; then
    cat >conftest.$ac_ext <<_ACEOF
  
-@@ -34455,10 +34547,12 @@ rm -f core *.core gmon.out bb.out confte
+@@ -34458,10 +34550,12 @@ rm -f core *.core gmon.out bb.out confte
  fi
            CFLAGS="$glib_save_CFLAGS"
            if test $glib_flag_works = yes ; then
@@ -147,7 +147,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
           ;;
      esac
    fi
-@@ -34511,6 +34605,15 @@ fi
+@@ -34514,6 +34608,15 @@ fi
  
    fi
  
@@ -163,7 +163,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
      # if we are not finding the localtime_r function, then we probably are
      # not using the proper multithread flag
  
-@@ -36464,6 +36567,10 @@ case $host in
+@@ -36467,6 +36570,10 @@ case $host in
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
@@ -174,7 +174,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  esac
  
  
-@@ -40738,6 +40845,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI
+@@ -40741,6 +40848,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI
  s,@G_MODULE_LDFLAGS@,$G_MODULE_LDFLAGS,;t t
  s,@G_MODULE_HAVE_DLERROR@,$G_MODULE_HAVE_DLERROR,;t t
  s,@G_MODULE_BROKEN_RTLD_GLOBAL@,$G_MODULE_BROKEN_RTLD_GLOBAL,;t t
diff --git a/devel/glib2/patches/patch-ah b/devel/glib2/patches/patch-ah
index 1e2cea8e8f6..e4681e8ab2b 100644
--- a/devel/glib2/patches/patch-ah
+++ b/devel/glib2/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2006/02/25 13:31:03 wiz Exp $
+$NetBSD: patch-ah,v 1.5 2006/03/08 07:25:04 wiz Exp $
 
---- glib/gutils.c.orig	2006-02-24 15:02:54.000000000 +0100
+--- glib/gutils.c.orig	2006-03-01 14:18:55.000000000 +0000
 +++ glib/gutils.c
-@@ -2399,7 +2399,7 @@ g_get_system_data_dirs (void)
+@@ -2467,7 +2467,7 @@ g_get_system_data_dirs (void)
        gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
  
        if (!data_dirs || !data_dirs[0])
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.4 2006/02/25 13:31:03 wiz Exp $
  
        data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  #endif
-@@ -2453,7 +2453,7 @@ g_get_system_config_dirs (void)
+@@ -2521,7 +2521,7 @@ g_get_system_config_dirs (void)
        conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
  
        if (!conf_dirs || !conf_dirs[0])
@@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.4 2006/02/25 13:31:03 wiz Exp $
  
        conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  #endif
-@@ -2534,7 +2534,7 @@ unalias_lang (char *lang)
+@@ -2602,7 +2602,7 @@ unalias_lang (char *lang)
    int i;
  
    if (!alias_table)
diff --git a/devel/glib2/patches/patch-ai b/devel/glib2/patches/patch-ai
deleted file mode 100644
index c45f6c00298..00000000000
--- a/devel/glib2/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2006/03/06 19:38:16 jmmv Exp $
-
---- glib/gutf8.c.orig	2006-02-24 15:02:54.000000000 +0100
-+++ glib/gutf8.c
-@@ -435,7 +435,7 @@ get_alias_hash (void)
- /* As an abuse of the alias table, the following routines gets
-  * the charsets that are aliases for the canonical name.
-  */
--const char **
-+const char ** G_GNUC_INTERNAL
- _g_charset_get_aliases (const char *canonical_name)
- {
-   GHashTable *alias_hash = get_alias_hash ();