Index: www/firefox/Makefile =================================================================== RCS file: /home/ncvs/ports/www/firefox/Makefile,v retrieving revision 1.146 diff -u -r1.146 Makefile --- www/firefox/Makefile 1 Feb 2006 17:55:04 -0000 1.146 +++ www/firefox/Makefile 2 Feb 2006 00:56:50 -0000 @@ -7,8 +7,7 @@ # PORTNAME= firefox -DISTVERSION= 1.5 -PORTREVISION= 6 +DISTVERSION= 1.5.0.1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} Index: www/firefox/distinfo =================================================================== RCS file: /home/ncvs/ports/www/firefox/distinfo,v retrieving revision 1.28 diff -u -r1.28 distinfo --- www/firefox/distinfo 29 Nov 2005 21:12:28 -0000 1.28 +++ www/firefox/distinfo 2 Feb 2006 00:56:50 -0000 @@ -1,3 +1,3 @@ -MD5 (firefox-1.5-source.tar.bz2) = fa915ddcadecda30ed3e13694f26a779 -SHA256 (firefox-1.5-source.tar.bz2) = 3cdbd0929b1f92c60b3fb27601f621975fefea23465d5253238c6e120360d36b -SIZE (firefox-1.5-source.tar.bz2) = 34491496 +MD5 (firefox-1.5.0.1-source.tar.bz2) = c76f02956645bc823241379e27f76bb5 +SHA256 (firefox-1.5.0.1-source.tar.bz2) = b398cd9c32168669077a535475f4da67b925523de99147977603ffa3b8897814 +SIZE (firefox-1.5.0.1-source.tar.bz2) = 34705286 Index: www/firefox/files/patch-bugzilla319004 =================================================================== RCS file: /home/ncvs/ports/www/firefox/files/patch-bugzilla319004,v retrieving revision 1.1 diff -u -r1.1 patch-bugzilla319004 --- www/firefox/files/patch-bugzilla319004 9 Dec 2005 04:52:14 -0000 1.1 +++ www/firefox/files/patch-bugzilla319004 2 Feb 2006 00:56:50 -0000 @@ -1,103 +0,0 @@ -Index: toolkit/components/history/src/nsGlobalHistory.cpp -=================================================================== -RCS file: /cvsroot/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp,v -retrieving revision 1.58.2.2 -diff -u -8 -p -r1.58.2.2 nsGlobalHistory.cpp ---- toolkit/components/history/src/nsGlobalHistory.cpp.orig 23 Oct 2005 18:55:54 -0000 1.58.2.2 -+++ toolkit/components/history/src/nsGlobalHistory.cpp 8 Dec 2005 19:46:10 -0000 -@@ -108,16 +108,20 @@ nsIPrefBranch* nsGlobalHistory::gPrefBra - - #define PREF_BRANCH_BASE "browser." - #define PREF_BROWSER_HISTORY_EXPIRE_DAYS "history_expire_days" - #define PREF_AUTOCOMPLETE_ONLY_TYPED "urlbar.matchOnlyTyped" - #define PREF_AUTOCOMPLETE_ENABLED "urlbar.autocomplete.enabled" - - #define FIND_BY_AGEINDAYS_PREFIX "find:datasource=history&match=AgeInDays&method=" - -+// see bug #319004 -- clamp title and URL to generously-large but not too large -+// length -+#define HISTORY_STRING_LENGTH_MAX 65536 -+ - // sync history every 10 seconds - #define HISTORY_SYNC_TIMEOUT (10 * PR_MSEC_PER_SEC) - //#define HISTORY_SYNC_TIMEOUT 3000 // every 3 seconds - testing only! - - // the value of mLastNow expires every 3 seconds - #define HISTORY_EXPIRE_NOW_TIMEOUT (3 * PR_MSEC_PER_SEC) - - #define MSECS_PER_DAY (PR_MSEC_PER_SEC * 60 * 60 * 24) -@@ -1105,30 +1109,37 @@ nsGlobalHistory::GetCount(PRUint32* aCou - } - - NS_IMETHODIMP - nsGlobalHistory::SetPageTitle(nsIURI *aURI, const nsAString& aTitle) - { - nsresult rv; - NS_ENSURE_ARG_POINTER(aURI); - -- const nsAFlatString& titleString = PromiseFlatString(aTitle); -+ nsString realTitleString(aTitle); -+ if (realTitleString.Length() > HISTORY_STRING_LENGTH_MAX) -+ realTitleString.Left(realTitleString, HISTORY_STRING_LENGTH_MAX); -+ -+ const nsAFlatString& titleString = PromiseFlatString(realTitleString); - - // skip about: URIs to avoid reading in the db (about:blank, especially) - PRBool isAbout; - rv = aURI->SchemeIs("about", &isAbout); - NS_ENSURE_SUCCESS(rv, rv); - if (isAbout) return NS_OK; - - NS_ENSURE_SUCCESS(OpenDB(), NS_ERROR_FAILURE); - - nsCAutoString URISpec; - rv = aURI->GetSpec(URISpec); - NS_ENSURE_SUCCESS(rv, rv); - -+ if (URISpec.Length() > HISTORY_STRING_LENGTH_MAX) -+ URISpec.Left(URISpec, HISTORY_STRING_LENGTH_MAX); -+ - nsCOMPtr row; - rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row)); - - // if the row doesn't exist, we silently succeed - if (rv == NS_ERROR_NOT_AVAILABLE) return NS_OK; - NS_ENSURE_SUCCESS(rv, rv); - - // Get the old title so we can notify observers -Index: mork/src/morkSink.cpp -=================================================================== -RCS file: /cvsroot/mozilla/db/mork/src/morkSink.cpp,v -retrieving revision 1.8 -diff -u -8 -p -r1.8 morkSink.cpp ---- db/mork/src/morkSink.cpp 17 Apr 2004 21:49:24 -0000 1.8 -+++ db/mork/src/morkSink.cpp 8 Dec 2005 19:45:59 -0000 -@@ -110,25 +110,20 @@ morkSpool::SpillPutc(morkEnv* ev, int c) - { - mork_size size = coil->mBlob_Size; - mork_fill fill = (mork_fill) (at - body); // current content size - if ( fill <= size ) // less content than medium size? - { - coil->mBuf_Fill = fill; - if ( at >= end ) // need to grow the coil? - { -- if ( size > 2048 ) // grow slower over 2K? -- size += 512; -+ if ( size > 65536 ) -+ size += 65536; - else -- { -- mork_size growth = ( size * 4 ) / 3; // grow by 33% -- if ( growth < 64 ) // grow faster under (64 * 3)? -- growth = 64; -- size += growth; -- } -+ size *= 2; - if ( coil->GrowCoil(ev, size) ) // made coil bigger? - { - body = (mork_u1*) coil->mBuf_Body; - if ( body ) // have a coil body? - { - mSink_At = at = body + fill; - mSink_End = end = body + coil->mBlob_Size; - } Index: www/firefox/files/patch-widget_src_gtk2_nsWindow.cpp =================================================================== RCS file: /home/ncvs/ports/www/firefox/files/patch-widget_src_gtk2_nsWindow.cpp,v retrieving revision 1.1 diff -u -r1.1 patch-widget_src_gtk2_nsWindow.cpp --- www/firefox/files/patch-widget_src_gtk2_nsWindow.cpp 1 Feb 2006 17:55:04 -0000 1.1 +++ www/firefox/files/patch-widget_src_gtk2_nsWindow.cpp 2 Feb 2006 00:56:50 -0000 @@ -1,58 +0,0 @@ ---- widget/src/gtk2/nsWindow.cpp.orig Thu Aug 18 10:11:23 2005 -+++ widget/src/gtk2/nsWindow.cpp Sat Jan 28 18:34:03 2006 -@@ -148,9 +148,9 @@ - GdkEventVisibility *event); - static gboolean window_state_event_cb (GtkWidget *widget, - GdkEventWindowState *event); --static void style_set_cb (GtkWidget *widget, -- GtkStyle *previous_style, -- gpointer data); -+static void theme_changed_cb (GtkSettings *settings, -+ GParamSpec *pspec, -+ nsWindow *data); - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ -@@ -372,6 +372,10 @@ - mIsDestroyed = PR_TRUE; - mCreated = PR_FALSE; - -+ g_signal_handlers_disconnect_by_func(gtk_settings_get_default(), -+ (gpointer)G_CALLBACK(theme_changed_cb), -+ this); -+ - // ungrab if required - nsCOMPtr rollupWidget = do_QueryReferent(gRollupWindow); - if (NS_STATIC_CAST(nsIWidget *, this) == rollupWidget.get()) { -@@ -2434,8 +2438,16 @@ - G_CALLBACK(delete_event_cb), NULL); - g_signal_connect(G_OBJECT(mShell), "window_state_event", - G_CALLBACK(window_state_event_cb), NULL); -- g_signal_connect(G_OBJECT(mShell), "style_set", -- G_CALLBACK(style_set_cb), NULL); -+ -+ g_signal_connect_after(gtk_settings_get_default(), -+ "notify::gtk-theme-name", -+ G_CALLBACK(theme_changed_cb), this); -+ g_signal_connect_after(gtk_settings_get_default(), -+ "notify::gtk-key-theme-name", -+ G_CALLBACK(theme_changed_cb), this); -+ g_signal_connect_after(gtk_settings_get_default(), -+ "notify::gtk-font-name", -+ G_CALLBACK(theme_changed_cb), this); - } - - if (mContainer) { -@@ -3916,11 +3928,9 @@ - - /* static */ - void --style_set_cb (GtkWidget *widget, GtkStyle *previous_style, gpointer data) -+theme_changed_cb (GtkSettings *settings, GParamSpec *pspec, nsWindow *data) - { -- nsWindow *window = get_window_for_gtk_widget(widget); -- if (window) -- window->ThemeChanged(); -+ data->ThemeChanged(); - } -