From 6587f5e7aba25423a11615bb601e1ed4a04571a9 Mon Sep 17 00:00:00 2001 From: taya Date: Sun, 16 Jan 2005 05:23:59 +0000 Subject: make this compile with mozilla-1.7.5 bump PKGREVISION --- www/galeon12/Makefile | 4 +-- www/galeon12/distinfo | 5 ++- www/galeon12/patches/patch-ad | 17 ++++++++++ www/galeon12/patches/patch-ae | 73 +++++++++++++++++++++++++++++++++++++++++++ www/galeon12/patches/patch-af | 30 ++++++++++++++++++ 5 files changed, 126 insertions(+), 3 deletions(-) create mode 100644 www/galeon12/patches/patch-ad create mode 100644 www/galeon12/patches/patch-ae create mode 100644 www/galeon12/patches/patch-af (limited to 'www') diff --git a/www/galeon12/Makefile b/www/galeon12/Makefile index c8d62a423ee..d24981bd10c 100644 --- a/www/galeon12/Makefile +++ b/www/galeon12/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2004/11/30 18:26:40 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2005/01/16 05:23:59 taya Exp $ DISTNAME= galeon-1.2.14 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=galeon/} diff --git a/www/galeon12/distinfo b/www/galeon12/distinfo index df41463ceec..c7a31581494 100644 --- a/www/galeon12/distinfo +++ b/www/galeon12/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/07/20 17:34:02 abs Exp $ +$NetBSD: distinfo,v 1.2 2005/01/16 05:23:59 taya Exp $ SHA1 (galeon-1.2.14.tar.gz) = 46e12af43546f46249017aab83f5eace43591dca Size (galeon-1.2.14.tar.gz) = 4353701 bytes SHA1 (patch-aa) = c833d0431ac10507f35b325c109fae35f5d1a454 SHA1 (patch-ab) = b65428a66edee35968813a64afae9050de5e3271 SHA1 (patch-ac) = 31d226907d96e56a25e8c7388ef48badc562b788 +SHA1 (patch-ad) = 4a9512eb12339ac4c442e077fb57422f37d40896 +SHA1 (patch-ae) = 8905d630fe27d5ab40a4e60e91de8447a3d4529c +SHA1 (patch-af) = c081a6679ce6318e6564a6ba6b08f2c8eb56342d diff --git a/www/galeon12/patches/patch-ad b/www/galeon12/patches/patch-ad new file mode 100644 index 00000000000..76531b99e94 --- /dev/null +++ b/www/galeon12/patches/patch-ad @@ -0,0 +1,17 @@ +$NetBSD: patch-ad,v 1.1 2005/01/16 05:23:59 taya Exp $ + +diff -ru ../Orig/galeon-1.2.14/src/mozilla/ContentHandler.cpp ./src/mozilla/ContentHandler.cpp +--- ../Orig/galeon-1.2.14/src/mozilla/ContentHandler.cpp 2004-02-28 13:55:53.000000000 +0900 ++++ ./src/mozilla/ContentHandler.cpp 2005-01-16 13:32:32.000000000 +0900 +@@ -378,9 +378,9 @@ + // NS_NAMED_LITERAL_STRING (title, _("Select the destination filename")); + NS_NAMED_LITERAL_CSTRING(title, _("Select the destination filename")); + +- aFilePicker->Init (aWindowInternal, PromiseFlatString(NS_ConvertUTF8toUCS2(title)).get(), ++ aFilePicker->Init (aWindowInternal, NS_ConvertUTF8toUCS2(title), + nsIFilePicker::modeSave); +- aFilePicker->SetDefaultString (aDefaultFile); ++ aFilePicker->SetDefaultString (nsAutoString(aDefaultFile)); + aFilePicker->SetDisplayDirectory (saveDir); + + nsCOMPtr aFile (do_CreateInstance(NS_LOCAL_FILE_CONTRACTID)); diff --git a/www/galeon12/patches/patch-ae b/www/galeon12/patches/patch-ae new file mode 100644 index 00000000000..d563bf10785 --- /dev/null +++ b/www/galeon12/patches/patch-ae @@ -0,0 +1,73 @@ +$NetBSD: patch-ae,v 1.1 2005/01/16 05:23:59 taya Exp $ + +diff -ru ../Orig/galeon-1.2.14/src/mozilla/FilePicker.cpp ./src/mozilla/FilePicker.cpp +--- ../Orig/galeon-1.2.14/src/mozilla/FilePicker.cpp 2003-04-12 06:29:27.000000000 +0900 ++++ ./src/mozilla/FilePicker.cpp 2005-01-16 13:59:04.000000000 +0900 +@@ -98,8 +98,8 @@ + //////////////////////////////////////////////////////////////////////////////// + + /* void init (in nsIDOMWindowInternal parent, in wstring title, in short mode); */ +-NS_IMETHODIMP GFilePicker::Init(nsIDOMWindowInternal *parent, +- const PRUnichar *title, PRInt16 mode) ++NS_IMETHODIMP GFilePicker::Init(nsIDOMWindow *parent, ++ const nsAString &title, PRInt16 mode) + { + mParentInternal = parent; + mParent = do_QueryInterface (mParentInternal); +@@ -121,8 +121,8 @@ + } + + /* void appendFilter (in wstring title, in wstring filter); */ +-NS_IMETHODIMP GFilePicker::AppendFilter(const PRUnichar *title, +- const PRUnichar *filter) ++NS_IMETHODIMP GFilePicker::AppendFilter(const nsAString& title, ++ const nsAString& filter) + { + //GtkFileSelection is crippled, so we can't provide a short-list + //of filters to choose from. We provide minimal functionality +@@ -142,29 +142,27 @@ + } + + /* attribute wstring defaultString; */ +-NS_IMETHODIMP GFilePicker::GetDefaultString(PRUnichar * *aDefaultString) ++NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString) + { +- *aDefaultString = ToNewUnicode (mDefaultString); ++ aDefaultString = ToNewUnicode (mDefaultString); + return NS_OK; + } +-NS_IMETHODIMP GFilePicker::SetDefaultString(const PRUnichar * aDefaultString) ++NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString& aDefaultString) + { +- if (aDefaultString) +- mDefaultString = aDefaultString; +- else +- mDefaultString = NS_LITERAL_STRING (""); ++ mDefaultString = aDefaultString; ++ + return NS_OK; + } + + /* attribute wstring defaultExtension; */ + // Again, due to the crippled file selector, we can't really + // do anything here. +-NS_IMETHODIMP GFilePicker::GetDefaultExtension(PRUnichar * *aDefaultExtension) ++NS_IMETHODIMP GFilePicker::GetDefaultExtension(nsAString& aDefaultExtension) + { + return NS_ERROR_NOT_IMPLEMENTED; + } + +-NS_IMETHODIMP GFilePicker::SetDefaultExtension(const PRUnichar * aDefaultExtension) ++NS_IMETHODIMP GFilePicker::SetDefaultExtension(const nsAString& aDefaultExtension) + { + return NS_OK; + } +@@ -606,7 +604,7 @@ + g_free (expanded_directory); + + aFilePicker->InitWithGtkWidget (parentWidget, title, mode); +- aFilePicker->SetDefaultString (uDefaultString); ++ aFilePicker->SetDefaultString (nsAutoString(uDefaultString)); + aFilePicker->SetDisplayDirectory (aDir); + + PRInt16 retval; diff --git a/www/galeon12/patches/patch-af b/www/galeon12/patches/patch-af new file mode 100644 index 00000000000..f842053c80e --- /dev/null +++ b/www/galeon12/patches/patch-af @@ -0,0 +1,30 @@ +$NetBSD: patch-af,v 1.1 2005/01/16 05:23:59 taya Exp $ + +diff -ru ../Orig/galeon-1.2.14/src/mozilla/GlobalHistory.cpp ./src/mozilla/GlobalHistory.cpp +--- ../Orig/galeon-1.2.14/src/mozilla/GlobalHistory.cpp 2004-03-30 16:42:47.000000000 +0900 ++++ ./src/mozilla/GlobalHistory.cpp 2005-01-16 14:01:52.000000000 +0900 +@@ -149,13 +149,13 @@ + #endif + + /* void removePage (in string aURL); */ +-NS_IMETHODIMP GlobalHistory::RemovePage(const char *aURL) ++NS_IMETHODIMP GlobalHistory::RemovePage(nsIURI *aURL) + { + return NS_ERROR_NOT_IMPLEMENTED; + } + + /* void removePagesFromHost (in string aHost, in boolean aEntireDomain); */ +-NS_IMETHODIMP GlobalHistory::RemovePagesFromHost(const char *aHost, ++NS_IMETHODIMP GlobalHistory::RemovePagesFromHost(const nsACString& aHost, + PRBool aEntireDomain) + { + return NS_ERROR_NOT_IMPLEMENTED; +@@ -226,7 +226,7 @@ + #endif + + /* void markPageAsTyped (in string url); */ +-NS_IMETHODIMP GlobalHistory::MarkPageAsTyped(const char *url) ++NS_IMETHODIMP GlobalHistory::MarkPageAsTyped(nsIURI *url) + { + return NS_ERROR_NOT_IMPLEMENTED; + } -- cgit v1.2.3