diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-11-14 09:05:38 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-11-14 09:05:38 +0800 |
commit | 322ffcd52972452de36112dd3fa44bf107fd25e8 (patch) | |
tree | 0626c87149b57aba44a65e5160c9d2c8b94a331b /www/epiphany/files | |
parent | bcd1808193a8a889c2442b8347c5405ac0d979b4 (diff) | |
download | marcuscom-ports-322ffcd52972452de36112dd3fa44bf107fd25e8.tar marcuscom-ports-322ffcd52972452de36112dd3fa44bf107fd25e8.tar.gz marcuscom-ports-322ffcd52972452de36112dd3fa44bf107fd25e8.tar.bz2 marcuscom-ports-322ffcd52972452de36112dd3fa44bf107fd25e8.tar.lz marcuscom-ports-322ffcd52972452de36112dd3fa44bf107fd25e8.tar.xz marcuscom-ports-322ffcd52972452de36112dd3fa44bf107fd25e8.tar.zst marcuscom-ports-322ffcd52972452de36112dd3fa44bf107fd25e8.zip |
Add epiphany and update to 1.1.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1320 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/epiphany/files')
-rw-r--r-- | www/epiphany/files/patch-configure | 10 | ||||
-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-src_epiphany.in | 25 |
5 files changed, 134 insertions, 0 deletions
diff --git a/www/epiphany/files/patch-configure b/www/epiphany/files/patch-configure new file mode 100644 index 000000000..0f5ae010c --- /dev/null +++ b/www/epiphany/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig Tue Jul 15 14:31:11 2003 ++++ configure Tue Jul 15 14:31:11 2003 +@@ -18205,6 +18205,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp b/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp new file mode 100644 index 000000000..48f6e973a --- /dev/null +++ b/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp @@ -0,0 +1,29 @@ +--- 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 new file mode 100644 index 000000000..f3575e0ab --- /dev/null +++ b/www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp @@ -0,0 +1,30 @@ +--- 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 new file mode 100644 index 000000000..f40825763 --- /dev/null +++ b/www/epiphany/files/patch-embed_mozilla_EventContext.cpp @@ -0,0 +1,40 @@ +--- embed/mozilla/EventContext.cpp.orig Thu Oct 16 19:08:54 2003 ++++ embed/mozilla/EventContext.cpp Thu Nov 13 19:05:29 2003 +@@ -145,13 +145,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); + } +@@ -159,9 +165,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-src_epiphany.in b/www/epiphany/files/patch-src_epiphany.in new file mode 100644 index 000000000..8a060f95b --- /dev/null +++ b/www/epiphany/files/patch-src_epiphany.in @@ -0,0 +1,25 @@ +--- 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 @@ + MOZILLA_FIVE_HOME=$MOZILLA_HOME + export MOZILLA_FIVE_HOME + +-exec "$dist_bin/epiphany-bin" "$@" ++MOZ_PLUGIN_PATH=%%X11BASE%%/lib/browser_plugins ++export MOZ_PLUGIN_PATH ++ ++if [ -f %%FLASHPLAYER%% ]; then ++ LD_PRELOAD=%%FLASHPLAYER%% ++ export LD_PRELOAD ++fi ++ ++exec "%%PREFIX%%/bin/epiphany-bin" "$@" |