From ab690733cde666d5264bedadd09138e5f9edddff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 24 Jun 2010 18:31:16 +0200 Subject: firefox: latest patches from rawhide --- firefox-default.patch | 91 ++++++++++++++++++++++++++++++++++++++ firefox-disable-checkupdates.patch | 12 +++++ firefox.spec | 11 ++++- 3 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 firefox-default.patch create mode 100644 firefox-disable-checkupdates.patch diff --git a/firefox-default.patch b/firefox-default.patch new file mode 100644 index 0000000..7619fce --- /dev/null +++ b/firefox-default.patch @@ -0,0 +1,91 @@ +diff -up firefox-3.6.4/mozilla-1.9.2/browser/components/preferences/advanced.xul.default firefox-3.6.4/mozilla-1.9.2/browser/components/preferences/advanced.xul +--- firefox-3.6.4/mozilla-1.9.2/browser/components/preferences/advanced.xul.default 2010-06-11 22:40:51.000000000 +0200 ++++ firefox-3.6.4/mozilla-1.9.2/browser/components/preferences/advanced.xul 2010-06-24 11:42:36.000000000 +0200 +@@ -185,10 +185,11 @@ + + + #ifdef HAVE_SHELL_SERVICE ++#ifdef MOZ_CRASHREPORTER + + + +- ++#ifdef 0 + + + ++#endif + #ifdef MOZ_CRASHREPORTER + + #endif ++#endif + + + +diff -up firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.cpp.default firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.cpp +--- firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.cpp.default 2010-06-11 22:40:51.000000000 +0200 ++++ firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.cpp 2010-06-24 11:42:36.000000000 +0200 +@@ -140,27 +140,21 @@ NS_IMPL_ISUPPORTS1(nsGNOMEShellService, + PRBool + nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const + { ++ nsCAutoString appName; + +- gchar *commandPath; + if (mUseLocaleFilenames) { + gchar *nativePath = g_filename_from_utf8(aKeyValue, -1, NULL, NULL, NULL); + if (!nativePath) { + NS_ERROR("Error converting path to filesystem encoding"); + return PR_FALSE; + } +- +- commandPath = g_find_program_in_path(nativePath); ++ appName.Assign(nativePath); + g_free(nativePath); + } else { +- commandPath = g_find_program_in_path(aKeyValue); ++ appName.Assign(aKeyValue); + } +- +- if (!commandPath) +- return PR_FALSE; +- +- PRBool matches = mAppPath.Equals(commandPath); +- g_free(commandPath); +- return matches; ++ // Compare default browser command retrieved from gconf with MOZ_APP_NAME ++ return appName.EqualsLiteral(MOZ_APP_NAME); + } + + NS_IMETHODIMP +@@ -216,8 +210,8 @@ nsGNOMEShellService::SetDefaultBrowser(P + nsCOMPtr gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + + nsCAutoString schemeList; +- nsCAutoString appKeyValue(mAppPath); +- appKeyValue.Append(" \"%s\""); ++ nsCAutoString appKeyValue(MOZ_APP_NAME); ++ appKeyValue.Append(" %s"); + unsigned int i; + + for (i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) { +diff -up firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.h.default firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.h +--- firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.h.default 2010-06-11 22:40:51.000000000 +0200 ++++ firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.h 2010-06-24 11:42:36.000000000 +0200 +@@ -43,7 +43,7 @@ + class nsGNOMEShellService : public nsIShellService + { + public: +- nsGNOMEShellService() : mCheckedThisSession(PR_FALSE) { } ++ nsGNOMEShellService() : mCheckedThisSession(PR_TRUE) { } + + NS_DECL_ISUPPORTS + NS_DECL_NSISHELLSERVICE diff --git a/firefox-disable-checkupdates.patch b/firefox-disable-checkupdates.patch new file mode 100644 index 0000000..e3b8c97 --- /dev/null +++ b/firefox-disable-checkupdates.patch @@ -0,0 +1,12 @@ +diff -up mozilla-1.9.2/browser/base/content/utilityOverlay.js.checkForUpdates mozilla-1.9.2/browser/base/content/utilityOverlay.js +--- mozilla-1.9.2/browser/base/content/utilityOverlay.js.checkForUpdates 2010-06-13 15:36:16.617677299 -0700 ++++ mozilla-1.9.2/browser/base/content/utilityOverlay.js 2010-06-13 15:39:54.485387418 -0700 +@@ -510,7 +510,7 @@ function buildHelpMenu() + // Disable the UI if the update enabled pref has been locked by the + // administrator or if we cannot update for some other reason + var checkForUpdates = document.getElementById("checkForUpdates"); +- var canCheckForUpdates = updates.canCheckForUpdates; ++ var canCheckForUpdates = updates.canCheckForUpdates && updates.canApplyUpdates; + checkForUpdates.setAttribute("disabled", !canCheckForUpdates); + if (!canCheckForUpdates) + return; diff --git a/firefox.spec b/firefox.spec index 366ec8e..226e53e 100644 --- a/firefox.spec +++ b/firefox.spec @@ -54,7 +54,7 @@ Source100: find-external-requires Source200: firefox-bookmarks.html -# build patches +# build patches from xulrunner Patch0: firefox-version.patch Patch1: mozilla-build.patch Patch3: mozilla-jemalloc.patch @@ -65,6 +65,11 @@ Patch8: mozilla-plugin.patch Patch9: mozilla-build-sbrk.patch Patch11: nspr-build.patch +# build patches from firefox +Patch30: firefox-disable-checkupdates.patch +Patch31: firefox-default.patch + + # Fedora specific patches Patch20: mozilla-192-pkgconfig.patch @@ -180,6 +185,9 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{internal_version}/' %{P:%%PATCH0} \ %patch20 -p1 -b .pk +%patch30 -p1 -b .checkupdates +%patch31 -p2 -b .default + %patch100 -p1 -b .ps-pdf-simplify-operators %{__rm} -f .mozconfig @@ -517,6 +525,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Wed Jun 23 2010 Remi Collet - 3.6.4-1 - update to Firefox 3.6.4 finale +- sync with patches from rawhide / F-13 * Thu Jun 10 2010 Remi Collet - 3.6.4-0.4.build6 - F12 build -- cgit