From 1c5dacba2cda0b8051d3f093432d3202b55bb326bc3912b41628ae213ff6e14a Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 24 Nov 2009 06:33:07 +0000 Subject: [PATCH] fix fuzz OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=132 --- MozillaFirefox.changes | 2 +- MozillaFirefox.spec | 2 +- firefox-appname.patch | 19 +++++++++++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 7b66da77..fdfa4076 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Nov 23 22:31:21 CET 2009 - wr@rosenauer.org -- rebased credits.patch for fuzz=0 +- rebased patches for fuzz=0 ------------------------------------------------------------------- Thu Nov 5 19:49:33 UTC 2009 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index bdfe3327..831af3b4 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -161,7 +161,7 @@ install -m 644 %{SOURCE6} browser/app/profile/kde.js %patch9 -p1 %patch10 -p1 %patch14 -p1 -%patch17 +%patch17 -p1 %build export MOZ_BUILD_DATE=%{releasedate} diff --git a/firefox-appname.patch b/firefox-appname.patch index 4556b8db..88e8daa1 100644 --- a/firefox-appname.patch +++ b/firefox-appname.patch @@ -1,6 +1,12 @@ ---- browser/components/shell/src/nsGNOMEShellService.cpp -+++ browser/components/shell/src/nsGNOMEShellService.cpp -@@ -133,7 +133,11 @@ +diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp +--- a/browser/components/shell/src/nsGNOMEShellService.cpp ++++ b/browser/components/shell/src/nsGNOMEShellService.cpp +@@ -129,17 +129,21 @@ nsGNOMEShellService::Init() + nsCOMPtr appPath; + rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile), + getter_AddRefs(appPath)); + NS_ENSURE_SUCCESS(rv, rv); + rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME)); NS_ENSURE_SUCCESS(rv, rv); @@ -12,4 +18,9 @@ + return NS_OK; } - NS_IMPL_ISUPPORTS2(nsGNOMEShellService, nsIShellService, nsIShellService_MOZILLA_1_8_BRANCH) + NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService) + + PRBool + nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const + { +