[pkgsrc/trunk]: pkgsrc/devel/glib2 Update to 2.14.4:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e3778aceb089
branches:  trunk
changeset: 535687:e3778aceb089
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Nov 25 23:38:50 2007 +0000

description:
Update to 2.14.4:

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

* Bugs fixed:
 494602 builddir != srcdir build broken
 492677 Misprint in specification of the interface "g_spawn_async...
 490061 outptrs uninitialized after g_parse_long_long
 418778 Insufficient pkg-config version requirement
 467537 g_convert_with_iconv() not resetting iconv() state correc...
 466557 glib-mkenums shifts ARGV[0] to undefined
 490637 gobject documentation patch
 445362 Non-numeric local labels in gatomic.c are causing linker ...
 498113 tests/regex-test fails on 64bit environment
 498728 g_key_file_get_*_list should set length to 0 when returni...
 469551 application --help messages are garbaged on none UTF-8 lo...

diffstat:

 devel/glib2/Makefile         |   4 ++--
 devel/glib2/distinfo         |  16 ++++++++--------
 devel/glib2/patches/patch-aa |  26 +++++++++++++-------------
 devel/glib2/patches/patch-af |   6 +++---
 devel/glib2/patches/patch-ah |  10 +++++-----
 devel/glib2/patches/patch-ai |   8 ++++----
 6 files changed, 35 insertions(+), 35 deletions(-)

diffs (213 lines):

diff -r 17b13d951943 -r e3778aceb089 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Sun Nov 25 23:23:25 2007 +0000
+++ b/devel/glib2/Makefile      Sun Nov 25 23:38:50 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.126 2007/11/08 19:52:21 drochner Exp $
+# $NetBSD: Makefile,v 1.127 2007/11/25 23:38:50 wiz 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.3
+DISTNAME=              glib-2.14.4
 PKGNAME=               ${DISTNAME:S/glib/glib2/}
 CATEGORIES=            devel
 MASTER_SITES=          ftp://ftp.gtk.org/pub/glib/2.14/ \
diff -r 17b13d951943 -r e3778aceb089 devel/glib2/distinfo
--- a/devel/glib2/distinfo      Sun Nov 25 23:23:25 2007 +0000
+++ b/devel/glib2/distinfo      Sun Nov 25 23:38:50 2007 +0000
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.88 2007/11/08 19:52:21 drochner Exp $
+$NetBSD: distinfo,v 1.89 2007/11/25 23:38:51 wiz Exp $
 
-SHA1 (glib-2.14.3.tar.bz2) = 3aef290ceaf17379b2fe24d8fdfb5ce6755d5f25
-RMD160 (glib-2.14.3.tar.bz2) = d66ec2f7bf8e9fe1ab9e0191b55f46f9b711ca4c
-Size (glib-2.14.3.tar.bz2) = 3339169 bytes
-SHA1 (patch-aa) = 1fdb9b104bfb3c8c28252be3e82a1757a5ca64cf
+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 (patch-ab) = e84c4928b5288b83f2203b4ffd28cdb9de730e98
 SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
-SHA1 (patch-af) = 192998d1e2188c0210d7a471786495b758c437ae
-SHA1 (patch-ah) = 8b65c137b07659351b97089c10db0dac61f04905
-SHA1 (patch-ai) = baf3466a38ed09e956c4e8423a64415395690de7
+SHA1 (patch-af) = a60aefb2e9e381984e001cd28fb714ff58edd6ee
+SHA1 (patch-ah) = 76c7337b707de496591dd881ce4cd32f3222f53b
+SHA1 (patch-ai) = e615c6b37cc9d6247940023aefb7bf75bcddc7a5
 SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e
 SHA1 (patch-ak) = 4eee3ce549ba0972ab5d5d8166d37d2b61320e68
diff -r 17b13d951943 -r e3778aceb089 devel/glib2/patches/patch-aa
--- a/devel/glib2/patches/patch-aa      Sun Nov 25 23:23:25 2007 +0000
+++ b/devel/glib2/patches/patch-aa      Sun Nov 25 23:38:50 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.37 2007/11/08 19:52:21 drochner Exp $
+$NetBSD: patch-aa,v 1.38 2007/11/25 23:38:51 wiz Exp $
 
---- configure.orig     2007-11-07 06:13:12.000000000 +0100
+--- configure.orig     2007-11-24 06:41:59.000000000 +0000
 +++ configure
 @@ -945,6 +945,7 @@ G_MODULE_PLUGIN_LIBS
  G_MODULE_LDFLAGS
@@ -10,7 +10,7 @@
  G_MODULE_NEED_USCORE
  GLIB_DEBUG_FLAGS
  GSPAWN
-@@ -33908,6 +33909,7 @@ else
+@@ -33910,6 +33911,7 @@ else
  fi
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -18,7 +18,7 @@
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -34703,6 +34705,84 @@ fi
+@@ -34705,6 +34707,84 @@ fi
  
        LIBS="$LIBS_orig"
  fi
@@ -103,7 +103,7 @@
  if test -z "$G_MODULE_IMPL"; then
        G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -34739,6 +34819,8 @@ fi
+@@ -34741,6 +34821,8 @@ fi
  
  
  
@@ -112,7 +112,7 @@
  { echo "$as_me:$LINENO: checking for gspawn implementation" >&5
  echo $ECHO_N "checking for gspawn implementation... $ECHO_C" >&6; }
  case "$host" in
