rename all the remaining global xdg_mime text symbols to avoid conflicts

with gtk2, fixes some crashes with file-roller and bmpx

5 files changed, 62 insertions, 3 deletions

diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index e2a3bd1373b..e26bdf64409 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2006/12/01 21:16:02 rillig Exp $
+# $NetBSD: Makefile,v 1.70 2007/02/09 19:06:54 drochner Exp $
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 PKGCONFIG_OVERRIDE=	gnome-vfs-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gnome-vfs-module-2.0.pc.in
diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index a4812569514..c214ef1aecd 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2007/01/28 15:39:26 rillig Exp $
+$NetBSD: distinfo,v 1.62 2007/02/09 19:06:54 drochner Exp $
 
 SHA1 (gnome-vfs-2.16.3.tar.bz2) = a4c97179e2c4abf8cfcf236e56f7d328feaef89b
 RMD160 (gnome-vfs-2.16.3.tar.bz2) = 9600bb4f4630d48600c1469fa5077d8e969a10cc
@@ -20,3 +20,6 @@ SHA1 (patch-bb) = 0b8d12e9b44547a0262231a09d181f4ccde0c1f3
 SHA1 (patch-bc) = d71be2e22ae3bb87c163a43ae457362a0e77cfe1
 SHA1 (patch-ca) = c8d73a528d4a7260e4d976ba6c426ca92e7593e8
 SHA1 (patch-cb) = ec6b725e33aade30f593bc7f0986c21bcde29057
+SHA1 (patch-cc) = 010674b9e7674cc4b84a57ac680a5769c5cffd29
+SHA1 (patch-cd) = e32c32e4a9834cc3335d5192a1110bfed9c4fd4c
+SHA1 (patch-ce) = 718d7de318e85e58b7412345496263ca559e9a73
diff --git a/sysutils/gnome-vfs2/patches/patch-cc b/sysutils/gnome-vfs2/patches/patch-cc
new file mode 100644
index 00000000000..9b4932c2e52
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-cc,v 1.1 2007/02/09 19:06:54 drochner Exp $
+
+--- libgnomevfs/xdgmimealias.h.orig	2007-02-09 19:26:28.000000000 +0100
++++ libgnomevfs/xdgmimealias.h
+@@ -45,6 +45,7 @@ XdgAliasList *_xdg_mime_alias_list_new  
+ void          _xdg_mime_alias_list_free      (XdgAliasList *list);
+ const char   *_xdg_mime_alias_list_lookup    (XdgAliasList *list,
+ 					      const char  *alias);
++#define _xdg_mime_alias_list_dump _gnomevfs_xdg_mime_alias_list_dump
+ void          _xdg_mime_alias_list_dump      (XdgAliasList *list);
+ 
+ #endif /* __XDG_MIME_ALIAS_H__ */
diff --git a/sysutils/gnome-vfs2/patches/patch-cd b/sysutils/gnome-vfs2/patches/patch-cd
new file mode 100644
index 00000000000..f2208eacf50
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-cd
@@ -0,0 +1,32 @@
+$NetBSD: patch-cd,v 1.1 2007/02/09 19:06:54 drochner Exp $
+
+--- libgnomevfs/xdgmimecache.h.orig	2007-02-09 19:29:40.000000000 +0100
++++ libgnomevfs/xdgmimecache.h
+@@ -44,20 +44,27 @@ XdgMimeCache *_xdg_mime_cache_ref       
+ void          _xdg_mime_cache_unref         (XdgMimeCache *cache);
+ 
+ 
++#define _xdg_mime_cache_get_mime_type_for_data _gnomevfs_xdg_mime_cache_get_mime_type_for_data
+ const char  *_xdg_mime_cache_get_mime_type_for_data       (const void *data,
+ 		 				           size_t      len);
++#define _xdg_mime_cache_get_mime_type_for_file _gnomevfs_xdg_mime_cache_get_mime_type_for_file
+ const char  *_xdg_mime_cache_get_mime_type_for_file       (const char  *file_name,
+ 							   struct stat *statbuf);
++#define _xdg_mime_cache_get_mime_type_from_file_name _gnomevfs_xdg_mime_cache_get_mime_type_from_file_name
+ const char  *_xdg_mime_cache_get_mime_type_from_file_name (const char *file_name);
+ int          _xdg_mime_cache_is_valid_mime_type           (const char *mime_type);
+ int          _xdg_mime_cache_mime_type_equal              (const char *mime_a,
+ 						           const char *mime_b);
+ int          _xdg_mime_cache_media_type_equal             (const char *mime_a,
+ 							   const char *mime_b);
++#define _xdg_mime_cache_mime_type_subclass _gnomevfs_xdg_mime_cache_mime_type_subclass
+ int          _xdg_mime_cache_mime_type_subclass           (const char *mime_a,
+ 							   const char *mime_b);
++#define _xdg_mime_cache_list_mime_parents _gnomevfs_xdg_mime_cache_list_mime_parents
+ char       **_xdg_mime_cache_list_mime_parents		  (const char *mime);
++#define _xdg_mime_cache_unalias_mime_type _gnomevfs_xdg_mime_cache_unalias_mime_type
+ const char  *_xdg_mime_cache_unalias_mime_type            (const char *mime);
++#define _xdg_mime_cache_get_max_buffer_extents _gnomevfs_xdg_mime_cache_get_max_buffer_extents
+ int          _xdg_mime_cache_get_max_buffer_extents       (void);
+ 
+ #endif /* __XDG_MIME_CACHE_H__ */
diff --git a/sysutils/gnome-vfs2/patches/patch-ce b/sysutils/gnome-vfs2/patches/patch-ce
new file mode 100644
index 00000000000..6f5d03d3fe5
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ce
@@ -0,0 +1,12 @@
+$NetBSD: patch-ce,v 1.1 2007/02/09 19:06:54 drochner Exp $
+
+--- libgnomevfs/xdgmimeparent.h.orig	2007-02-09 19:28:49.000000000 +0100
++++ libgnomevfs/xdgmimeparent.h
+@@ -45,6 +45,7 @@ XdgParentList *_xdg_mime_parent_list_new
+ void           _xdg_mime_parent_list_free      (XdgParentList *list);
+ const char   **_xdg_mime_parent_list_lookup    (XdgParentList *list,
+ 						const char    *mime);
++#define _xdg_mime_parent_list_dump _gnomevfs_xdg_mime_parent_list_dump
+ void           _xdg_mime_parent_list_dump      (XdgParentList *list);
+ 
+ #endif /* __XDG_MIME_PARENT_H__ */