Correct a potential symbol conflict between the xdgmime functions in gtk+

and those in gnome-vfs.  This problem would manifest itself by screwing
up MIME types for various files, and causing GTK+ filtered file choosers
not to display contents correctly.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6356 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 55 insertions, 3 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index c37a39786..43f0d7e47 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.139 2006/05/18 01:55:59 ahze Exp $
+#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.140 2006/05/28 16:15:26 pav Exp $
 #
 
 PORTNAME=	gnome-vfs
 PORTVERSION=	2.15.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h
new file mode 100644
index 000000000..69292f2f1
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h
@@ -0,0 +1,25 @@
+--- libgnomevfs/xdgmimecache.h.orig	Mon May 29 20:04:24 2006
++++ libgnomevfs/xdgmimecache.h	Mon May 29 20:11:42 2006
+@@ -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 --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 053f192c5..ecb54999e 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.84 2006/05/12 18:10:19 marcus Exp $
+#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.85 2006/05/17 05:44:15 marcus Exp $
 #
 
 PORTNAME=	gtk
@@ -29,6 +29,8 @@ PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
+PORTREVISION=	1
+
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
new file mode 100644
index 000000000..266d74c22
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
@@ -0,0 +1,25 @@
+--- gtk/xdgmime/xdgmimecache.h.orig	Mon May 29 20:04:24 2006
++++ gtk/xdgmime/xdgmimecache.h	Mon May 29 20:11:42 2006
+@@ -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;