diff options
author | marcus <marcus@FreeBSD.org> | 2004-04-17 12:52:38 +0800 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2004-04-17 12:52:38 +0800 |
commit | 2d564bde46f8b27913c065e15c43e52405bceea6 (patch) | |
tree | 0bbe0551ac0e4b60f7749eead39a4af2916fb59a /devel/gnomevfs2 | |
parent | 623e49313ea2a3f88c112d5e06c17c042725567e (diff) | |
download | freebsd-ports-gnome-2d564bde46f8b27913c065e15c43e52405bceea6.tar.gz freebsd-ports-gnome-2d564bde46f8b27913c065e15c43e52405bceea6.tar.zst freebsd-ports-gnome-2d564bde46f8b27913c065e15c43e52405bceea6.zip |
* statfs.f_flags is a bitmap, so we need to do boolean operations, and not
simply test for equality
* Fix a potential crash in many GNOME applications because the device number
for various file systems could not be obtained
Diffstat (limited to 'devel/gnomevfs2')
-rw-r--r-- | devel/gnomevfs2/Makefile | 2 | ||||
-rw-r--r-- | devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c | 26 |
2 files changed, 25 insertions, 3 deletions
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index bcaf1722a6b7..40cc95ad9d73 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomevfs2 PORTVERSION= 2.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.6 diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c index 21912f46e0ec..7028e5a91b8e 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c @@ -1,5 +1,27 @@ ---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Mon Mar 8 22:29:57 2004 -+++ libgnomevfs/gnome-vfs-unix-mounts.c Mon Mar 8 22:33:35 2004 +--- libgnomevfs/gnome-vfs-unix-mounts.c.orig Mon Feb 16 06:13:27 2004 ++++ libgnomevfs/gnome-vfs-unix-mounts.c Sat Apr 17 00:45:01 2004 +@@ -141,9 +141,9 @@ + FD_ZERO(&read_fds); + FD_SET(pipes[0], &read_fds); + +- /* Wait max half a second */ +- tv.tv_sec = 0; +- tv.tv_usec = 500; ++ /* Wait max one second */ ++ tv.tv_sec = 1; ++ tv.tv_usec = 0; + + res = select(pipes[0] + 1, + &read_fds, NULL, NULL, &tv); +@@ -428,7 +428,7 @@ + mount_entry->mount_path = g_strdup (mntent[i].f_mntonname); + mount_entry->device_path = g_strdup (mntent[i].f_mntfromname); + mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename); +- if (mntent[i].f_flags == MNT_RDONLY) { ++ if (mntent[i].f_flags & MNT_RDONLY) { + mount_entry->is_read_only = TRUE; + } + @@ -857,8 +857,9 @@ #ifdef HAVE_SYS_SYSCTL_H |