2 files changed, 22 insertions, 25 deletions
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 4699afdbedd4..a6d6851b09cf 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,28 +1,25 @@
---- configure.orig	2009-09-05 10:54:38.000000000 +0200
-+++ configure	2009-09-05 10:56:40.000000000 +0200
-@@ -29571,6 +29571,12 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
+--- configure.orig	2010-03-03 21:31:46.000000000 -0500
++++ configure	2010-03-03 21:47:47.000000000 -0500
+@@ -714,6 +714,9 @@ ac_includes_default="\
+ #ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
 +#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
++# include <sys/param.h>
 +#endif
-+#ifdef HAVE_SYS_MOUNT_H
-+#include <sys/mount.h>
-+#endif
- int
- main ()
- {
-@@ -31611,7 +31617,7 @@ done
- 
- 
+ #ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+@@ -23020,7 +23023,7 @@ _ACEOF
+ 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
- do
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -39943,6 +39949,8 @@ fi
+ 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"
+@@ -25631,6 +25634,8 @@ fi
           ;;
      esac
    fi
diff --git a/devel/glib20/files/patch-gio_gunixvolume.c b/devel/glib20/files/patch-gio_gunixvolume.c
index 377a7d6b5686..b22563047d84 100644
--- a/devel/glib20/files/patch-gio_gunixvolume.c
+++ b/devel/glib20/files/patch-gio_gunixvolume.c
@@ -1,6 +1,6 @@
---- gio/gunixvolume.c.orig	2007-12-23 15:43:17.000000000 -0500
-+++ gio/gunixvolume.c	2007-12-23 15:47:08.000000000 -0500
-@@ -387,9 +387,13 @@ g_unix_volume_eject (GVolume    *volume,
+--- gio/gunixvolume.c.orig	2009-11-30 04:35:27.000000000 +0100
++++ gio/gunixvolume.c	2009-12-08 19:32:03.000000000 +0100
+@@ -465,9 +465,14 @@ g_unix_volume_eject (GVolume            
                       gpointer             user_data)
  {
    GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
@@ -8,8 +8,8 @@
 +  char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
 +  argv[2] = unix_volume->device_path;
 +#else
-   char *argv[] = {"eject", NULL, NULL};
--
+   char *argv[] = { "eject", NULL, NULL };
+ 
    argv[1] = unix_volume->device_path;
 +#endif