diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index fdfa407..59a5295 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Nov 23 22:31:21 CET 2009 - wr@rosenauer.org - -- 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 831af3b..c4e80e3 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -160,8 +160,8 @@ install -m 644 %{SOURCE6} browser/app/profile/kde.js %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch14 -p1 -%patch17 -p1 +%patch14 +%patch17 %build export MOZ_BUILD_DATE=%{releasedate} diff --git a/credits.patch b/credits.patch index 383540f..1795952 100644 --- a/credits.patch +++ b/credits.patch @@ -1,23 +1,14 @@ -diff --git a/browser/base/content/credits.xhtml b/browser/base/content/credits.xhtml ---- a/browser/base/content/credits.xhtml -+++ b/browser/base/content/credits.xhtml -@@ -579,16 +579,19 @@ -
  • Satoko Takita Yamaguchi (Chibi)
  • -
  • Christine Yen
  • +Index: browser/base/content/credits.xhtml +================================================================================ +--- browser/base/content/credits.xhtml ++++ browser/base/content/credits.xhtml +@@ -431,6 +431,9 @@
  • Kohei Yoshino
  • -
  • Shigeru Yoshitake
  • Boris Zbarsky
  • -
  • Marco Zehe
  • -
  • Matthew Zeier
  • + +

    openSUSE RPM packaging

    + -
    - &credit.translation; -
    + &credit.translation; - - -
    diff --git a/firefox-appname.patch b/firefox-appname.patch index 88e8daa..4556b8d 100644 --- a/firefox-appname.patch +++ b/firefox-appname.patch @@ -1,12 +1,6 @@ -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); - +--- browser/components/shell/src/nsGNOMEShellService.cpp ++++ browser/components/shell/src/nsGNOMEShellService.cpp +@@ -133,7 +133,11 @@ rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME)); NS_ENSURE_SUCCESS(rv, rv); @@ -18,9 +12,4 @@ diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/comp + return NS_OK; } - NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService) - - PRBool - nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const - { - + NS_IMPL_ISUPPORTS2(nsGNOMEShellService, nsIShellService, nsIShellService_MOZILLA_1_8_BRANCH)