Update to 2.29.90.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16172 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 44 insertions, 34 deletions

diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 80fcb92b2..ee22655db 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig	2010-09-09 12:18:43.000000000 +0200
-+++ configure	2010-09-09 12:20:56.000000000 +0200
-@@ -575,6 +575,9 @@
+--- configure.orig	2011-09-15 16:59:35.000000000 +0200
++++ configure	2011-09-15 17:02:03.000000000 +0200
+@@ -583,6 +583,9 @@
  #ifdef HAVE_SYS_TYPES_H
  # include <sys/types.h>
  #endif
@@ -10,7 +10,7 @@
  #ifdef HAVE_SYS_STAT_H
  # include <sys/stat.h>
  #endif
-@@ -5187,7 +5190,7 @@
+@@ -5463,7 +5466,7 @@
  fi
  
  GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -19,16 +19,16 @@
  
  
   if test "x$with_runtime_libdir" != "x"; then
-@@ -22212,7 +22215,7 @@
+@@ -23331,7 +23334,7 @@
  fi
  done
  
--for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
-+for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
+-for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid
++for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid sysctlbyname
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -24815,6 +24818,8 @@
+@@ -26124,6 +26127,8 @@
           ;;
      esac
    fi
@@ -37,7 +37,7 @@
  
    if test x"$G_THREAD_CFLAGS" = x; then
  
-@@ -27415,7 +27420,7 @@
+@@ -28804,7 +28809,7 @@
  fi
  
  
