Fix a problem with soup causing Evolution to segfault when trying to get

RDF newsfeeds.  This is an attempt to solve both this crash as well as
get it building on 64-bot architectures.

6 files changed, 48 insertions, 12 deletions

diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 4154af8c6a4e..54e362c17805 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	soup
 PORTVERSION=	0.7.4
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/soup/0.7
diff --git a/devel/libsoup/files/patch-src_libsoup_soup-message.c b/devel/libsoup/files/patch-src_libsoup_soup-message.c
index 2b528277e688..b83d406260a6 100644
--- a/devel/libsoup/files/patch-src_libsoup_soup-message.c
+++ b/devel/libsoup/files/patch-src_libsoup_soup-message.c
@@ -1,11 +1,22 @@
---- src/libsoup/soup-message.c.orig	Sun Sep 29 23:50:30 2002
-+++ src/libsoup/soup-message.c	Sun Sep 29 23:59:10 2002
-@@ -922,7 +922,7 @@
+--- src/libsoup/soup-message.c.orig	Wed Apr 10 12:33:17 2002
++++ src/libsoup/soup-message.c	Tue Nov 12 02:52:40 2002
+@@ -907,7 +907,7 @@
+ 
+ 	SoupHandlerKind   kind;
+ 	union {
+-		guint             errorcode;
++		unsigned long             errorcode;
+ 		SoupErrorClass    errorclass;
+ 		const gchar      *header;
+ 	} data;
+@@ -922,8 +922,9 @@
  		redirect_handler, 
  		NULL, 
  		RESPONSE_HEADER_HANDLER, 
 -		{ (guint) "Location" }
-+		{ (guint) 0 }
++		{ (unsigned long) "Location" }
  	},
++
  	/* 
  	 * Handle authorization.
+ 	 */
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index 4154af8c6a4e..54e362c17805 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	soup
 PORTVERSION=	0.7.4
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/soup/0.7
diff --git a/devel/libsoup22/files/patch-src_libsoup_soup-message.c b/devel/libsoup22/files/patch-src_libsoup_soup-message.c
index 2b528277e688..b83d406260a6 100644
--- a/devel/libsoup22/files/patch-src_libsoup_soup-message.c
+++ b/devel/libsoup22/files/patch-src_libsoup_soup-message.c
@@ -1,11 +1,22 @@
---- src/libsoup/soup-message.c.orig	Sun Sep 29 23:50:30 2002
-+++ src/libsoup/soup-message.c	Sun Sep 29 23:59:10 2002
-@@ -922,7 +922,7 @@
+--- src/libsoup/soup-message.c.orig	Wed Apr 10 12:33:17 2002
++++ src/libsoup/soup-message.c	Tue Nov 12 02:52:40 2002
+@@ -907,7 +907,7 @@
+ 
+ 	SoupHandlerKind   kind;
+ 	union {
+-		guint             errorcode;
++		unsigned long             errorcode;
+ 		SoupErrorClass    errorclass;
+ 		const gchar      *header;
+ 	} data;
+@@ -922,8 +922,9 @@
  		redirect_handler, 
  		NULL, 
  		RESPONSE_HEADER_HANDLER, 
 -		{ (guint) "Location" }
-+		{ (guint) 0 }
++		{ (unsigned long) "Location" }
  	},
++
  	/* 
  	 * Handle authorization.
+ 	 */
diff --git a/devel/soup/Makefile b/devel/soup/Makefile
index 4154af8c6a4e..54e362c17805 100644
--- a/devel/soup/Makefile
+++ b/devel/soup/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	soup
 PORTVERSION=	0.7.4
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/soup/0.7
diff --git a/devel/soup/files/patch-src_libsoup_soup-message.c b/devel/soup/files/patch-src_libsoup_soup-message.c
index 2b528277e688..b83d406260a6 100644
--- a/devel/soup/files/patch-src_libsoup_soup-message.c
+++ b/devel/soup/files/patch-src_libsoup_soup-message.c
@@ -1,11 +1,22 @@
---- src/libsoup/soup-message.c.orig	Sun Sep 29 23:50:30 2002
-+++ src/libsoup/soup-message.c	Sun Sep 29 23:59:10 2002
-@@ -922,7 +922,7 @@
+--- src/libsoup/soup-message.c.orig	Wed Apr 10 12:33:17 2002
++++ src/libsoup/soup-message.c	Tue Nov 12 02:52:40 2002
+@@ -907,7 +907,7 @@
+ 
+ 	SoupHandlerKind   kind;
+ 	union {
+-		guint             errorcode;
++		unsigned long             errorcode;
+ 		SoupErrorClass    errorclass;
+ 		const gchar      *header;
+ 	} data;
+@@ -922,8 +922,9 @@
  		redirect_handler, 
  		NULL, 
  		RESPONSE_HEADER_HANDLER, 
 -		{ (guint) "Location" }
-+		{ (guint) 0 }
++		{ (unsigned long) "Location" }
  	},
++
  	/* 
  	 * Handle authorization.
+ 	 */