diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-02-13 22:04:30 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-02-13 22:04:30 +0000 |
commit | 3524f206fff55116eb9918f44a1d7d629198a592 (patch) | |
tree | 7207493b924d7546e8e15466fdb1b024a76f4db7 /www/galeon2 | |
parent | Fix calendar build. (diff) |
Fix build with mozilla-devel-gtk2.
Notes
Notes:
svn path=/head/; revision=75480
Diffstat (limited to 'www/galeon2')
6 files changed, 194 insertions, 5 deletions
diff --git a/www/galeon2/files/patch-mozilla_BaseHelpProtocolHandler.cpp b/www/galeon2/files/patch-mozilla_BaseHelpProtocolHandler.cpp new file mode 100644 index 000000000000..d95b514b9019 --- /dev/null +++ b/www/galeon2/files/patch-mozilla_BaseHelpProtocolHandler.cpp @@ -0,0 +1,41 @@ +--- mozilla/BaseHelpProtocolHandler.cpp.orig Thu Feb 13 16:08:39 2003 ++++ mozilla/BaseHelpProtocolHandler.cpp Thu Feb 13 16:13:24 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 "outputbuffer.h" + + #ifdef NOT_PORTED +@@ -194,17 +198,23 @@ + + /* finish the rendering */ + nsCOMPtr<nsIInputStream> iStream; +- PRUint32 size; +- +- rv = sStream->GetLength(&size); +- if (NS_FAILED(rv)) return rv; + + rv = sStream->NewInputStream(0, getter_AddRefs(iStream)); + if (NS_FAILED(rv)) return rv; + ++#if MOZILLA_SNAPSHOT > 3 ++ rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), mURI, ++ iStream, NS_LITERAL_CSTRING("text/html"), ++ NS_LITERAL_CSTRING("utf-8")); ++#else ++ PRUint32 size; ++ rv = sStream->GetLength(&size); ++ if (NS_FAILED(rv)) return rv; ++ + rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), mURI, + iStream, NS_LITERAL_CSTRING("text/html"), + NS_LITERAL_CSTRING("utf-8"), size); ++#endif + if (NS_FAILED(rv)) return rv; + + return rv; diff --git a/www/galeon2/files/patch-mozilla_BaseProtocolContentHandler.cpp b/www/galeon2/files/patch-mozilla_BaseProtocolContentHandler.cpp new file mode 100644 index 000000000000..10189ebf7100 --- /dev/null +++ b/www/galeon2/files/patch-mozilla_BaseProtocolContentHandler.cpp @@ -0,0 +1,27 @@ +--- mozilla/BaseProtocolContentHandler.cpp.orig Thu Feb 13 16:21:02 2003 ++++ mozilla/BaseProtocolContentHandler.cpp Thu Feb 13 16:22:10 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 "nsIURI.h" + #include "nsIChannel.h" +@@ -63,8 +67,13 @@ + if (NS_FAILED(rv)) return rv; + + nsCOMPtr<nsIChannel> channel; ++#if MOZILLA_SNAPSHOT > 3 ++ rv = NS_NewInputStreamChannel(getter_AddRefs(channel), aURI, ++ iStream, mMimeType, NS_LITERAL_CSTRING("")); ++#else + rv = NS_NewInputStreamChannel(getter_AddRefs(channel), aURI, + iStream, mMimeType, NS_LITERAL_CSTRING(""), 0); ++#endif + if (NS_FAILED(rv)) return rv; + + NS_IF_ADDREF (*_retval = channel); diff --git a/www/galeon2/files/patch-mozilla_GlobalHistory.cpp b/www/galeon2/files/patch-mozilla_GlobalHistory.cpp new file mode 100644 index 000000000000..eebb779a43f7 --- /dev/null +++ b/www/galeon2/files/patch-mozilla_GlobalHistory.cpp @@ -0,0 +1,27 @@ +--- mozilla/GlobalHistory.cpp.orig Thu Feb 13 16:30:19 2003 ++++ mozilla/GlobalHistory.cpp Thu Feb 13 16:32:29 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 "galeon-config.h" + #include "mozilla-embed-shell.h" + +@@ -149,6 +153,13 @@ + { + return NS_ERROR_NOT_IMPLEMENTED; + } ++ ++#if MOZILLA_SNAPSHOT > 3 ++NS_IMETHODIMP MozGlobalHistory::OutputReferrerURL(const char *aURL, const char *aReferrer) ++{ ++ return NS_ERROR_NOT_IMPLEMENTED; ++} ++#endif + + NS_DEF_FACTORY (MozGlobalHistory, MozGlobalHistory); + diff --git a/www/galeon2/files/patch-mozilla_MyportalProtocolHandler.cpp b/www/galeon2/files/patch-mozilla_MyportalProtocolHandler.cpp new file mode 100644 index 000000000000..e232fd5ec205 --- /dev/null +++ b/www/galeon2/files/patch-mozilla_MyportalProtocolHandler.cpp @@ -0,0 +1,41 @@ +--- mozilla/MyportalProtocolHandler.cpp.orig Thu Feb 13 16:23:25 2003 ++++ mozilla/MyportalProtocolHandler.cpp Thu Feb 13 16:26:47 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 "bookmarks.h" + #include "bookmarks-iterator.h" + #include "eel-gconf-extensions.h" +@@ -249,17 +253,23 @@ + g_free (myportalURI); + #else + nsCOMPtr<nsIInputStream> iStream; +- PRUint32 size; +- +- rv = sStream->GetLength(&size); ++ rv = sStream->NewInputStream(0, getter_AddRefs(iStream)); ++ + if (NS_FAILED(rv)) return rv; + +- rv = sStream->NewInputStream(0, getter_AddRefs(iStream)); ++#if MOZILLA_SNAPSHOT > 3 ++ rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), mURI, ++ iStream, NS_LITERAL_CSTRING("text/html"), ++ NS_LITERAL_CSTRING("utf-8")); ++#else ++ PRUint32 size; ++ rv = sStream->GetLength(&size); + if (NS_FAILED(rv)) return rv; + + rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), mURI, + iStream, NS_LITERAL_CSTRING("text/html"), + NS_LITERAL_CSTRING("utf-8"), size); ++#endif + if (NS_FAILED(rv)) return rv; + #endif + g_free (stylesheet_filename); diff --git a/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp b/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp index 8d64c8e00850..1ab447462541 100644 --- a/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp +++ b/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp @@ -1,5 +1,5 @@ ---- mozilla/TOCProtocolHandler.cpp.orig Wed Nov 20 15:24:03 2002 -+++ mozilla/TOCProtocolHandler.cpp Wed Nov 20 15:24:19 2002 +--- mozilla/TOCProtocolHandler.cpp.orig Wed Sep 4 20:41:48 2002 ++++ mozilla/TOCProtocolHandler.cpp Thu Feb 13 16:15:50 2003 @@ -83,8 +83,8 @@ oStream->Write (str.c_str(), str.size(), &bytesWriten); @@ -11,7 +11,35 @@ /* Implementation file */ NS_IMPL_ISUPPORTS1 (GTOCProtocolHandler, nsIProtocolHandler) -@@ -401,7 +401,7 @@ +@@ -126,17 +126,24 @@ + if (NS_FAILED(rv)) return rv; + + /* finish the rendering */ +- PRUint32 size; +- rv = mStream->GetLength(&size); +- if (NS_FAILED(rv)) return rv; + + nsCOMPtr<nsIInputStream> iStream; + rv = mStream->NewInputStream(0, getter_AddRefs(iStream)); + if (NS_FAILED(rv)) return rv; + ++#if MOZILLA_SNAPSHOT > 3 ++ rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), mURI, ++ iStream, NS_LITERAL_CSTRING("text/html"), ++ NS_LITERAL_CSTRING("utf-8")); ++#else ++ PRUint32 size; ++ rv = mStream->GetLength(&size); ++ if (NS_FAILED(rv)) return rv; ++ + rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), mURI, + iStream, NS_LITERAL_CSTRING("text/html"), + NS_LITERAL_CSTRING("utf-8"), size); ++#endif + if (NS_FAILED(rv)) return rv; + + return rv; +@@ -401,7 +408,7 @@ } NS_METHOD GTOCProtocolHandler::CreateHelpPage (const char *type, @@ -20,7 +48,7 @@ { nsresult rv; -@@ -496,7 +496,7 @@ +@@ -496,7 +503,7 @@ } } @@ -29,7 +57,7 @@ { #ifdef NOT_PORTED char *helpPath = gnome_help_file_find_file ( -@@ -512,7 +512,7 @@ +@@ -512,7 +519,7 @@ #endif } diff --git a/www/galeon2/files/patch-mozilla_mozilla-embed-persist.cpp b/www/galeon2/files/patch-mozilla_mozilla-embed-persist.cpp new file mode 100644 index 000000000000..cf3e67efd757 --- /dev/null +++ b/www/galeon2/files/patch-mozilla_mozilla-embed-persist.cpp @@ -0,0 +1,25 @@ +--- mozilla/mozilla-embed-persist.cpp.orig Thu Feb 13 16:18:30 2003 ++++ mozilla/mozilla-embed-persist.cpp Thu Feb 13 16:20:25 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 "mozilla-embed-persist.h" + #include "mozilla-embed.h" + #include "ProgressListener.h" +@@ -235,7 +239,11 @@ + persist, + !(flags & EMBED_PERSIST_SHOW_PROGRESS)); + ++#if MOZILLA_SNAPSHOT > 3 ++ rv = bpersist->SaveURI (linkURI, nsnull, nsnull, nsnull, nsnull, file); ++#else + rv = bpersist->SaveURI (linkURI, nsnull, file); ++#endif + if (NS_FAILED(rv)) return G_FAILED; + } + |