From aded1d88c143c9796a799ff38f2a17280d2a3eba Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 7 Oct 2006 15:04:44 +0000 Subject: Update to 2.16.1, and attempt to fix the symbol conflict therein. All future gnome-vfs MIME crashes should be reported to me before Bugzilla. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7607 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/gnome-vfs/Makefile | 4 ++-- devel/gnome-vfs/distinfo | 6 +++--- devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index b7b64be2e..d8357eecf 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -3,11 +3,11 @@ # Whom: Ade Lovett # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/Makefile,v 1.158 2006/10/02 22:44:52 ahze Exp $ +# $MCom: ports/devel/gnome-vfs/Makefile,v 1.159 2006/10/04 11:57:19 ahze Exp $ # PORTNAME= gnome-vfs -PORTVERSION= 2.16.0 +PORTVERSION= 2.16.1 PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 97a6dd411..6552ad871 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-vfs-2.16.0.tar.bz2) = fdea9d7be42320c3fa6a09e645613480 -SHA256 (gnome2/gnome-vfs-2.16.0.tar.bz2) = d1854eed8ef93ac2f111d56367106159153bb5857793a880b13271bb5fb34361 -SIZE (gnome2/gnome-vfs-2.16.0.tar.bz2) = 1890562 +MD5 (gnome2/gnome-vfs-2.16.1.tar.bz2) = 2d9f7b01496ecc227015bc7a08fb798f +SHA256 (gnome2/gnome-vfs-2.16.1.tar.bz2) = 8e6aaa1fb1fcf682484b27bbdf4335234752868ef3bc84ea1102a6ebf0d89067 +SIZE (gnome2/gnome-vfs-2.16.1.tar.bz2) = 1893290 diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h new file mode 100644 index 000000000..218578c25 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h @@ -0,0 +1,17 @@ +--- libgnomevfs/xdgmime.h.orig Sat Oct 7 10:42:32 2006 ++++ libgnomevfs/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) -- cgit v1.2.3