-@@ -35086,110 +35168,8 @@ if test x"$have_threads" != xno; then
+@@ -35088,110 +35170,8 @@ if test x"$have_threads" != xno; then
          G_THREAD_LIBS="-lpthread -lthread"
          ;;
        *)
@@ -225,7 +225,7 @@
           ;;
      esac
    fi
-@@ -37150,6 +37130,10 @@ case $host in
+@@ -37152,6 +37132,10 @@ case $host in
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
@@ -236,7 +236,7 @@
  esac
  
  
-@@ -42175,6 +42159,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI
+@@ -42232,6 +42216,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,7 +244,7 @@
  G_MODULE_NEED_USCORE!$G_MODULE_NEED_USCORE$ac_delim
  GLIB_DEBUG_FLAGS!$GLIB_DEBUG_FLAGS$ac_delim
  GSPAWN!$GSPAWN$ac_delim
-@@ -42192,7 +42177,6 @@ G_THREAD_LIBS_EXTRA!$G_THREAD_LIBS_EXTRA
+@@ -42249,7 +42234,6 @@ G_THREAD_LIBS_EXTRA!$G_THREAD_LIBS_EXTRA
  ENABLE_REGEX_TRUE!$ENABLE_REGEX_TRUE$ac_delim
  ENABLE_REGEX_FALSE!$ENABLE_REGEX_FALSE$ac_delim
  USE_SYSTEM_PCRE_TRUE!$USE_SYSTEM_PCRE_TRUE$ac_delim
@@ -252,7 +252,7 @@
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -42234,6 +42218,7 @@ _ACEOF
+@@ -42291,6 +42275,7 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -260,12 +260,12 @@
  PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim
  PCRE_LIBS!$PCRE_LIBS$ac_delim
  PCRE_REQUIRES!$PCRE_REQUIRES$ac_delim
-@@ -42256,7 +42241,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -42314,7 +42299,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` = 20; then
-+  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` = 21; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r 17b13d951943 -r e3778aceb089 devel/glib2/patches/patch-af
--- a/devel/glib2/patches/patch-af      Sun Nov 25 23:23:25 2007 +0000
+++ b/devel/glib2/patches/patch-af      Sun Nov 25 23:38:50 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.8 2006/02/25 13:31:03 wiz Exp $
+$NetBSD: patch-af,v 1.9 2007/11/25 23:38:52 wiz Exp $
 
---- glib/libcharset/Makefile.in.orig   2006-02-24 15:29:09.000000000 +0100
+--- glib/libcharset/Makefile.in.orig   2007-11-24 06:41:56.000000000 +0000
 +++ glib/libcharset/Makefile.in
-@@ -540,18 +540,6 @@ uninstall-am: uninstall-info-am uninstal
+@@ -556,18 +556,6 @@ uninstall-am: uninstall-info-am uninstal
        uninstall-am uninstall-info-am uninstall-local
  
  install-exec-local: all-local
diff -r 17b13d951943 -r e3778aceb089 devel/glib2/patches/patch-ah
--- a/devel/glib2/patches/patch-ah      Sun Nov 25 23:23:25 2007 +0000
+++ b/devel/glib2/patches/patch-ah      Sun Nov 25 23:38:50 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.7 2006/07/23 14:15:02 wiz Exp $
+$NetBSD: patch-ah,v 1.8 2007/11/25 23:38:52 wiz Exp $
 
---- glib/gutils.c.orig 2006-07-06 20:30:16.000000000 +0000
+--- glib/gutils.c.orig 2007-11-24 06:40:59.000000000 +0000
 +++ glib/gutils.c
-@@ -2489,7 +2489,7 @@ g_get_system_data_dirs (void)
+@@ -2619,7 +2619,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 @@
  
        data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  #endif
-@@ -2543,7 +2543,7 @@ g_get_system_config_dirs (void)
+@@ -2673,7 +2673,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 @@
  
        conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  #endif
-@@ -2624,7 +2624,7 @@ unalias_lang (char *lang)
+@@ -2754,7 +2754,7 @@ unalias_lang (char *lang)
    int i;
  
    if (!alias_table)
diff -r 17b13d951943 -r e3778aceb089 devel/glib2/patches/patch-ai
--- a/devel/glib2/patches/patch-ai      Sun Nov 25 23:23:25 2007 +0000
+++ b/devel/glib2/patches/patch-ai      Sun Nov 25 23:38:50 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.13 2007/01/10 14:57:33 drochner Exp $
+$NetBSD: patch-ai,v 1.14 2007/11/25 23:38:53 wiz Exp $
 
---- glib/gmain.c.orig  2007-01-10 14:36:51.000000000 +0100
+--- glib/gmain.c.orig  2007-11-24 06:40:59.000000000 +0000
 +++ glib/gmain.c
-@@ -2619,13 +2619,13 @@ g_main_context_iterate (GMainContext *co
+@@ -2636,13 +2636,13 @@ g_main_context_iterate (GMainContext *co
      {
        gboolean got_ownership;
        
@@ -18,7 +18,7 @@
        if (!context->cond)
        context->cond = g_cond_new ();
            
-@@ -2635,7 +2635,6 @@ g_main_context_iterate (GMainContext *co
+@@ -2652,7 +2652,6 @@ g_main_context_iterate (GMainContext *co
  
        if (!got_ownership)
        {