diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-04 03:36:59 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-04 03:36:59 +0800 |
| commit | 99ed79050f8ff3a8412d12fc664d1f455c0840a2 (patch) | |
| tree | 601e169639dab07145452b48f8063083e3772360 /devel/gnomevfs2 | |
| parent | da4470caad9ac5dab04c940e071a231f7a790a81 (diff) | |
| download | marcuscom-ports-99ed79050f8ff3a8412d12fc664d1f455c0840a2.tar marcuscom-ports-99ed79050f8ff3a8412d12fc664d1f455c0840a2.tar.gz marcuscom-ports-99ed79050f8ff3a8412d12fc664d1f455c0840a2.tar.bz2 marcuscom-ports-99ed79050f8ff3a8412d12fc664d1f455c0840a2.tar.lz marcuscom-ports-99ed79050f8ff3a8412d12fc664d1f455c0840a2.tar.xz marcuscom-ports-99ed79050f8ff3a8412d12fc664d1f455c0840a2.tar.zst marcuscom-ports-99ed79050f8ff3a8412d12fc664d1f455c0840a2.zip | |
Update to 2.11.3.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4154 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gnomevfs2')
| -rw-r--r-- | devel/gnomevfs2/Makefile | 7 | ||||
| -rw-r--r-- | devel/gnomevfs2/distinfo | 4 | ||||
| -rw-r--r-- | devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c | 38 | ||||
| -rw-r--r-- | devel/gnomevfs2/pkg-plist | 2 |
4 files changed, 7 insertions, 44 deletions
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index df24495b0..a25e5dc8c 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -3,11 +3,11 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gnomevfs2/Makefile,v 1.97 2005/06/28 05:40:01 adamw Exp $ +# $MCom: ports/devel/gnomevfs2/Makefile,v 1.98 2005/07/01 18:00:50 marcus Exp $ # PORTNAME= gnomevfs2 -PORTVERSION= 2.11.2 +PORTVERSION= 2.11.3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.11 @@ -38,7 +38,8 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall GCONF_SCHEMAS= desktop_default_applications.schemas \ desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ - system_http_proxy.schemas system_smb.schemas + system_http_proxy.schemas system_smb.schemas \ + system_storage.schemas .include <bsd.port.pre.mk> diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index eec217b8c..f7540d5c3 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.11.2.tar.bz2) = ebb4584249301ea2b33bf015577832ee -SIZE (gnome2/gnome-vfs-2.11.2.tar.bz2) = 1932652 +MD5 (gnome2/gnome-vfs-2.11.3.tar.bz2) = 821407dab314c0a0fab9f84fe095148a +SIZE (gnome2/gnome-vfs-2.11.3.tar.bz2) = 1875673 diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c deleted file mode 100644 index 698150125..000000000 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c +++ /dev/null @@ -1,38 +0,0 @@ ---- libgnomevfs/gnome-vfs-mime.c.orig Sat Mar 19 18:59:45 2005 -+++ libgnomevfs/gnome-vfs-mime.c Sat Mar 19 19:02:24 2005 -@@ -167,7 +167,9 @@ - GnomeVFSResult result = GNOME_VFS_OK; - const char *mime_type; - -+ G_LOCK (mime_mutex); - max_extents = xdg_mime_get_max_buffer_extents (); -+ G_UNLOCK (mime_mutex); - max_extents = CLAMP (max_extents, 0, MAX_SNIFF_BUFFER_ALLOWED); - - if (!buffer->read_whole_file) { -@@ -592,7 +594,9 @@ - g_return_val_if_fail (a != NULL, FALSE); - g_return_val_if_fail (b != NULL, FALSE); - -+ G_LOCK (mime_mutex); - xdg_mime_mime_type_equal (a, b); -+ G_UNLOCK (mime_mutex); - - return FALSE; - } -@@ -626,8 +630,13 @@ - - if (gnome_vfs_mime_type_is_equal (mime_type, base_mime_type)) { - return GNOME_VFS_MIME_IDENTICAL; -- } else if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) { -- return GNOME_VFS_MIME_PARENT; -+ } else { -+ G_LOCK (mime_mutex); -+ if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) { -+ G_UNLOCK (mime_mutex); -+ return GNOME_VFS_MIME_PARENT; -+ } -+ G_UNLOCK (mime_mutex); - } - - return GNOME_VFS_MIME_UNRELATED; diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index f1fcd3d06..f608cc8fa 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -74,7 +74,7 @@ lib/gnome-vfs-2.0/modules/libtar.so lib/gnome-vfs-2.0/modules/libvfs-test.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.1101 +lib/libgnomevfs-2.so.1100 libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc |