diff -Nru firefox-10.0.2+build1/debian/build/testsuite.mk firefox-11.0+build1/debian/build/testsuite.mk --- firefox-10.0.2+build1/debian/build/testsuite.mk 2012-03-10 01:13:14.000000000 +0000 +++ firefox-11.0+build1/debian/build/testsuite.mk 2012-03-10 01:14:06.000000000 +0000 @@ -28,7 +28,7 @@ $(addprefix debian/stamp-,xpcshell-tests): debian/stamp-xpcshell-tests-disable # Tests that need a X server -$(addprefix debian/stamp-,jstestbrowser reftest crashtest mochitest): WRAPPER = xvfb-run -s "-screen 0 1024x768x24" +$(addprefix debian/stamp-,xpcshell-tests jstestbrowser reftest crashtest mochitest): WRAPPER = xvfb-run -a -s "-screen 0 1024x768x24" dbus-launch --exit-with-session # Run the test! $(addprefix debian/stamp-,$(TESTS)): @@ -40,19 +40,6 @@ # Hangs without network access rm -f $(CURDIR)/$(MOZ_OBJDIR)$(MOZ_MOZDIR)/_tests/xpcshell/toolkit/components/places/tests/unit/test_404630.js - # FIXME: IPC tests seem to hang in the buildd's - rm -rf $(CURDIR)/$(MOZ_OBJDIR)$(MOZ_MOZDIR)/_tests/xpcshell/chrome/test/unit_ipc - rm -rf $(CURDIR)/$(MOZ_OBJDIR)$(MOZ_MOZDIR)/_tests/xpcshell/ipc/testshell/tests - rm -rf $(CURDIR)/$(MOZ_OBJDIR)$(MOZ_MOZDIR)/_tests/xpcshell/toolkit/components/contentprefs/tests/unit_ipc - rm -rf $(CURDIR)/$(MOZ_OBJDIR)$(MOZ_MOZDIR)/_tests/xpcshell/ipc - rm -rf $(CURDIR)/$(MOZ_OBJDIR)$(MOZ_MOZDIR)/_tests/xpcshell/netwerk/cookie/test/unit_ipc - rm -rf $(CURDIR)/$(MOZ_OBJDIR)$(MOZ_MOZDIR)/_tests/xpcshell/netwerk/test/unit_ipc - rm -rf $(CURDIR)/$(MOZ_OBJDIR)$(MOZ_MOZDIR)/_tests/xpcshell/modules/libpref/test/unit_ipc - rm -rf $(CURDIR)/$(MOZ_OBJDIR)$(MOZ_MOZDIR)/_tests/xpcshell/extensions/cookie/test/unit_ipc - rm -rf $(CURDIR)/$(MOZ_OBJDIR)$(MOZ_MOZDIR)/_tests/xpcshell/uriloader/exthandler/tests/unit_ipc - rm -rf $(CURDIR)/$(MOZ_OBJDIR)$(MOZ_MOZDIR)/_tests/xpcshell/content/base/test/unit_ipc - rm -rf $(CURDIR)/$(MOZ_OBJDIR)$(MOZ_MOZDIR)/_tests/xpcshell/toolkit/crashreporter/test/unit_ipc - # Needs GConf to be running. I guess we need to start with dbus-launch to fix this rm -f $(CURDIR)/$(MOZ_OBJDIR)$(MOZ_MOZDIR)/_tests/xpcshell/browser/components/shell/test/unit/test_421977.js rm -f $(CURDIR)/$(MOZ_OBJDIR)$(MOZ_MOZDIR)/_tests/xpcshell/uriloader/exthandler/tests/unit/test_handlerService.js diff -Nru firefox-10.0.2+build1/debian/changelog firefox-11.0+build1/debian/changelog --- firefox-10.0.2+build1/debian/changelog 2012-03-10 01:13:14.000000000 +0000 +++ firefox-11.0+build1/debian/changelog 2012-03-10 01:14:06.000000000 +0000 @@ -1,3 +1,82 @@ +firefox (11.0+build1-0ubuntu0.11.10.1) oneiric-security; urgency=low + + * New upstream stable release (FIREFOX_11_0_BUILD1) + - Fix LP: #875266 - Firefox ignores GNOME3 proxy settings + - Fix LP: #857153 - Needs to get accessibility settings from GSettings + - see LP: #951250 for USN information + + * Update globalmenu-extension to 2.0.3 + * Ensure that the crash reporter is disabled if rebuilt by Ubuntu + derivatives, as there will be no crash symbols for those + - update debian/rules + * Only add "Ubuntu" to the UA string when being built for Ubuntu + - update debian/rules + * Temporarily disable ipdl tests due to build failures. These aren't + enabled upstream, anyway + - update debian/config/mozconfig.in + * Always set the update channel - not setting it at build-time on release + builds breaks the extensions.checkCompatibility pref. The only things + using it at runtime are nsBlocklistService, Test Pilot (beta + aurora) + and the about dialog (where the channel is hidden anyway) + - update debian/rules + - update debian/firefox.install.in + * Fix LP: #898883 - IPC xpcshell tests hang the buildd's. Give all + xpcshell tests an X display, as plugin-container won't work without one + - update debian/build/testsuite.mk + * Turn on all IPC xpcshell tests again + - update debian/build/testsute.mk + * Ship Test Pilot as a distribution addon on aurora + beta, like upstream. + This means that the addon manager can update it. It does also mean that it + will remain installed in users profiles if they try the beta or aurora + builds, but the Feedback button is disabled on release builds + - update debian/firefox.install.in + - fixes LP: #913357 + * Drop patches fixed upstream + - remove debian/patches/fix-cursor-handling.patch + - update debian/patches/series + * Call xvfb-run with "-a" in case there are other servers running on the + builder + - update debian/build/testsuite.mk + * Really fix LP: #898883 - IPC xpcshell tests hang the build. What was + actually happening is plugin-container would fail to start because all + available X connections had been used up by many instances of dbus-launch, + spawned each time an xpcshell tried to talk to the session bus. Because + we run all of the xpcshell tests with one Xvfb instance, the buses + accumulate until the available X connections all run out. To fix this, run + all tests requiring a display inside dbus-launch, so we create just a + single bus for all xpcshell tests + - update debian/build/testsuite.mk + - update debian/control{,.in} + * Add Ligurian to locale blacklist, as we don't support this in Ubuntu + - update debian/config/locales.blacklist + * Refresh patches + - update debian/patches/ubuntu-ua-string-changes.patch + - update debian/patches/mozilla-kde.patch + - update debian/patches/firefox-kde.patch + * Fix LP: #915895 - Just set autoDisableScopes to 0. Other distributions + are already doing this, and we already made this feature pretty much + useless by allowing extensions in the application directory, so that our + language packs aren't disabled by default + - update debian/vendor.js + * Drop the solid white separators from the addressbar autocomplete dropdown, + and increase padding so that it doesn't look so bad with dark themes + - add debian/patches/autocomplete-theme-tweak.patch + - update debian/patches/series + * Fix LP: #926495 - Add patch based on one from bmo: #691898 to enable + building on ppc again + - add debian/patches/fix-build-failure-without-yarr-jit.patch + - update debian/patches/series + * Fix LP: #939657 - Don't call g_settings_new each time we create a HTTP + channel. Doing this causes a dbus roundtrip, and results in us spamming + the session bus unnecessarily + - add debian/patches/avoid-dbus-roundtrip-for-httpchannel.patch + - update debian/patches/series + * Fix LP: #926495 - Disable the SPS profiler on unsupported architectures + - add debian/patches/no-sps-profiler-on-unsupported-archs.patch + - update debian/patches/series + + -- Chris Coulson Sat, 10 Mar 2012 00:48:48 +0000 + firefox (10.0.2+build1-0ubuntu0.11.10.1) oneiric-security; urgency=low * New upstream stable release (FIREFOX_10_0_2_BUILD1) diff -Nru firefox-10.0.2+build1/debian/config/locales.blacklist firefox-11.0+build1/debian/config/locales.blacklist --- firefox-10.0.2+build1/debian/config/locales.blacklist 2012-03-10 01:13:14.000000000 +0000 +++ firefox-11.0+build1/debian/config/locales.blacklist 2012-03-10 01:14:06.000000000 +0000 @@ -1,4 +1,5 @@ ak +lij rm son ta-LK diff -Nru firefox-10.0.2+build1/debian/config/mozconfig.in firefox-11.0+build1/debian/config/mozconfig.in --- firefox-10.0.2+build1/debian/config/mozconfig.in 2012-03-10 01:13:14.000000000 +0000 +++ firefox-11.0+build1/debian/config/mozconfig.in 2012-03-10 01:14:06.000000000 +0000 @@ -12,7 +12,7 @@ ac_add_options --enable-application=browser ac_add_options --enable-startup-notification ac_add_options --with-distribution-id=com.ubuntu -%%ifdef DEB_ENABLE_THUMB2 +%%if DEB_HOST_ARCH == armel ac_add_options --enable-thumb2 %%endif %%if MOZ_OVERRIDE_SHLIBS == system @@ -48,7 +48,7 @@ %%endif %%ifdef MOZ_WANT_UNIT_TESTS ac_add_options --enable-tests -ac_add_options --enable-ipdl-tests +# ac_add_options --enable-ipdl-tests %%else ac_add_options --disable-tests ac_add_options --disable-ipdl-tests diff -Nru firefox-10.0.2+build1/debian/control firefox-11.0+build1/debian/control --- firefox-10.0.2+build1/debian/control 2012-03-10 01:13:14.000000000 +0000 +++ firefox-11.0+build1/debian/control 2012-03-10 01:14:06.000000000 +0000 @@ -33,11 +33,12 @@ libxrender-dev, libfreetype6-dev (>= 2.0.1), libgnomevfs2-dev (>= 1:2.0), - yasm (>= 1.1), + yasm (>= 1.1), xvfb, imagemagick, libdbusmenu-gtk-dev, - unzip + unzip, + dbus-x11 Standards-Version: 3.9.1 Package: firefox @@ -73,7 +74,7 @@ Architecture: any Section: gnome Depends: ${shlibs:Depends}, - ${misc:Depends}, + ${misc:Depends}, firefox Description: Safe and easy web browser from Mozilla - GNOME support Firefox delivers safe, easy web browsing. A familiar user interface, diff -Nru firefox-10.0.2+build1/debian/control.in firefox-11.0+build1/debian/control.in --- firefox-10.0.2+build1/debian/control.in 2012-03-10 01:13:14.000000000 +0000 +++ firefox-11.0+build1/debian/control.in 2012-03-10 01:14:06.000000000 +0000 @@ -31,11 +31,12 @@ mesa-common-dev, libnotify-dev (>= 0.4), @SYSLIBS_BD@ libgnomevfs2-dev (>= 1:2.0), - yasm (>= 1.1), + yasm (>= 1.1), xvfb, imagemagick, libdbusmenu-gtk-dev, - unzip + unzip, + dbus-x11 Standards-Version: 3.9.1 Package: @MOZ_APP_NAME@ @@ -71,7 +72,7 @@ Architecture: any Section: gnome Depends: ${shlibs:Depends}, - ${misc:Depends}, + ${misc:Depends}, @MOZ_APP_NAME@ Description: Safe and easy web browser from Mozilla - GNOME support Firefox delivers safe, easy web browsing. A familiar user interface, diff -Nru firefox-10.0.2+build1/debian/firefox-gnome-support.install.in firefox-11.0+build1/debian/firefox-gnome-support.install.in --- firefox-10.0.2+build1/debian/firefox-gnome-support.install.in 2012-03-10 01:13:14.000000000 +0000 +++ firefox-11.0+build1/debian/firefox-gnome-support.install.in 2012-03-10 01:14:06.000000000 +0000 @@ -2,6 +2,3 @@ debian/tmp@MOZ_LIBDIR@/components/libnkgnomevfs.so %%endif debian/tmp@MOZ_LIBDIR@/components/libmozgnome.so -%%ifndef MOZ_DISABLE_CONTROL_CENTER -debian/@MOZ_APP_NAME@.xml /usr/share/gnome-control-center/default-apps -%%endif diff -Nru firefox-10.0.2+build1/debian/firefox.install.in firefox-11.0+build1/debian/firefox.install.in --- firefox-10.0.2+build1/debian/firefox.install.in 2012-03-10 01:13:14.000000000 +0000 +++ firefox-11.0+build1/debian/firefox.install.in 2012-03-10 01:14:06.000000000 +0000 @@ -20,13 +20,15 @@ %%define SHIP_TESTPILOT %%endif %%ifdef SHIP_TESTPILOT -debian/tmp@MOZ_LIBDIR@/distribution/extensions/testpilot@labs.mozilla.com.xpi /usr/lib/@MOZ_APP_NAME@-addons/extensions +%%ifdef MOZ_SYMLINKED_DIST +debian/tmp@MOZ_LIBDIR@/distribution/extensions/testpilot@labs.mozilla.com.xpi /usr/lib/@MOZ_APP_NAME@-addons/distribution/extensions +%%else +debian/tmp@MOZ_LIBDIR@/distribution/extensions/testpilot@labs.mozilla.com.xpi @MOZ_LIBDIR@/distribution/extensions +%%endif %%endif debian/tmp@MOZ_LIBDIR@/*.ini -%%ifdef MOZ_UPDATE_CHANNEL debian/tmp@MOZ_LIBDIR@/defaults/pref/channel-prefs.js -%%endif debian/@MOZ_APP_NAME@.desktop /usr/share/applications diff -Nru firefox-10.0.2+build1/debian/firefox.xml.in firefox-11.0+build1/debian/firefox.xml.in --- firefox-10.0.2+build1/debian/firefox.xml.in 2012-03-10 01:13:14.000000000 +0000 +++ firefox-11.0+build1/debian/firefox.xml.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ - - - - - - @MOZ_DISPLAY_NAME@ - @MOZ_APP_NAME@ - @MOZ_APP_NAME@ %s - @MOZ_APP_NAME@ - false - true - @MOZ_APP_NAME@ -new-tab "%s" - @MOZ_APP_NAME@ -new-window "%s" - - - - diff -Nru firefox-10.0.2+build1/debian/globalmenu/components/src/compat.h firefox-11.0+build1/debian/globalmenu/components/src/compat.h --- firefox-10.0.2+build1/debian/globalmenu/components/src/compat.h 2012-03-10 01:13:14.000000000 +0000 +++ firefox-11.0+build1/debian/globalmenu/components/src/compat.h 2012-03-10 01:14:06.000000000 +0000 @@ -37,11 +37,15 @@ * ***** END LICENSE BLOCK ***** */ #if MOZILLA_BRANCH_MAJOR_VERSION >= 10 -#define MOZ_API_BOOL bool -#define MOZ_API_TRUE true -#define MOZ_API_FALSE false +# define MOZ_API_BOOL bool +# define MOZ_API_TRUE true +# define MOZ_API_FALSE false #else -#define MOZ_API_BOOL PRBool -#define MOZ_API_TRUE PR_TRUE -#define MOZ_API_FALSE PR_FALSE +# define MOZ_API_BOOL PRBool +# define MOZ_API_TRUE PR_TRUE +# define MOZ_API_FALSE PR_FALSE +#endif + +#if MOZILLA_BRANCH_MAJOR_VERSION >= 11 +# define nsIDOMNSElement nsIDOMElement #endif diff -Nru firefox-10.0.2+build1/debian/globalmenu/components/src/uGlobalMenuLoader.cpp firefox-11.0+build1/debian/globalmenu/components/src/uGlobalMenuLoader.cpp --- firefox-10.0.2+build1/debian/globalmenu/components/src/uGlobalMenuLoader.cpp 2012-03-10 01:13:14.000000000 +0000 +++ firefox-11.0+build1/debian/globalmenu/components/src/uGlobalMenuLoader.cpp 2012-03-10 01:14:06.000000000 +0000 @@ -289,7 +289,12 @@ NS_IMETHODIMP uGlobalMenuLoader::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, +#if MOZILLA_BRANCH_MAJOR_VERSION <= 10 nsIURI *aLocation) +#else + nsIURI *aLocation, + PRUint32 aFlags) +#endif { return NS_ERROR_NOT_IMPLEMENTED; } diff -Nru firefox-10.0.2+build1/debian/globalmenu/components/src/uGlobalMenuObject.cpp firefox-11.0+build1/debian/globalmenu/components/src/uGlobalMenuObject.cpp --- firefox-10.0.2+build1/debian/globalmenu/components/src/uGlobalMenuObject.cpp 2012-03-10 01:13:14.000000000 +0000 +++ firefox-11.0+build1/debian/globalmenu/components/src/uGlobalMenuObject.cpp 2012-03-10 01:14:06.000000000 +0000 @@ -45,7 +45,9 @@ #include #include #include -#include +#if MOZILLA_BRANCH_MAJOR_VERSION < 11 +# include +#endif #include #include #include @@ -262,6 +264,8 @@ nsnull, nsnull, getter_AddRefs(mIconRequest)); NS_ENSURE_SUCCESS(rv, rv); + mIconRequest->RequestDecode(); + mImageRect.SetEmpty(); if (domRect) { @@ -303,8 +307,7 @@ uGlobalMenuIconLoader::OnStartContainer(imgIRequest *aRequest, imgIContainer *aContainer) { TRACE_WITH_MENUOBJECT(mMenuItem); - aContainer->RequestDecode(); - return NS_OK; + return NS_ERROR_NOT_IMPLEMENTED; } NS_IMETHODIMP @@ -415,6 +418,7 @@ uGlobalMenuIconLoader::OnStopDecode(imgIRequest *aRequest, nsresult status, const PRUnichar *statusArg) { + TRACE_WITH_MENUOBJECT(mMenuItem); return NS_ERROR_NOT_IMPLEMENTED; } @@ -422,6 +426,12 @@ uGlobalMenuIconLoader::OnStopRequest(imgIRequest *aRequest, MOZ_API_BOOL aIsLastPart) { TRACE_WITH_MENUOBJECT(mMenuItem); + + if (mIconRequest) { + mIconRequest->Cancel(NS_BINDING_ABORTED); + mIconRequest = nsnull; + } + return NS_OK; } @@ -438,6 +448,14 @@ return NS_ERROR_NOT_IMPLEMENTED; } +#if MOZILLA_BRANCH_MAJOR_VERSION >= 11 +NS_IMETHODIMP +uGlobalMenuIconLoader::OnImageIsAnimated(imgIRequest* aRequest) +{ + return NS_OK; +} +#endif + void uGlobalMenuIconLoader::Destroy() { diff -Nru firefox-10.0.2+build1/debian/globalmenu/install.rdf firefox-11.0+build1/debian/globalmenu/install.rdf --- firefox-10.0.2+build1/debian/globalmenu/install.rdf 2012-03-10 01:13:14.000000000 +0000 +++ firefox-11.0+build1/debian/globalmenu/install.rdf 2012-03-10 01:14:06.000000000 +0000 @@ -4,7 +4,7 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#"> globalmenu@ubuntu.com - 2.0.2 + 2.0.3 true @@ -12,7 +12,7 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} 6.0 - 10.* + 11.* @@ -21,7 +21,7 @@ {3550f703-e582-4d05-9a08-453d09bdfdc6} 6.0 - 10.* + 11.* diff -Nru firefox-10.0.2+build1/debian/patches/autocomplete-theme-tweak.patch firefox-11.0+build1/debian/patches/autocomplete-theme-tweak.patch --- firefox-10.0.2+build1/debian/patches/autocomplete-theme-tweak.patch 1970-01-01 00:00:00.000000000 +0000 +++ firefox-11.0+build1/debian/patches/autocomplete-theme-tweak.patch 2012-03-10 01:14:06.000000000 +0000 @@ -0,0 +1,30 @@ +# HG changeset patch +# Parent c842e1cec6e374e4c692138ae9b52a1c2a273bc2 +# User Chris Coulson + +diff --git a/toolkit/themes/gnomestripe/global/autocomplete.css b/toolkit/themes/gnomestripe/global/autocomplete.css +--- a/toolkit/themes/gnomestripe/global/autocomplete.css ++++ b/toolkit/themes/gnomestripe/global/autocomplete.css +@@ -145,20 +145,18 @@ treechildren.autocomplete-treebody::-moz + .autocomplete-richlistitem[selected="true"] { + background-color: Highlight; + color: HighlightText; + } + + .autocomplete-richlistitem { + padding: 1px 2px; + color: MenuText; +-} +- +-.autocomplete-richlistitem:not(:first-child) { +- border-top: 1px solid ThreeDLightShadow; ++ border-top: 3px solid transparent; ++ border-bottom: 3px solid transparent; + } + + .ac-site-icon { + width: 16px; + height: 16px; + margin: 0 5px -3px 3px; + } + diff -Nru firefox-10.0.2+build1/debian/patches/avoid-dbus-roundtrip-for-httpchannel.patch firefox-11.0+build1/debian/patches/avoid-dbus-roundtrip-for-httpchannel.patch --- firefox-10.0.2+build1/debian/patches/avoid-dbus-roundtrip-for-httpchannel.patch 1970-01-01 00:00:00.000000000 +0000 +++ firefox-11.0+build1/debian/patches/avoid-dbus-roundtrip-for-httpchannel.patch 2012-03-10 01:14:06.000000000 +0000 @@ -0,0 +1,130 @@ +# HG changeset patch +# Parent 9bde0d25d76e4ef301668a8016f6edcba1662826 +# User Chris Coulson +Bug 716467 - Don't call g_settings_new each time we look up system proxy settings + +Index: mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +=================================================================== +--- mozilla.orig/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 2012-02-22 14:20:22.000000000 +0000 ++++ mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 2012-02-23 16:57:18.783367775 +0000 +@@ -50,6 +50,7 @@ + #include "nsNetUtil.h" + #include "nsISupportsPrimitives.h" + #include "nsIGSettingsService.h" ++#include "nsInterfaceHashtable.h" + + class nsUnixSystemProxySettings : public nsISystemProxySettings { + public: +@@ -64,6 +65,8 @@ + + nsCOMPtr mGConf; + nsCOMPtr mGSettings; ++ nsCOMPtr mProxySettings; ++ nsInterfaceHashtable mSchemeProxySettings; + bool IsProxyMode(const char* aMode); + nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult); + nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult); +@@ -76,8 +79,14 @@ + nsresult + nsUnixSystemProxySettings::Init() + { ++ mSchemeProxySettings.Init(5); + mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); ++ if (mGSettings) { ++ mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), ++ getter_AddRefs(mProxySettings)); ++ } ++ + return NS_OK; + } + +@@ -92,22 +101,17 @@ + nsresult + nsUnixSystemProxySettings::GetPACURI(nsACString& aResult) + { +- if (mGSettings) { +- nsCOMPtr proxy_settings; +- mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), +- getter_AddRefs(proxy_settings)); +- if (proxy_settings) { +- nsCString proxyMode; +- // Check if mode is auto +- nsresult rv = proxy_settings->GetString(NS_LITERAL_CSTRING("mode"), proxyMode); +- if (rv == NS_OK && proxyMode.Equals("auto")) { +- return proxy_settings->GetString(NS_LITERAL_CSTRING("autoconfig-url"), aResult); +- } +- /* The org.gnome.system.proxy schema has been found, but auto mode is not set. +- * Don't try the GConf and return empty string. */ +- aResult.Truncate(); +- return NS_OK; ++ if (mProxySettings) { ++ nsCString proxyMode; ++ // Check if mode is auto ++ nsresult rv = mProxySettings->GetString(NS_LITERAL_CSTRING("mode"), proxyMode); ++ if (rv == NS_OK && proxyMode.Equals("auto")) { ++ return mProxySettings->GetString(NS_LITERAL_CSTRING("autoconfig-url"), aResult); + } ++ /* The org.gnome.system.proxy schema has been found, but auto mode is not set. ++ * Don't try the GConf and return empty string. */ ++ aResult.Truncate(); ++ return NS_OK; + } + + if (mGConf && IsProxyMode("auto")) { +@@ -266,10 +270,16 @@ + nsUnixSystemProxySettings::SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, + nsACString& aResult) + { +- nsCOMPtr proxy_settings; +- nsresult rv = mGSettings->GetCollectionForSchema(nsDependentCString(aKeyBase), +- getter_AddRefs(proxy_settings)); +- NS_ENSURE_SUCCESS(rv, rv); ++ nsDependentCString key(aKeyBase); ++ ++ nsCOMPtr proxy_settings = mSchemeProxySettings.Get(key); ++ nsresult rv; ++ if (!proxy_settings) { ++ rv = mGSettings->GetCollectionForSchema(key, getter_AddRefs(proxy_settings)); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ mSchemeProxySettings.Put(key, proxy_settings); ++ } + + nsCAutoString host; + rv = proxy_settings->GetString(NS_LITERAL_CSTRING("host"), host); +@@ -451,15 +461,8 @@ + PRInt32 aPort, + nsACString& aResult) + { +- nsCOMPtr proxy_settings; +- nsresult rv; +- +- rv = mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), +- getter_AddRefs(proxy_settings)); +- NS_ENSURE_SUCCESS(rv, rv); +- + nsCString proxyMode; +- rv = proxy_settings->GetString(NS_LITERAL_CSTRING("mode"), proxyMode); ++ nsresult rv = mProxySettings->GetString(NS_LITERAL_CSTRING("mode"), proxyMode); + NS_ENSURE_SUCCESS(rv, rv); + + if (!proxyMode.Equals("manual")) { +@@ -468,7 +471,7 @@ + } + + nsCOMPtr ignoreList; +- if (NS_SUCCEEDED(proxy_settings->GetStringList(NS_LITERAL_CSTRING("ignore-hosts"), ++ if (NS_SUCCEEDED(mProxySettings->GetStringList(NS_LITERAL_CSTRING("ignore-hosts"), + getter_AddRefs(ignoreList))) && ignoreList) { + PRUint32 len = 0; + ignoreList->GetLength(&len); +@@ -525,7 +528,7 @@ + rv = aURI->GetPort(&port); + NS_ENSURE_SUCCESS(rv, rv); + +- if (mGSettings) { ++ if (mProxySettings) { + rv = GetProxyFromGSettings(scheme, host, port, aResult); + if (rv == NS_OK) + return rv; diff -Nru firefox-10.0.2+build1/debian/patches/firefox-kde.patch firefox-11.0+build1/debian/patches/firefox-kde.patch --- firefox-10.0.2+build1/debian/patches/firefox-kde.patch 2012-03-10 01:13:14.000000000 +0000 +++ firefox-11.0+build1/debian/patches/firefox-kde.patch 2012-03-10 01:14:06.000000000 +0000 @@ -6,11 +6,15 @@ Bug-OpenSUSE: https://bugzilla.novell.com/show_bug.cgi?id=170055 Forwarded: no -Index: mozilla/browser/base/content/browser-kde.xul -=================================================================== ---- mozilla.orig/browser/base/content/browser-kde.xul 2012-01-13 10:45:33.000000000 +0000 -+++ mozilla/browser/base/content/browser-kde.xul 2012-01-13 10:58:03.547808616 +0000 -@@ -200,7 +200,7 @@ +diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul +--- a/browser/base/content/browser-kde.xul ++++ b/browser/base/content/browser-kde.xul +@@ -197,17 +197,17 @@ + class="editBookmarkPanelHeaderButton" + oncommand="StarUI.removeBookmarkButtonCommand();" + accesskey="&editBookmark.removeBookmark.accessKey;"/> + +