diff options
| -rw-r--r-- | www/epiphany/Makefile | 4 | ||||
| -rw-r--r-- | www/epiphany/distinfo | 2 | ||||
| -rw-r--r-- | www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp | 29 | ||||
| -rw-r--r-- | www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp | 30 | ||||
| -rw-r--r-- | www/epiphany/files/patch-embed_mozilla_EventContext.cpp | 40 | ||||
| -rw-r--r-- | www/epiphany/files/patch-embed_mozilla_mozilla-embed-persist.cpp | 18 | ||||
| -rw-r--r-- | www/epiphany/files/patch-src_epiphany.in | 15 |
7 files changed, 6 insertions, 132 deletions
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 5e84672a3ce0..f8ac0e6a50c8 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -6,7 +6,7 @@ # PORTNAME= epiphany -PORTVERSION= 1.0.6 +PORTVERSION= 1.0.7 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 @@ -31,7 +31,7 @@ HEADERS_SUFX= .if ${WITH_MOZILLA}=="mozilla-devel-gtk2" MOZILLA= ${WITH_MOZILLA} HEADERS_SUFX= -devel -MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="trunk" +MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.6b" .else MOZILLA= mozilla-gtk2 HEADERS_SUFX= diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index 62bd9435259a..aa1ed917a348 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1 +1 @@ -MD5 (gnome2/epiphany-1.0.6.tar.bz2) = eeb1c339aaf62d7f85a39c93c706b45d +MD5 (gnome2/epiphany-1.0.7.tar.bz2) = 6f1639d7c7133769ce28eb24358ef55b diff --git a/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp b/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp deleted file mode 100644 index 48f6e973a592..000000000000 --- a/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- embed/mozilla/EphyEventListener.cpp.orig Sat Nov 1 22:39:59 2003 -+++ embed/mozilla/EphyEventListener.cpp Sat Nov 1 22:41:44 2003 -@@ -16,6 +16,10 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ - #include <nsCOMPtr.h> - - #include "EphyEventListener.h" -@@ -80,9 +84,15 @@ - nsCOMPtr<nsIDocument> doc = do_QueryInterface (domDoc); - if(!doc) return NS_ERROR_FAILURE; - -+#if MOZILLA_SNAPSHOT > 11 -+ nsIURI *uri; -+ uri = doc->GetDocumentURL (); -+ if (uri == NULL) return NS_ERROR_FAILURE; -+#else - nsCOMPtr<nsIURI> uri; - result = doc->GetDocumentURL(getter_AddRefs(uri)); - if (NS_FAILED (result)) return NS_ERROR_FAILURE; -+#endif - - const nsACString &link = NS_ConvertUCS2toUTF8(value); - nsCAutoString favicon_url; diff --git a/www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp b/www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp deleted file mode 100644 index f3575e0abe48..000000000000 --- a/www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp +++ /dev/null @@ -1,30 +0,0 @@ ---- embed/mozilla/EphyWrapper.cpp.orig Sat Nov 1 22:42:25 2003 -+++ embed/mozilla/EphyWrapper.cpp Sat Nov 1 22:53:59 2003 -@@ -582,8 +582,13 @@ - nsCOMPtr<nsIDocument> doc = do_QueryInterface(DOMDocument); - if(!doc) return NS_ERROR_FAILURE; - -+#if MOZILLA_SNAPSHOT > 11 -+ nsIURI *uri; -+ uri = doc->GetDocumentURL (); -+#else - nsCOMPtr<nsIURI> uri; - doc->GetDocumentURL(getter_AddRefs(uri)); -+#endif - - return uri->GetSpec (url); - } -@@ -600,8 +605,13 @@ - nsCOMPtr<nsIDocument> doc = do_QueryInterface(DOMDocument); - if(!doc) return NS_ERROR_FAILURE; - -+#if MOZILLA_SNAPSHOT > 11 -+ nsIURI *uri; -+ uri = doc->GetDocumentURL (); -+#else - nsCOMPtr<nsIURI> uri; - doc->GetDocumentURL(getter_AddRefs(uri)); -+#endif - - uri->GetSpec (url); - diff --git a/www/epiphany/files/patch-embed_mozilla_EventContext.cpp b/www/epiphany/files/patch-embed_mozilla_EventContext.cpp deleted file mode 100644 index 504b977cc4cf..000000000000 --- a/www/epiphany/files/patch-embed_mozilla_EventContext.cpp +++ /dev/null @@ -1,40 +0,0 @@ ---- embed/mozilla/EventContext.cpp.orig Sat Nov 1 22:42:40 2003 -+++ embed/mozilla/EventContext.cpp Sat Nov 1 22:57:20 2003 -@@ -139,13 +139,19 @@ - nsresult EventContext::ResolveBaseURL (nsIDocument *doc, const nsAString &relurl, nsACString &url) - { - nsresult rv; -+#if MOZILLA_SNAPSHOT > 11 -+ nsIURI *base; -+ base = doc->GetBaseURL (); -+ if (base == NULL) return NS_ERROR_FAILURE; -+#elif MOZILLA_SNAPSHOT > 9 - nsCOMPtr<nsIURI> base; --#if MOZILLA_SNAPSHOT > 9 - rv = doc->GetBaseURL (getter_AddRefs(base)); -+ if (NS_FAILED(rv)) return rv; - #else -+ nsCOMPtr<nsIURI> base; - rv = doc->GetBaseURL (*getter_AddRefs(base)); --#endif - if (NS_FAILED(rv)) return rv; -+#endif - - return base->Resolve (NS_ConvertUCS2toUTF8(relurl), url); - } -@@ -153,9 +159,15 @@ - nsresult EventContext::ResolveDocumentURL (nsIDocument *doc, const nsAString &relurl, nsACString &url) - { - nsresult rv; -+#if MOZILLA_SNAPSHOT > 11 -+ nsIURI *uri; -+ uri = doc->GetDocumentURL (); -+ if (uri == NULL) return NS_ERROR_FAILURE; -+#else - nsCOMPtr<nsIURI> uri; - rv = doc->GetDocumentURL(getter_AddRefs(uri)); - if (NS_FAILED(rv)) return rv; -+#endif - - return uri->Resolve (NS_ConvertUCS2toUTF8(relurl), url); - } diff --git a/www/epiphany/files/patch-embed_mozilla_mozilla-embed-persist.cpp b/www/epiphany/files/patch-embed_mozilla_mozilla-embed-persist.cpp deleted file mode 100644 index 0980c3c25d00..000000000000 --- a/www/epiphany/files/patch-embed_mozilla_mozilla-embed-persist.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- embed/mozilla/mozilla-embed-persist.cpp.orig Sat Nov 1 23:12:09 2003 -+++ embed/mozilla/mozilla-embed-persist.cpp Sun Nov 2 00:03:17 2003 -@@ -254,9 +254,15 @@ - do_QueryInterface (DOMDocument, &rv); - if (NS_FAILED(rv) || !document) return G_FAILED; - -+#if MOZILLA_SNAPSHOT > 11 -+ nsIURI *uri; -+ uri = document->GetDocumentURL (); -+ if (uri == NULL) return G_FAILED; -+#else - nsCOMPtr<nsIURI> uri; - rv = document->GetDocumentURL (getter_AddRefs(uri)); - if (NS_FAILED(rv) || !uri) return G_FAILED; -+#endif - - aProgress->InitForPersist (bpersist, parent, - uri, file, diff --git a/www/epiphany/files/patch-src_epiphany.in b/www/epiphany/files/patch-src_epiphany.in index 8a060f95b509..a5ded3caaecf 100644 --- a/www/epiphany/files/patch-src_epiphany.in +++ b/www/epiphany/files/patch-src_epiphany.in @@ -1,15 +1,6 @@ ---- src/epiphany.in.orig Sat May 3 21:56:42 2003 -+++ src/epiphany.in Sat May 3 21:59:12 2003 -@@ -4,7 +4,7 @@ - - if test -n "$MOZILLA_FIVE_HOME"; then - MOZILLA_HOME=$MOZILLA_FIVE_HOME --elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then -+elif [ -f @MOZILLA_HOME@/libgtkembedmoz.so ]; then - MOZILLA_HOME=@MOZILLA_HOME@ - else - echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory" -@@ -17,4 +17,12 @@ +--- src/epiphany.in.orig Sat Dec 20 14:35:41 2003 ++++ src/epiphany.in Fri Jan 16 18:47:43 2004 +@@ -15,4 +15,12 @@ MOZILLA_FIVE_HOME=$MOZILLA_HOME export MOZILLA_FIVE_HOME |