Fix build with mozilla-devel. All the work for this fix

was done by marcus.

4 files changed, 65 insertions, 13 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index aa31674726f0..bf9cbf850a3d 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -31,7 +31,7 @@ HEADERS_SUFX=
 .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
 MOZILLA=	mozilla-devel
 HEADERS_SUFX=	-devel
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.8a"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.8a2"
 .else
 MOZILLA=	mozilla
 HEADERS_SUFX=
diff --git a/www/epiphany/files/patch-embed_mozilla_EphyBrowser.cpp b/www/epiphany/files/patch-embed_mozilla_EphyBrowser.cpp
index 2dfb07aa6b91..de6c58fa365e 100644
--- a/www/epiphany/files/patch-embed_mozilla_EphyBrowser.cpp
+++ b/www/epiphany/files/patch-embed_mozilla_EphyBrowser.cpp
@@ -1,5 +1,5 @@
---- embed/mozilla/EphyBrowser.cpp.orig	Wed Jul  7 15:41:04 2004
-+++ embed/mozilla/EphyBrowser.cpp	Wed Jul  7 15:47:03 2004
+--- embed/mozilla/EphyBrowser.cpp.orig	Sat May 15 12:20:12 2004
++++ embed/mozilla/EphyBrowser.cpp	Sun Jul 18 19:12:01 2004
 @@ -249,11 +249,13 @@
  	nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface(domWindow));
  	NS_ENSURE_TRUE (piWin, NS_ERROR_FAILURE);
@@ -14,3 +14,30 @@
  
  	return NS_OK;
  }
+@@ -574,7 +576,7 @@
+ 	return NS_OK;
+ }
+ 
+-nsresult EphyBrowser::GetSHUrlAtIndex (PRInt32 index, nsCString &url)
++nsresult EphyBrowser::GetSHUrlAtIndex (PRInt32 index, nsACString &url)
+ {
+ 	NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);
+ 
+@@ -642,7 +644,7 @@
+ 	return NS_OK;
+ }
+ 
+-nsresult EphyBrowser::GetDocumentUrl (nsCString &url)
++nsresult EphyBrowser::GetDocumentUrl (nsACString &url)
+ {
+ 	NS_ENSURE_TRUE (mDOMWindow, NS_ERROR_FAILURE);
+ 
+@@ -668,7 +670,7 @@
+ 	return uri->GetSpec (url);
+ }
+ 
+-nsresult EphyBrowser::GetTargetDocumentUrl (nsCString &url)
++nsresult EphyBrowser::GetTargetDocumentUrl (nsACString &url)
+ {
+ 	NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);
+ 
diff --git a/www/epiphany/files/patch-embed_mozilla_EphyBrowser.h b/www/epiphany/files/patch-embed_mozilla_EphyBrowser.h
new file mode 100644
index 000000000000..9f0b906c3c43
--- /dev/null
+++ b/www/epiphany/files/patch-embed_mozilla_EphyBrowser.h
@@ -0,0 +1,22 @@
+--- embed/mozilla/EphyBrowser.h.orig	Sun Jul 18 19:11:02 2004
++++ embed/mozilla/EphyBrowser.h	Sun Jul 18 19:11:34 2004
+@@ -104,7 +104,7 @@
+ 
+ 	nsresult GetSHInfo (PRInt32 *count, PRInt32 *index);
+ 	nsresult GetSHTitleAtIndex (PRInt32 index, PRUnichar **title);
+-	nsresult GetSHUrlAtIndex (PRInt32 index, nsCString &url);
++	nsresult GetSHUrlAtIndex (PRInt32 index, nsACString &url);
+ 	nsresult GoToHistoryIndex (PRInt16 index);
+ 
+ 	nsresult ForceEncoding (const char *encoding);
+@@ -116,8 +116,8 @@
+ 
+ 	nsresult GetDocument (nsIDOMDocument **aDOMDocument);
+ 	nsresult GetTargetDocument (nsIDOMDocument **aDOMDocument);
+-	nsresult GetDocumentUrl (nsCString &url);
+-	nsresult GetTargetDocumentUrl (nsCString &url);
++	nsresult GetDocumentUrl (nsACString &url);
++	nsresult GetTargetDocumentUrl (nsACString &url);
+ 
+ 	nsresult GetHasModifiedForms (PRBool *modified);
+ 
diff --git a/www/epiphany/files/patch-embed_mozilla_mozilla-embed-single.cpp b/www/epiphany/files/patch-embed_mozilla_mozilla-embed-single.cpp
index 5f7bbebe333f..754504350f0f 100644
--- a/www/epiphany/files/patch-embed_mozilla_mozilla-embed-single.cpp
+++ b/www/epiphany/files/patch-embed_mozilla_mozilla-embed-single.cpp
@@ -1,11 +1,14 @@
---- embed/mozilla/mozilla-embed-single.cpp.orig	Thu Dec 11 14:58:19 2003
-+++ embed/mozilla/mozilla-embed-single.cpp	Thu Dec 11 14:58:27 2003
-@@ -385,7 +385,7 @@
- 		return NS_ERROR_FAILURE;
- 	}
+--- embed/mozilla/mozilla-embed-single.cpp.orig	Sun Jul 18 20:12:02 2004
++++ embed/mozilla/mozilla-embed-single.cpp	Sun Jul 18 20:22:34 2004
+@@ -557,7 +557,11 @@
+                 do_GetService ("@mozilla.org/network/protocol-proxy-service;1");
+ 	if (!pps) return;
  
--#if MOZILLA_SNAPSHOT >= 12
-+#if MOZILLA_SNAPSHOT > 12
- 	result = localeService->GetLocaleComponentForUserAgent (aUILang);
- #else
- 	nsXPIDLString uiLang;
++#if MOZILLA_SNAPSHOT >= 19
++	pps->ConfigureFromPAC (NS_LITERAL_CSTRING (url));
++#else
+ 	pps->ConfigureFromPAC (url);
++#endif
+ }
+ 
+ static GList *