update to 1.4.2

this switches to the gnome-2.28 release branch

5 files changed, 82 insertions, 3 deletions

diff --git a/sysutils/gvfs/patches/patch-aa b/sysutils/gvfs/patches/patch-aa
index 80a7817c503..3e3edb62c81 100644
--- a/sysutils/gvfs/patches/patch-aa
+++ b/sysutils/gvfs/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2009/03/16 13:06:40 jmcneill Exp $
+$NetBSD: patch-aa,v 1.5 2009/12/09 18:53:49 drochner Exp $
 
---- configure.orig	2008-09-24 14:29:37.000000000 +0200
+--- configure.orig	2009-11-30 12:06:16.000000000 +0100
 +++ configure
-@@ -18337,7 +18337,7 @@ _ACEOF
+@@ -17863,7 +17863,7 @@ if test "x$enable_gdu" != "xno"; then
+   msg_gdu=yes
+ fi
+ 
+-  if test "x$msg_gdu" == "xyes"; then
++  if test "x$msg_gdu" = "xyes"; then
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for GDU" >&5
+@@ -19679,7 +19679,7 @@ _ACEOF
  
  		msg_samba="yes"
                  if test x$with_samba_libs != x/usr/lib; then
@@ -11,3 +20,12 @@ $NetBSD: patch-aa,v 1.4 2009/03/16 13:06:40 jmcneill Exp $
                  else
                  	SAMBA_LIBS="-lsmbclient"
                  fi
+@@ -20911,7 +20911,7 @@ _ACEOF
+ fi
+ 
+ 
+-if test "$ac_cv_func_statfs" = yes ; then
++if test "$ac_cv_func_statvfs" != yes -a "$ac_cv_func_statfs" = yes ; then
+   { $as_echo "$as_me:$LINENO: checking number of arguments to statfs()" >&5
+ $as_echo_n "checking number of arguments to statfs()... " >&6; }
+   cat >conftest.$ac_ext <<_ACEOF
diff --git a/sysutils/gvfs/patches/patch-ad b/sysutils/gvfs/patches/patch-ad
new file mode 100644
index 00000000000..77583cf9338
--- /dev/null
+++ b/sysutils/gvfs/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2009/12/09 18:53:49 drochner Exp $
+
+--- daemon/gvfsbackendcdda.c.orig	2009-07-25 22:22:03.000000000 +0200
++++ daemon/gvfsbackendcdda.c
+@@ -194,7 +194,11 @@ find_udi_for_device (GVfsBackendCdda *cd
+   cdda_backend->hal_udi = NULL;
+ 
+   devices = libhal_manager_find_device_string_match (cdda_backend->hal_ctx,
++#ifdef __NetBSD__
++						     "block.netbsd.raw_device",
++#else
+                                                      "block.device",
++#endif
+                                                      cdda_backend->device_path,
+                                                      &num_devices,
+                                                      NULL);
diff --git a/sysutils/gvfs/patches/patch-ae b/sysutils/gvfs/patches/patch-ae
new file mode 100644
index 00000000000..615a6e9edb4
--- /dev/null
+++ b/sysutils/gvfs/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2009/12/09 18:53:49 drochner Exp $
+
+--- monitor/hal/ghalvolumemonitor.c.orig	2009-07-25 22:52:10.000000000 +0200
++++ monitor/hal/ghalvolumemonitor.c
+@@ -1323,7 +1323,11 @@ update_discs (GHalVolumeMonitor *monitor
+               GFile *foreign_mount_root;
+ 
+               /* the gvfsd-cdda backend uses URI's like these */
++#ifdef __NetBSD__
++	      device_basename = g_path_get_basename (hal_device_get_property_string (d, "block.netbsd.raw_device"));
++#else
+               device_basename = g_path_get_basename (hal_device_get_property_string (d, "block.device"));
++#endif
+               uri = g_strdup_printf ("cdda://%s", device_basename);
+               foreign_mount_root = g_file_new_for_uri (uri);
+               g_free (device_basename);
diff --git a/sysutils/gvfs/patches/patch-af b/sysutils/gvfs/patches/patch-af
new file mode 100644
index 00000000000..5ff7366b18d
--- /dev/null
+++ b/sysutils/gvfs/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2009/12/09 18:53:49 drochner Exp $
+
+--- daemon/gvfsftpdircache.c.orig	2009-10-22 12:12:01.000000000 +0200
++++ daemon/gvfsftpdircache.c
+@@ -586,7 +586,7 @@ g_vfs_ftp_dir_cache_funcs_process (GInpu
+                                        type == 'l' ? G_FILE_TYPE_SYMBOLIC_LINK :
+                                        G_FILE_TYPE_DIRECTORY);
+ 
+-      if (unix)
++      if (is_unix)
+         g_file_info_set_is_hidden (info, result.fe_fnlen > 0 &&
+                                          result.fe_fname[0] == '.');
+ 
diff --git a/sysutils/gvfs/patches/patch-ag b/sysutils/gvfs/patches/patch-ag
new file mode 100644
index 00000000000..4cfe46ecd84
--- /dev/null
+++ b/sysutils/gvfs/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1 2009/12/09 18:53:49 drochner Exp $
+
+--- monitor/hal/ghaldrive.c.orig	2009-10-25 16:52:31.000000000 +0100
++++ monitor/hal/ghaldrive.c
+@@ -377,7 +377,11 @@ g_hal_drive_new (GVolumeMonitor       *v
+   drive = g_object_new (G_TYPE_HAL_DRIVE, NULL);
+   drive->volume_monitor = volume_monitor;
+   g_object_add_weak_pointer (G_OBJECT (volume_monitor), (gpointer) &(drive->volume_monitor));
++#ifdef __NetBSD__
++  drive->device_path = g_strdup (hal_device_get_property_string (device, "block.netbsd.raw_device"));
++#else
+   drive->device_path = g_strdup (hal_device_get_property_string (device, "block.device"));
++#endif
+   drive->device = g_object_ref (device);
+   drive->pool = g_object_ref (pool);
+