diff --git a/devel/glib20/files/patch-gio_gunixmount.c b/devel/glib20/files/patch-gio_gunixmount.c
index b9bfe143e..e0b3caa37 100644
--- a/devel/glib20/files/patch-gio_gunixmount.c
+++ b/devel/glib20/files/patch-gio_gunixmount.c
@@ -1,6 +1,6 @@
---- gio/gunixmount.c.orig	2007-12-23 15:53:50.000000000 -0500
-+++ gio/gunixmount.c	2007-12-23 15:52:52.000000000 -0500
-@@ -372,12 +372,18 @@ g_unix_mount_eject (GMount             *
+--- gio/gunixmount.c.orig	2011-08-31 19:47:35.000000000 +0200
++++ gio/gunixmount.c	2011-09-15 17:50:24.000000000 +0200
+@@ -449,12 +449,18 @@ g_unix_mount_eject (GMount             *
                      gpointer             user_data)
  {
    GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
@@ -17,5 +17,5 @@
 +  argv[2] = unix_mount->device_path;
 +#endif
  
-   return eject_unmount_do (mount, cancellable, callback, user_data, argv);
+   eject_unmount_do (mount, cancellable, callback, user_data, argv);
  }
diff --git a/devel/glib20/files/patch-gio_gunixmounts.c b/devel/glib20/files/patch-gio_gunixmounts.c
index 9b6fa2df3..92e69bdb6 100644
--- a/devel/glib20/files/patch-gio_gunixmounts.c
+++ b/devel/glib20/files/patch-gio_gunixmounts.c
@@ -1,6 +1,6 @@
---- ggio/unixmounts.c.orig	2008-03-10 20:31:58.000000000 -0400
-+++ gio/gunixmounts.c	2008-03-19 22:31:23.000000000 -0400
-@@ -128,6 +128,9 @@ struct _GUnixMountMonitor {
+--- gio/gunixmounts.c.orig	2011-09-05 05:34:35.000000000 +0200
++++ gio/gunixmounts.c	2011-09-15 17:39:22.000000000 +0200
+@@ -153,6 +153,9 @@ struct _GUnixMountMonitor {
  
    GFileMonitor *fstab_monitor;
    GFileMonitor *mtab_monitor;
@@ -10,7 +10,7 @@
  };
  
  struct _GUnixMountMonitorClass {
-@@ -139,6 +142,8 @@ static GUnixMountMonitor *the_mount_moni
+@@ -164,6 +167,8 @@ static GUnixMountMonitor *the_mount_moni
  static GList *_g_get_unix_mounts (void);
  static GList *_g_get_unix_mount_points (void);
  
@@ -19,15 +19,15 @@
  G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
  
  #define MOUNT_POLL_INTERVAL 4000
-@@ -165,6 +170,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
+@@ -190,6 +195,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
  #endif
  
- #if defined(HAVE_GETMNTINFO) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
+ #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
 +#include <sys/param.h>
  #include <sys/ucred.h>
  #include <sys/mount.h>
  #include <fstab.h>
-@@ -215,20 +221,28 @@ g_unix_is_mount_path_system_internal (co
+@@ -240,22 +246,30 @@ g_unix_is_mount_path_system_internal (co
      "/",              /* we already have "Filesystem root" in Nautilus */ 
      "/bin",
      "/boot",
@@ -39,6 +39,8 @@
      "/lib",
      "/lib64",
 +    "/libexec",
+     "/live/cow",
+     "/live/image",
      "/media",
      "/mnt",
      "/opt",
@@ -54,9 +56,17 @@
 +    "/usr/ports",
 +    "/usr/src",
      "/var",
-     "/var/log/audit", /* https://bugzilla.redhat.com/show_bug.cgi?id=333041 */
-     "/var/tmp",       /* https://bugzilla.redhat.com/show_bug.cgi?id=335241 */
-@@ -988,6 +1002,10 @@ get_mounts_timestamp (void)
+     "/var/crash",
+     "/var/local",
+@@ -1033,6 +1047,7 @@ _g_get_unix_mount_points (void)
+   
+ #ifdef HAVE_SYS_SYSCTL_H
+ #if defined(HAVE_SYSCTLBYNAME)
++  size_t len = sizeof(usermnt);
+   sysctlbyname ("vfs.usermount", &usermnt, &len, NULL, 0);
+ #elif defined(CTL_VFS) && defined(VFS_USERMOUNT)
+   {
+@@ -1108,6 +1123,10 @@ get_mounts_timestamp (void)
        if (stat (monitor_file, &buf) == 0)
  	return (guint64)buf.st_mtime;
      }
@@ -67,7 +77,7 @@
    return 0;
  }
  
-@@ -1129,6 +1147,13 @@ g_unix_mount_monitor_finalize (GObject *
+@@ -1250,6 +1269,13 @@ g_unix_mount_monitor_finalize (GObject *
        g_object_unref (monitor->mtab_monitor);
      }
  
@@ -79,9 +89,9 @@
 +    }
 +
    the_mount_monitor = NULL;
-   
-   if (G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize)
-@@ -1206,6 +1231,51 @@ mtab_file_changed (GFileMonitor      *mo
+ 
+   G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
+@@ -1330,6 +1356,51 @@ mtab_file_changed (GFileMonitor      *mo
    g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
  }
  
@@ -133,7 +143,7 @@
  static void
  g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
  {
-@@ -1228,6 +1298,12 @@ g_unix_mount_monitor_init (GUnixMountMon
+@@ -1352,6 +1423,12 @@ g_unix_mount_monitor_init (GUnixMountMon
        
        g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
      }
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
index d58efb723..d93d21a8b 100644
--- a/devel/glib20/files/patch-glib_Makefile.in
+++ b/devel/glib20/files/patch-glib_Makefile.in
@@ -1,15 +1,15 @@
---- glib/Makefile.in.orig	2010-08-08 12:46:01.000000000 +0200
-+++ glib/Makefile.in	2010-08-08 12:46:01.000000000 +0200
-@@ -529,7 +529,7 @@ BUILT_SOURCES = glibconfig-stamp $(am__a
+--- glib/Makefile.in.orig	2011-09-15 17:08:59.000000000 +0200
++++ glib/Makefile.in	2011-09-15 17:10:38.000000000 +0200
+@@ -542,7 +542,7 @@ BUILT_SOURCES = glibconfig-stamp $(am__a
  #
  DISTCLEANFILES = glibconfig-stamp glibconfig.h
- CLEANFILES = $(am__append_2)
+ CLEANFILES = glib-public-headers.txt $(am__append_3)
 -configexecincludedir = $(libdir)/glib-2.0/include
 +configexecincludedir = $(includedir)/glib-2.0
  nodist_configexecinclude_HEADERS = glibconfig.h
  @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib
  @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la
-@@ -1530,7 +1530,7 @@ info: info-recursive
+@@ -1481,7 +1481,7 @@ info: info-recursive
  
  info-am:
  
@@ -18,7 +18,7 @@
  	install-glibincludeHEADERS install-glibsubincludeHEADERS \
  	install-tapsetDATA
  	@$(NORMAL_INSTALL)
-@@ -1786,9 +1786,7 @@ distclean-local:
+@@ -1774,9 +1774,7 @@ distclean-local:
  libglib-gdb.py: libglib-gdb.py.in
  	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py