Use upstream's version of our patch to set the default browser

When setting the default browser, we want to set it to 'firefox %s'
instead of '/usr/lib{,64}/firefox-4/firefox %s'

firefox-default.patch did the job for us for a bit, but upstream now
has a patch to do this which we can now use.  The patch will check
to see if MOZ_APP_LAUNCHER is passed, and if so, it will use only
the basename when setting the default browser.  We already set
MOZ_APP_LAUNCHER, so just need to switch to using the patch.

From https://bugzilla.mozilla.org/show_bug.cgi?id=611953
Patch 1 - Use MOZ_APP_LAUNCHER for default browser executable (v3, un-bitrotted)

1 files changed, 0 insertions, 34 deletions

diff --git a/firefox-default.patch b/firefox-default.patch
deleted file mode 100644
index bd631bb..0000000
--- a/firefox-default.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp.default mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp
---- mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp.default	2011-02-07 14:53:16.883934747 -0800
-+++ mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp	2011-02-07 17:11:55.209941360 -0800
-@@ -104,8 +104,6 @@ static const char kDesktopColorKey[] = D
- nsresult
- nsGNOMEShellService::Init()
- {
--  nsresult rv;
--
-   // GConf _must_ be available, or we do not allow
-   // CreateInstance to succeed.
- 
-@@ -120,19 +118,9 @@ nsGNOMEShellService::Init()
-   // the locale encoding.  If it's not set, they use UTF-8.
-   mUseLocaleFilenames = PR_GetEnv("G_BROKEN_FILENAMES") != nsnull;
- 
--  nsCOMPtr<nsIProperties> dirSvc
--    (do_GetService("@mozilla.org/file/directory_service;1"));
--  NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE);
--
--  nsCOMPtr<nsILocalFile> appPath;
--  rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile),
--                   getter_AddRefs(appPath));
--  NS_ENSURE_SUCCESS(rv, rv);
-+  mAppPath.Assign(NS_LITERAL_CSTRING(MOZ_APP_NAME));
- 
--  rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME));
--  NS_ENSURE_SUCCESS(rv, rv);
--
--  return appPath->GetNativePath(mAppPath);
-+  return NS_OK;
- }
- 
- NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService)