summaryrefslogtreecommitdiff
path: root/sysutils/gnome-vfs
diff options
context:
space:
mode:
authordbj <dbj@pkgsrc.org>2005-11-04 22:30:34 +0000
committerdbj <dbj@pkgsrc.org>2005-11-04 22:30:34 +0000
commita40fb69778127497ba112512009b9a302b86368c (patch)
tree45b8f836813ac1f0ae10e367cbe1a8a8a15888ee /sysutils/gnome-vfs
parentaf16c9f875c5d9854a49ff95598ee8c4dd90d76c (diff)
downloadpkgsrc-a40fb69778127497ba112512009b9a302b86368c.tar.gz
only include malloc.h if HAVE_MALLOC_H is defined
Diffstat (limited to 'sysutils/gnome-vfs')
-rw-r--r--sysutils/gnome-vfs/distinfo4
-rw-r--r--sysutils/gnome-vfs/patches/patch-ac15
2 files changed, 12 insertions, 7 deletions
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index eab8035c57b..128f846a99a 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.17 2005/05/26 11:32:25 wiz Exp $
+$NetBSD: distinfo,v 1.18 2005/11/04 22:30:34 dbj Exp $
SHA1 (gnome-vfs-1.0.5.tar.gz) = 41156323969d44e3f14ce481b81bfdb5d1deba49
RMD160 (gnome-vfs-1.0.5.tar.gz) = 76fbf8e590e41d2cac39faef9edc85e2df02c21a
Size (gnome-vfs-1.0.5.tar.gz) = 1048954 bytes
SHA1 (patch-aa) = 9bb8ed4b9fbab1ff21d86b3d1e297cb89544137b
SHA1 (patch-ab) = 6d038601f881185f8a4c55a604f7baccb8693ffe
-SHA1 (patch-ac) = 4da6d9b46d059710dcd8248dd9d23cb79e5253e1
+SHA1 (patch-ac) = c7c05745228aba1b4db343155e8ac0c53e84bf32
SHA1 (patch-ad) = fedec3138430a91d96e15fcc6fc60f64b13ef50d
SHA1 (patch-ae) = a0906ba19a6953aca3b173f03fb1b2d9bf742a09
SHA1 (patch-af) = c76c64801b643828f6cb8751131447335d39c28e
diff --git a/sysutils/gnome-vfs/patches/patch-ac b/sysutils/gnome-vfs/patches/patch-ac
index 5bee6d30607..05375cef89d 100644
--- a/sysutils/gnome-vfs/patches/patch-ac
+++ b/sysutils/gnome-vfs/patches/patch-ac
@@ -1,16 +1,21 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/11/25 13:57:10 rh Exp $
+$NetBSD: patch-ac,v 1.2 2005/11/04 22:30:34 dbj Exp $
---- modules/file-method.c.orig Thu Nov 16 07:57:37 2000
+--- modules/file-method.c.orig 2002-03-14 22:33:01.000000000 -0500
+++ modules/file-method.c
-@@ -37,6 +37,7 @@
+@@ -35,9 +35,12 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <limits.h>
++#ifdef HAVE_MALLOC_H
#include <malloc.h>
++#endif
#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/param.h>
#include <unistd.h>
#include <stdio.h>
#include <utime.h>
-@@ -723,9 +724,15 @@
+@@ -767,9 +770,15 @@ read_directory (DirectoryHandle *handle,
filter_needs = GNOME_VFS_DIRECTORY_FILTER_NEEDS_NOTHING;
}
@@ -26,7 +31,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/11/25 13:57:10 rh Exp $
if (result == NULL) {
return GNOME_VFS_ERROR_EOF;
-@@ -1054,9 +1061,15 @@
+@@ -1099,9 +1108,15 @@ find_trash_in_one_hierarchy_level (const
item_buffer = g_malloc (sizeof (struct dirent) + GET_PATH_MAX() + 1);
for (;;) {