From 628549d06a7f33920ff93d7744db6d11ecbf5279 Mon Sep 17 00:00:00 2001
From: danw <danw@pkgsrc.org>
Date: Sat, 27 Sep 2003 21:05:22 +0000
Subject: patches for darwin

---
 sysutils/gnome-vfs2/distinfo         |  5 +++--
 sysutils/gnome-vfs2/patches/patch-aa | 33 +++++++++++++++++++++++++++++++++
 sysutils/gnome-vfs2/patches/patch-ai | 17 +++++++++++++----
 3 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 sysutils/gnome-vfs2/patches/patch-aa

(limited to 'sysutils/gnome-vfs2')

diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index c3d4896dfc2..a84a31ffe85 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2003/04/27 14:44:33 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2003/09/27 21:10:08 danw Exp $
 
 SHA1 (gnome-vfs-2.2.4.tar.bz2) = 40518be379250cb8b6c611c2d585ea35403b3f53
 Size (gnome-vfs-2.2.4.tar.bz2) = 999711 bytes
+SHA1 (patch-aa) = 33a61974bc6c5b8c933ccdfeffd30e17292064d2
 SHA1 (patch-ae) = fbe0fa8e2def2fec2cc55317a35638d8314287d2
 SHA1 (patch-ag) = 48a1a7e7b780bcf25f311abe0c48524c8fe9eaa4
-SHA1 (patch-ai) = 0cbdf095c4c55a770d13d443d904bb567fee3666
+SHA1 (patch-ai) = b1d2f5dd9c7b2e337b2f7e1608b521d695b71d72
 SHA1 (patch-al) = f6e0f6b68e078e7a115871bb8cb4ea72bef7eab4
diff --git a/sysutils/gnome-vfs2/patches/patch-aa b/sysutils/gnome-vfs2/patches/patch-aa
new file mode 100644
index 00000000000..5460539aa03
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-aa
@@ -0,0 +1,33 @@
+$NetBSD: patch-aa,v 1.4 2003/09/27 21:10:08 danw Exp $
+
+--- libgnomevfs/gnome-vfs-mime-magic.c.orig	Wed Feb 19 04:31:23 2003
++++ libgnomevfs/gnome-vfs-mime-magic.c	Sat Aug 30 23:14:05 2003
+@@ -29,8 +29,10 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <stdlib.h>
++#ifndef __APPLE__
+ #include <wctype.h>
+ #include <wchar.h>
++#endif
+ 
+ #include <glib/garray.h>
+ #include <glib/gmessages.h>
+@@ -759,6 +761,7 @@
+ 	
+  		if (g_utf8_get_char_validated(end, remaining_bytes) == -2)
+ 			return TRUE;
++#ifndef __APPLE__
+ 		else {
+ 			size_t wlen;
+ 			wchar_t wc;
+@@ -802,6 +805,9 @@
+ 			}
+ 			return TRUE;
+ 		}
++#else
++		return FALSE;
++#endif
+ 	} 
+ }
+ 
diff --git a/sysutils/gnome-vfs2/patches/patch-ai b/sysutils/gnome-vfs2/patches/patch-ai
index 41bed287703..0f8a5f4fb27 100644
--- a/sysutils/gnome-vfs2/patches/patch-ai
+++ b/sysutils/gnome-vfs2/patches/patch-ai
@@ -1,8 +1,17 @@
-$NetBSD: patch-ai,v 1.3 2003/02/15 16:29:32 jmmv Exp $
+$NetBSD: patch-ai,v 1.4 2003/09/27 21:10:08 danw Exp $
 
---- modules/vfolder/Makefile.in.orig	Mon Jan 20 20:46:19 2003
-+++ modules/vfolder/Makefile.in
-@@ -231,7 +231,7 @@ libvfolder_desktop_la_LIBADD = $(top_bui
+--- modules/vfolder/Makefile.in.orig	Mon Mar 31 06:23:06 2003
++++ modules/vfolder/Makefile.in	Sun Aug 31 11:35:23 2003
+@@ -210,7 +210,7 @@
+ 
+ ###  Module setup
+ 
+-module_flags = -export_dynamic -avoid-version
++module_flags = -export_dynamic -avoid-version -module
+ modulesdir = $(libdir)/gnome-vfs-2.0/modules
+ 
+ modules_LTLIBRARIES = libvfolder-desktop.la
+@@ -230,7 +230,7 @@
  
  ###  Default .vfolder-info files
  
-- 
cgit v1.2.3