Fix fbsd; bug #157945

Package-Manager: portage-2.1.2-r9

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 44832aa7f453e1d80f2f7e788df72e82581f330d..549b3c3e417c76f9b8bdf06622c546ec114bc1e0 100644 (file)
--- 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/Manifest b/gnome-base/gnome-vfs/Manifest
index 1805f7fd50f21fd798e40f9b4a6f07c73fc7a9b4..8f50526c0d497ee622dc16fed13a0e1f66bb0a48 100644 (file)
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-vfs-2-CAN-2005-0706.patch 490 RMD160 b0609022ed5ce0b782342ab7f1771ded69b44fbf SHA1 02c00c90e00aaa2d6cc0dbcb095a9f343e6fc3a8 SHA256 aa360ff6aff9ad766b97f96659f3440a7c5fddad80166170b7cf2e43f3bf0964
 MD5 ba8ad5c040af8bd498c9ec71ac1df40e files/gnome-vfs-2-CAN-2005-0706.patch 490
 RMD160 b0609022ed5ce0b782342ab7f1771ded69b44fbf files/gnome-vfs-2-CAN-2005-0706.patch 490
@@ -22,24 +25,28 @@ AUX gnome-vfs-2.16.3-empty-desktop-entry-Path.diff 751 RMD160 6332da63ede8cc9ff1
 MD5 fb50c499ee96f38ffd7c90a4ef1fb4d8 files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff 751
 RMD160 6332da63ede8cc9ff16ac2b64f6cd466d153b2d4 files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff 751
 SHA256 ebf013bb78968ea05802233ffe38a79c144f9693e1f6ee6491f5e41e5bb3877d files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff 751
+AUX gnome-vfs-2.16.3-fbsd.patch 3720 RMD160 128799939e920ca62495b5a4c1983705f68e68d2 SHA1 7b668585c375a5a21915e7d2d2e18e1765122346 SHA256 1b13abce546b66ad9ee51a452eae11ec709155daf21df5645974b3e43aa8d258
+MD5 a1de5f16eaaffd076c5a9dca1edf9066 files/gnome-vfs-2.16.3-fbsd.patch 3720
+RMD160 128799939e920ca62495b5a4c1983705f68e68d2 files/gnome-vfs-2.16.3-fbsd.patch 3720
+SHA256 1b13abce546b66ad9ee51a452eae11ec709155daf21df5645974b3e43aa8d258 files/gnome-vfs-2.16.3-fbsd.patch 3720
 DIST gnome-vfs-2.14.2.tar.bz2 1816194 RMD160 e0a67e3576d72a86c898208a93ad8ee52f72f870 SHA1 ffd2e5f229495f55587d8499e5f2b8b8a76e5448 SHA256 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7
 DIST gnome-vfs-2.16.3.tar.bz2 1900424 RMD160 9600bb4f4630d48600c1469fa5077d8e969a10cc SHA1 a4c97179e2c4abf8cfcf236e56f7d328feaef89b SHA256 657df4d40dd1c8cbc9a266b9f38fea36019ef8a917eafcd3c38c840b8e9c7777
 EBUILD gnome-vfs-2.14.2-r1.ebuild 2036 RMD160 83e8bf96ef2869a3f021ab103a9db77bfe77698c SHA1 30bfc0d8dfb9174c778dbb93a976de99d723d38f SHA256 42e72d37519652fc3e189bc2f514bec7ee432966859ba8498e2652b92a0b6db7
 MD5 345a311458b2341f2c59cb7cb7c6ed01 gnome-vfs-2.14.2-r1.ebuild 2036
 RMD160 83e8bf96ef2869a3f021ab103a9db77bfe77698c gnome-vfs-2.14.2-r1.ebuild 2036
 SHA256 42e72d37519652fc3e189bc2f514bec7ee432966859ba8498e2652b92a0b6db7 gnome-vfs-2.14.2-r1.ebuild 2036
