diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-05-31 08:20:12 +0800 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-05-31 08:20:12 +0800 |
| commit | c33edafa1558ffbb7cd6d23776fdf706f3102957 (patch) | |
| tree | 6ebc53cb5afc50a5ab16592a8412268d004ab13f /x11-toolkits | |
| parent | 562dc2781f904a552dfa3956f84924745da52a8f (diff) | |
| download | freebsd-ports-gnome-c33edafa1558ffbb7cd6d23776fdf706f3102957.tar.gz freebsd-ports-gnome-c33edafa1558ffbb7cd6d23776fdf706f3102957.tar.zst freebsd-ports-gnome-c33edafa1558ffbb7cd6d23776fdf706f3102957.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.
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h | 25 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h | 25 |
4 files changed, 52 insertions, 2 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index a6149df6f709..f491d0a42292 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.8.18 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \ ftp://ftp.gtk.org/pub/gtk/v2.8/ \ 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 000000000000..266d74c22365 --- /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; diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index a6149df6f709..f491d0a42292 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.8.18 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \ ftp://ftp.gtk.org/pub/gtk/v2.8/ \ diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h new file mode 100644 index 000000000000..266d74c22365 --- /dev/null +++ b/x11-toolkits/gtk30/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; |