From da0a6cff5de36dd898fa2062245fc97a73a5a675 Mon Sep 17 00:00:00 2001 From: marcus Date: Fri, 24 Jul 2009 19:34:05 +0000 Subject: Correct a symbol conflict between the included crc32() and the version in libz. This fixes a crash in Nautilus. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12502 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/gvfs/Makefile | 3 ++- devel/gvfs/files/patch-metadata_crc32.c | 11 +++++++++++ devel/gvfs/files/patch-metadata_crc32.h | 8 ++++++++ devel/gvfs/files/patch-metadata_metatree.c | 20 ++++++++++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 devel/gvfs/files/patch-metadata_crc32.c create mode 100644 devel/gvfs/files/patch-metadata_crc32.h create mode 100644 devel/gvfs/files/patch-metadata_metatree.c (limited to 'devel/gvfs') diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index 9c15d0be2..33cb271ac 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -3,11 +3,12 @@ # Whom: Michael Johnson # # $FreeBSD$ -# $MCom: ports/devel/gvfs/Makefile,v 1.46 2009/06/29 23:19:26 mezz Exp $ +# $MCom: ports/devel/gvfs/Makefile,v 1.47 2009/07/18 22:15:29 kwm Exp $ # PORTNAME= gvfs PORTVERSION= 1.3.2 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/gvfs/files/patch-metadata_crc32.c b/devel/gvfs/files/patch-metadata_crc32.c new file mode 100644 index 000000000..04db80b04 --- /dev/null +++ b/devel/gvfs/files/patch-metadata_crc32.c @@ -0,0 +1,11 @@ +--- metadata/crc32.c.orig 2009-07-24 15:23:01.000000000 -0400 ++++ metadata/crc32.c 2009-07-24 15:23:36.000000000 -0400 +@@ -82,7 +82,7 @@ static const guint32 crcTable[256] = { + }; + + guint32 +-crc32 (const void *ptr, size_t len) ++metadata_crc32 (const void *ptr, size_t len) + { + guint32 crc = 0xFFFFFFFF; + const guint8 *bp = (const guint8 *) ptr; diff --git a/devel/gvfs/files/patch-metadata_crc32.h b/devel/gvfs/files/patch-metadata_crc32.h new file mode 100644 index 000000000..0e8cf6075 --- /dev/null +++ b/devel/gvfs/files/patch-metadata_crc32.h @@ -0,0 +1,8 @@ +--- metadata/crc32.h.orig 2009-07-24 15:24:08.000000000 -0400 ++++ metadata/crc32.h 2009-07-24 15:23:51.000000000 -0400 +@@ -46,4 +46,4 @@ + + #include + +-guint32 crc32(const void *ptr, size_t len); ++guint32 metadata_crc32(const void *ptr, size_t len); diff --git a/devel/gvfs/files/patch-metadata_metatree.c b/devel/gvfs/files/patch-metadata_metatree.c new file mode 100644 index 000000000..94b47f208 --- /dev/null +++ b/devel/gvfs/files/patch-metadata_metatree.c @@ -0,0 +1,20 @@ +--- metadata/metatree.c.orig 2009-07-24 15:25:43.000000000 -0400 ++++ metadata/metatree.c 2009-07-24 15:24:40.000000000 -0400 +@@ -896,7 +896,7 @@ verify_journal_entry (MetaJournal *journ + if (entry_len != entry_len_end) + return NULL; + +- real_crc32 = crc32 (journal->data + offset + 8, entry_len - 8); ++ real_crc32 = metadata_crc32 (journal->data + offset + 8, entry_len - 8); + if (real_crc32 != GUINT32_FROM_BE (entry->crc32)) + return NULL; + +@@ -1019,7 +1019,7 @@ meta_journal_entry_finish (GString *out) + len = out->len + 4; + append_uint32 (out, len); + set_uint32 (out, 0, len); +- set_uint32 (out, 4, crc32 (out->str + 8, len - 8)); ++ set_uint32 (out, 4, metadata_crc32 (out->str + 8, len - 8)); + return out; + } + -- cgit v1.2.3