-EBUILD gnome-vfs-2.16.3-r1.ebuild 2604 RMD160 3b4ae3af2b130910c4bffb65468f935fff1b08c3 SHA1 1bd02c53158aad1b98c821ccfc656350602c171d SHA256 836ac524a33c83199e1a0537bff5601d1fea5010f7138e861305abb4bddd12f7
-MD5 8cabe174ee96640275588f763e7baf3b gnome-vfs-2.16.3-r1.ebuild 2604
-RMD160 3b4ae3af2b130910c4bffb65468f935fff1b08c3 gnome-vfs-2.16.3-r1.ebuild 2604
-SHA256 836ac524a33c83199e1a0537bff5601d1fea5010f7138e861305abb4bddd12f7 gnome-vfs-2.16.3-r1.ebuild 2604
+EBUILD gnome-vfs-2.16.3-r1.ebuild 2693 RMD160 3a8fdfd029b7ba8fa9e4d82bb97e8aa5c73463ba SHA1 2b9281663d8236afc82d25f19589174ffc0a4b15 SHA256 e386cdc00e1b96cc4653ba6bd1128a8f862c87a7298dc3c5afa3e1059826ab0e
+MD5 5270d95b27d9f919aa6f7b4cce136b96 gnome-vfs-2.16.3-r1.ebuild 2693
+RMD160 3a8fdfd029b7ba8fa9e4d82bb97e8aa5c73463ba gnome-vfs-2.16.3-r1.ebuild 2693
+SHA256 e386cdc00e1b96cc4653ba6bd1128a8f862c87a7298dc3c5afa3e1059826ab0e gnome-vfs-2.16.3-r1.ebuild 2693
 EBUILD gnome-vfs-2.16.3.ebuild 2461 RMD160 b3dc473770278f2135657d313e1af7e5e5b2577b SHA1 38c24424d5d975bcb0ac74e4137a11be8f461512 SHA256 c9d505a3b946cfca8355035943e1e7c71100284d3ba1f7217ceb067f890fab1a
 MD5 3b1b557f22470020bcfafdec881b632d gnome-vfs-2.16.3.ebuild 2461
 RMD160 b3dc473770278f2135657d313e1af7e5e5b2577b gnome-vfs-2.16.3.ebuild 2461
 SHA256 c9d505a3b946cfca8355035943e1e7c71100284d3ba1f7217ceb067f890fab1a gnome-vfs-2.16.3.ebuild 2461
-MISC ChangeLog 31290 RMD160 71a181d0ca0944b6444d30f22dc6081988efcb9c SHA1 a5a12a5a2d5548f21cef724fa9e3eee37b3ab03c SHA256 881c3740e0d3759e7f05d98fda2a6ff6d5e00810c97077483a06bed49f281d32
-MD5 ee697fbcd53d9cf28cdac292f1b45c42 ChangeLog 31290
-RMD160 71a181d0ca0944b6444d30f22dc6081988efcb9c ChangeLog 31290
-SHA256 881c3740e0d3759e7f05d98fda2a6ff6d5e00810c97077483a06bed49f281d32 ChangeLog 31290
+MISC ChangeLog 31433 RMD160 41c21ad6c2dd7587f9cec4efea3737e3fc5ac8a7 SHA1 eba5b9bf72f9175bd9c55e32de8e95723cd2637d SHA256 5f3a9a6444289ed6784268c8f919170d62df9dc4bd73607db5865f97fa61ae52
+MD5 8f2c86ee6d25343885fce3d6f79951a2 ChangeLog 31433
+RMD160 41c21ad6c2dd7587f9cec4efea3737e3fc5ac8a7 ChangeLog 31433
+SHA256 5f3a9a6444289ed6784268c8f919170d62df9dc4bd73607db5865f97fa61ae52 ChangeLog 31433
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -53,3 +60,10 @@ SHA256 835094a7022fd132b2fe440cf39b51e57961a11c434bd44fc6e9fda283d99e9a files/di
 MD5 28792f7ed0fdae28e12fe6241aab69f2 files/digest-gnome-vfs-2.16.3-r1 256
 RMD160 103fa1e26870938e412081a05cfb05ff0c5a0746 files/digest-gnome-vfs-2.16.3-r1 256
 SHA256 835094a7022fd132b2fe440cf39b51e57961a11c434bd44fc6e9fda283d99e9a files/digest-gnome-vfs-2.16.3-r1 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFFzMoPomPajV0RnrERAoU6AJ4obrSNO386xiz2lUGgXei8HKxxKACcDONo
+dQ4+7LnZMBfUuENyBP2hIr0=
+=/+Rs
+-----END PGP SIGNATURE-----

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 (file)
index 0000000..6bb4cdc
--- /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 bc5cf71e35387dfdca90c2e82a24680ade186c03..106ff215d092c90ea586f493754e931b1f635dc4 100644 (file)
--- 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="."