diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-05-31 12:30:41 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-05-31 12:30:41 +0800 |
| commit | 377a9ef3d5a76cd4b8a240759044bc64529f7e70 (patch) | |
| tree | b5523d37dcb53ee502cfa9598202adf608e1f7a6 /devel | |
| parent | 627331f8e0aa329ba095dac23227818a745df5d4 (diff) | |
| download | marcuscom-ports-377a9ef3d5a76cd4b8a240759044bc64529f7e70.tar marcuscom-ports-377a9ef3d5a76cd4b8a240759044bc64529f7e70.tar.gz marcuscom-ports-377a9ef3d5a76cd4b8a240759044bc64529f7e70.tar.bz2 marcuscom-ports-377a9ef3d5a76cd4b8a240759044bc64529f7e70.tar.lz marcuscom-ports-377a9ef3d5a76cd4b8a240759044bc64529f7e70.tar.xz marcuscom-ports-377a9ef3d5a76cd4b8a240759044bc64529f7e70.tar.zst marcuscom-ports-377a9ef3d5a76cd4b8a240759044bc64529f7e70.zip | |
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
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gnome-vfs/Makefile | 4 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h | 25 |
2 files changed, 27 insertions, 2 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; |