Update for Mozilla 1.4b.

5 files changed, 57 insertions, 3 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index f3a73020bb78..bf2458bd7f31 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -31,7 +31,7 @@ HEADERS_SUFX=
 .if ${WITH_MOZILLA}=="mozilla-devel-gtk2"
 MOZILLA=	${WITH_MOZILLA}
 HEADERS_SUFX=	-devel
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.4a"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="trunk"
 .else
 MOZILLA=	mozilla-gtk2
 HEADERS_SUFX=
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 998cb98c8dec..85d7284b1e83 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -33,7 +33,7 @@ MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.0"
 .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-embedded-devel"
 MOZILLA=	${WITH_MOZILLA}
 HEADERS_SUFX=	-devel
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.4a"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="trunk"
 .else
 .if ${WITH_MOZILLA}=="mozilla-embedded"
 MOZILLA=	mozilla-embedded
diff --git a/www/galeon/files/patch-src_mozilla_GaleonWrapper.cpp b/www/galeon/files/patch-src_mozilla_GaleonWrapper.cpp
new file mode 100644
index 000000000000..e086452a71f0
--- /dev/null
+++ b/www/galeon/files/patch-src_mozilla_GaleonWrapper.cpp
@@ -0,0 +1,26 @@
+--- src/mozilla/GaleonWrapper.cpp.orig	Fri Apr 11 17:57:19 2003
++++ src/mozilla/GaleonWrapper.cpp	Fri May 16 17:52:46 2003
+@@ -70,7 +70,11 @@
+ #include "nsIDocumentObserver.h"
+ #include "nsCWebBrowser.h"
+ #include "nsReadableUtils.h"
++#if MOZILLA_SNAPSHOT > 7
++#include "nsIDOMNSDocument.h"
++#else
+ #include "nsIDOMNSHTMLDocument.h"
++#endif
+ #include "nsIDOMHTMLDocument.h"
+ #include "nsIDOMHTMLCollection.h"
+ #include "nsIDOMHTMLElement.h"
+@@ -1290,7 +1294,11 @@
+ 	result = GetDOMDocument (getter_AddRefs(aDOMDocument));
+ 	if (NS_FAILED(result) || !aDOMDocument) return NS_ERROR_FAILURE;
+ 
++#if MOZILLA_SNAPSHOT > 7
++	nsCOMPtr<nsIDOMNSDocument> doc = do_QueryInterface(aDOMDocument);
++#else
+ 	nsCOMPtr<nsIDOMNSHTMLDocument> doc = do_QueryInterface(aDOMDocument);
++#endif
+ 	if(!doc) return NS_ERROR_FAILURE;
+ 
+ 	nsAutoString value;
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 6cd3a88857d8..ca1b992d978f 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -31,7 +31,7 @@ HEADERS_SUFX=
 .if ${WITH_MOZILLA}=="mozilla-devel-gtk2"
 MOZILLA=	${WITH_MOZILLA}
 HEADERS_SUFX=	-devel
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.4a"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="trunk"
 .else
 MOZILLA=	mozilla-gtk2
 HEADERS_SUFX=
diff --git a/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp b/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp
new file mode 100644
index 000000000000..dca228aec48f
--- /dev/null
+++ b/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp
@@ -0,0 +1,28 @@
+--- mozilla/GaleonWrapper.cpp.orig	Fri May 16 17:21:37 2003
++++ mozilla/GaleonWrapper.cpp	Fri May 16 17:23:41 2003
+@@ -70,7 +70,11 @@
+ #include "nsCWebBrowser.h"
+ #include "nsReadableUtils.h"
+ #include "nsUnicharUtils.h"
++#if MOZILLA_SNAPSHOT > 7
++#include "nsIDOMNSDocument.h"
++#else
+ #include "nsIDOMNSHTMLDocument.h"
++#endif
+ #include "nsIDOMHTMLDocument.h"
+ #include "nsIDOMHTMLCollection.h"
+ #include "nsIDOMHTMLElement.h"
+@@ -1106,8 +1110,13 @@
+ 	result = GetDOMDocument (getter_AddRefs(DOMDocument));
+ 	if (NS_FAILED(result) || !DOMDocument) return NS_ERROR_FAILURE;
+ 
++#if MOZILLA_SNAPSHOT > 7
++	nsCOMPtr<nsIDOMNSDocument> doc = do_QueryInterface(DOMDocument);
++	if (!doc) return NS_ERROR_FAILURE;
++#else
+ 	nsCOMPtr<nsIDOMNSHTMLDocument> doc = do_QueryInterface(DOMDocument);
+ 	if(!doc) return NS_ERROR_FAILURE;
++#endif
+ 
+ 	nsAutoString value;
+ 	doc->GetLastModified(value);