diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-09 05:05:26 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-09 05:05:26 +0800 |
| commit | 136e2ed677edf4da95589ae990c9332880a47214 (patch) | |
| tree | eec71af9e6338e7d637f58252a959bee7e5ef452 /x11-toolkits/gtk20 | |
| parent | 30b9005fb00068b5d4fde65f030c5a0e1e6d9e97 (diff) | |
| download | marcuscom-ports-136e2ed677edf4da95589ae990c9332880a47214.tar marcuscom-ports-136e2ed677edf4da95589ae990c9332880a47214.tar.gz marcuscom-ports-136e2ed677edf4da95589ae990c9332880a47214.tar.bz2 marcuscom-ports-136e2ed677edf4da95589ae990c9332880a47214.tar.lz marcuscom-ports-136e2ed677edf4da95589ae990c9332880a47214.tar.xz marcuscom-ports-136e2ed677edf4da95589ae990c9332880a47214.tar.zst marcuscom-ports-136e2ed677edf4da95589ae990c9332880a47214.zip | |
Merge another xdgmime patch from gnome-vfs to avoid a potential symbol
conflict.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7677 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits/gtk20')
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 6da01d81b..d040b156a 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.99 2006/10/02 22:39:56 ahze Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.100 2006/10/03 23:19:15 marcus Exp $ # PORTNAME= gtk PORTVERSION= 2.10.6 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/v2.10/ \ diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h new file mode 100644 index 000000000..ed81f9280 --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h @@ -0,0 +1,17 @@ +--- gtk/xdgmime/xdgmime.h.orig Sat Oct 7 10:42:32 2006 ++++ gtk/xdgmime/xdgmime.h Sat Oct 7 11:01:57 2006 +@@ -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) |