Fix fbsd; bug #157945

(Portage version: 2.1.2-r9)

3 files changed, 66 insertions, 2 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 44832aa7f453..549b3c3e417c 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.242 2007/01/22 20:53:43 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.243 2007/02/09 19:22:51 dang Exp $
+
+  09 Feb 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gnome-vfs-2.16.3-fbsd.patch, gnome-vfs-2.16.3-r1.ebuild:
+  Fix fbsd; bug #157945
 
 *gnome-vfs-2.16.3-r1 (22 Jan 2007)
 
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-fbsd.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-fbsd.patch
new file mode 100644
index 000000000000..6bb4cdc3a189
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-fbsd.patch
@@ -0,0 +1,57 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-vfs-2.16.3.orig/libgnomevfs/xdgmime.h gnome-vfs-2.16.3/libgnomevfs/xdgmime.h
+--- gnome-vfs-2.16.3.orig/libgnomevfs/xdgmime.h	2006-09-13 05:13:31.000000000 -0400
++++ gnome-vfs-2.16.3/libgnomevfs/xdgmime.h	2007-02-09 13:04:25.000000000 -0500
+@@ -52,11 +52,14 @@ typedef void (*XdgMimeDestroy)  (void *u
+ #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name)
+ #define xdg_mime_is_valid_mime_type           XDG_ENTRY(is_valid_mime_type)
+ #define xdg_mime_mime_type_equal              XDG_ENTRY(mime_type_equal)
++#define _xdg_mime_mime_type_equal             XDG_ENTRY(mime_type_equal_p)
+ #define xdg_mime_media_type_equal             XDG_ENTRY(media_type_equal)
+ #define xdg_mime_mime_type_subclass           XDG_ENTRY(mime_type_subclass)
++#define _xdg_mime_mime_type_subclass          XDG_ENTRY(mime_type_subclass_p)
+ #define xdg_mime_get_mime_parents             XDG_ENTRY(get_mime_parents)
+ #define xdg_mime_list_mime_parents            XDG_ENTRY(list_mime_parents)
+ #define xdg_mime_unalias_mime_type            XDG_ENTRY(unalias_mime_type)
++#define _xdg_mime_unalias_mime_type           XDG_ENTRY(unalias_mime_type_p)
+ #define xdg_mime_get_max_buffer_extents       XDG_ENTRY(get_max_buffer_extents)
+ #define xdg_mime_shutdown                     XDG_ENTRY(shutdown)
+ #define xdg_mime_dump                         XDG_ENTRY(dump)
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-vfs-2.16.3.orig/libgnomevfs/xdgmimecache.h gnome-vfs-2.16.3/libgnomevfs/xdgmimecache.h
+--- gnome-vfs-2.16.3.orig/libgnomevfs/xdgmimecache.h	2006-01-11 06:47:29.000000000 -0500
++++ gnome-vfs-2.16.3/libgnomevfs/xdgmimecache.h	2007-02-09 13:04:25.000000000 -0500
+@@ -32,9 +32,19 @@
+ typedef struct _XdgMimeCache XdgMimeCache;
+ 
+ #ifdef XDG_PREFIX
+-#define _xdg_mime_cache_new_from_file        XDG_ENTRY(cache_new_from_file)
+-#define _xdg_mime_cache_ref                  XDG_ENTRY(cache_ref)
+-#define _xdg_mime_cache_unref                XDG_ENTRY(cache_unref)
++#define _xdg_mime_cache_new_from_file                XDG_ENTRY(cache_new_from_file)
++#define _xdg_mime_cache_ref                          XDG_ENTRY(cache_ref)
++#define _xdg_mime_cache_unref                        XDG_ENTRY(cache_unref)
++#define _xdg_mime_cache_get_mime_type_for_data       XDG_ENTRY(cache_get_mime_type_for_data)
++#define _xdg_mime_cache_get_mime_type_for_file       XDG_ENTRY(cache_get_mime_type_for_file)
++#define _xdg_mime_cache_get_mime_type_from_file_name XDG_ENTRY(cache_get_mime_type_from_file_name)
++#define _xdg_mime_cache_is_valid_mime_type           XDG_ENTRY(cache_is_valid_mime_type)
++#define _xdg_mime_cache_mime_type_equal              XDG_ENTRY(cache_mime_type_equal)
++#define _xdg_mime_cache_media_type_equal             XDG_ENTRY(cache_media_type_equal)
++#define _xdg_mime_cache_mime_type_subclass           XDG_ENTRY(cache_mime_type_subclass)
++#define _xdg_mime_cache_list_mime_parents            XDG_ENTRY(cache_list_mime_parents)
++#define _xdg_mime_cache_unalias_mime_type            XDG_ENTRY(cache_unalias_mime_type)
++#define _xdg_mime_cache_get_max_buffer_extents       XDG_ENTRY(cache_get_max_buffer_extents)
+ #endif
+ 
+ extern XdgMimeCache **_caches;
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-vfs-2.16.3.orig/modules/file-method.c gnome-vfs-2.16.3/modules/file-method.c
+--- gnome-vfs-2.16.3.orig/modules/file-method.c	2006-10-17 05:50:30.000000000 -0400
++++ gnome-vfs-2.16.3/modules/file-method.c	2007-02-09 13:04:19.000000000 -0500
+@@ -75,6 +75,9 @@
+ #if HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #elif HAVE_SYS_MOUNT_H
++#if HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
+ #include <sys/mount.h>
+ #endif
+ 
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.16.3-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.16.3-r1.ebuild
index bc5cf71e3538..106ff215d092 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.16.3-r1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.16.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.16.3-r1.ebuild,v 1.1 2007/01/22 20:53:43 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.16.3-r1.ebuild,v 1.2 2007/02/09 19:22:51 dang Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=1.9
@@ -88,6 +88,9 @@ src_unpack() {
 	# Fix gnome_vfs_url_show_with_env with 'Path=' in .desktop (bug 161089)
 	epatch "${FILESDIR}"/${P}-empty-desktop-entry-Path.diff
 
+	# Fix compile and crashes on fbsd.  bug #157945
+	epatch "${FILESDIR}"/${P}-fbsd.patch
+
 	# For gtk-doc macro failure when it's not installed
 	cp aclocal.m4 old_macros.m4
 	AT_M4DIR="."