- update to Firefox 31.0 (bnc#887746)

- use EGL on ARM
- rebased patches
- requires NSS 3.16.2
- requires python-devel (not only python)

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=389

MozillaFirefox.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sun Jul 20 18:11:44 UTC 2014 - wr@rosenauer.org
+
+- update to Firefox 31.0 (bnc#887746)
+- use EGL on ARM
+- rebased patches
+- requires NSS 3.16.2
+- requires python-devel (not only python)
+
 -------------------------------------------------------------------
 Mon Jun  9 08:28:17 UTC 2014 - wr@rosenauer.org
 

MozillaFirefox.spec

@@ -17,7 +17,7 @@
 #
 
 
-%define major 30
+%define major 31
 %define mainver %major.0
 %define update_channel release
 
@@ -41,7 +41,7 @@ BuildRequires:  libgnomeui-devel
 BuildRequires:  libidl-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  makeinfo
-BuildRequires:  python
+BuildRequires:  python-devel
 BuildRequires:  startup-notification-devel
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
@@ -55,7 +55,7 @@ BuildRequires:  libproxy-devel
 BuildRequires:  wireless-tools
 %endif
 BuildRequires:  mozilla-nspr-devel >= 4.10.6
-BuildRequires:  mozilla-nss-devel >= 3.16
+BuildRequires:  mozilla-nss-devel >= 3.16.2
 BuildRequires:  nss-shared-helper-devel
 BuildRequires:  pkgconfig(libpulse)
 %if %suse_version > 1210
@@ -74,7 +74,7 @@ Recommends:     gstreamer-0_10-plugins-ffmpeg
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2014060900
+%define         releasedate 2014072000
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser

compare-locales.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acccf9b3b483f646264bbcb09ef709955a16e743dd3deb693a189aa775c50ee7
+oid sha256:0711a6e8cb68050de808a96c9e0b5b5c1d39992749e88239a714df1285b1fc17
-size 28508
+size 28420

create-tar.sh

@@ -2,8 +2,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_30_0_RELEASE"
+RELEASE_TAG="FIREFOX_31_0_RELEASE"
-VERSION="30.0"
+VERSION="31.0"
 
 # mozilla
 if [ -d mozilla ]; then

firefox-30.0-source.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:90179c3e6b747141f1f8d787135e2dc5879dae1c7be24cf3a8ae36e66e156258
-size 121266984

firefox-31.0-source.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e62ec32aa7a1fe90af08062df4f4a4750a430a7f384c4abfd6b22149bdd12af0
+size 125311096

firefox-branded-icons.patch

@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent ab6659ccbfbbfed31bce1bcd696a820069b9d7c0
+# Parent 9745e5d5cdc7e91dbfc5582b49881668cb6725f7
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
@@ -29,13 +29,13 @@ diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
 --- a/browser/branding/official/Makefile.in
 +++ b/browser/branding/official/Makefile.in
-@@ -36,18 +36,21 @@ BRANDING_FILES := \
+@@ -35,18 +35,21 @@ BRANDING_FILES := \
  	document.icns \
  	dsstore \
  	$(NULL)
  endif
  
- ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ ifdef MOZ_WIDGET_GTK
  BRANDING_FILES := \
  	default16.png \
 +	default22.png \
@@ -54,7 +54,7 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/M
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -611,18 +611,21 @@
+@@ -613,18 +613,21 @@
  @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
  @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
  @BINPATH@/chrome/toolkit@JAREXT@

firefox-kde.patch

@@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1219 @@
+@@ -0,0 +1,1197 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -554,7 +554,7 @@ new file mode 100644
 +             iconsize="small"
 +             aria-label="&tabsToolbar.label;"
 +             context="toolbar-context-menu"
-+             defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
++             defaultset="tabbrowser-tabs,new-tab-button,alltabs-button"
 +             collapsed="true">
 +
 +#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
@@ -605,13 +605,6 @@ new file mode 100644
 +        </menupopup>
 +      </toolbarbutton>
 +
-+      <toolbarbutton id="tabs-closebutton"
-+                     class="close-button tabs-closebutton close-icon"
-+                     command="cmd_close"
-+                     label="&closeTab.label;"
-+                     cui-areatype="toolbar"
-+                     tooltiptext="&closeTab.label;"/>
-+
 +#if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT)
 +      <hbox class="private-browsing-indicator" skipintoolbarset="true"/>
 +#endif
@@ -651,7 +644,7 @@ new file mode 100644
 +
 +      <hbox id="nav-bar-customization-target" flex="1">
 +        <toolbaritem id="urlbar-container" flex="400" persist="width"
-+                     forwarddisabled="true" title="&locationItem.title;" removable="false"
++                     title="&locationItem.title;" removable="false"
 +                     cui-areatype="toolbar"
 +                     class="chromeclass-location" overflows="false">
 +          <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
@@ -661,21 +654,14 @@ new file mode 100644
 +                         onclick="checkForMiddleClick(this, event);"
 +                         tooltip="back-button-tooltip"
 +                         context="backForwardMenu"/>
-+          <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++          <hbox id="urlbar-wrapper" flex="1">
-+                         label="&forwardCmd.label;"
++            <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-+                         command="Browser:ForwardOrForwardDuplicate"
++                           label="&forwardCmd.label;"
-+                         cui-areatype="toolbar"
++                           command="Browser:ForwardOrForwardDuplicate"
-+                         onclick="checkForMiddleClick(this, event);"
++                           cui-areatype="toolbar"
-+                         tooltip="forward-button-tooltip"
++                           onclick="checkForMiddleClick(this, event);"
-+                         context="backForwardMenu"/>
++                           tooltip="forward-button-tooltip"
-+          <dummyobservertarget hidden="true"
++                           context="backForwardMenu"/>
-+                               onbroadcast="if (this.getAttribute('disabled') == 'true')
-+                                              this.parentNode.setAttribute('forwarddisabled', 'true');
-+                                            else
-+                                              this.parentNode.removeAttribute('forwarddisabled');">
-+            <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
-+          </dummyobservertarget>
-+          <hbox id="urlbar-wrapper" flex="1" align="center">
 +            <textbox id="urlbar" flex="1"
 +                     placeholder="&urlbar.placeholder2;"
 +                     type="autocomplete"
@@ -713,6 +699,8 @@ new file mode 100644
 +                <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
++                <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/>
++                <image id="translated-notification-icon" class="notification-anchor-icon" role="button"/>
 +              </box>
 +              <!-- Use onclick instead of normal popup= syntax since the popup
 +                   code fires onmousedown, and hence eats our favicon drag events.
@@ -967,7 +955,6 @@ new file mode 100644
 +             collapsed="true"
 +             customizable="true">
 +      <toolbaritem id="personal-bookmarks"
-+                   flex="1"
 +                   title="&bookmarksToolbarItem.label;"
 +                   cui-areatype="toolbar"
 +                   removable="true">
@@ -1070,7 +1057,7 @@ new file mode 100644
 +        <sidebarheader id="sidebar-header" align="center">
 +          <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
 +          <image id="sidebar-throbber"/>
-+          <toolbarbutton class="tabs-closebutton close-icon" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
++          <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
 +        </sidebarheader>
 +        <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
 +                  style="min-width: 14em; width: 18em; max-width: 36em;"/>
@@ -1197,22 +1184,13 @@ new file mode 100644
 +
 +  <svg:svg height="0">
 +#include tab-shape.inc.svg
-+
-+#ifndef XP_MACOSX
-+    <svg:clipPath id="keyhole-forward-clip-path" clipPathUnits="objectBoundingBox">
-+      <svg:path d="m 0,0 c .3,.25 .3,.75, 0,1 l 1,0 0,-1 z"/>
-+    </svg:clipPath>
 +    <svg:clipPath id="urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
-+      <svg:path d="m 0,-5 l 0,7.8 c 2.5,3.2 4,6.2 4,10.2 c 0,4 -1.5,7 -4,10 l 0,22l10000,0 l 0,-50 l -10000,0 z"/>
++#ifndef XP_MACOSX
-+    </svg:clipPath>
++      <svg:path d="m 1,-5 l 0,7.8 c 2.5,3.2 4,6.2 4,10.2 c 0,4 -1.5,7 -4,10 l 0,22l10000,0 l 0,-50 l -10000,0 z"/>
 +#else
-+    <svg:clipPath id="osx-keyhole-forward-clip-path" clipPathUnits="userSpaceOnUse">
++      <svg:path d="M -11,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/>
-+      <svg:path d="M 0,0 a 16 16 0 0 1 0,24 l 10000,0 l 0,-24 l -10000,0 z"/>
-+    </svg:clipPath>
-+    <svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
-+      <svg:path d="M -12,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/>
-+    </svg:clipPath>
 +#endif
++    </svg:clipPath>
 +  </svg:svg>
 +
 +</vbox>
@@ -1225,7 +1203,7 @@ new file mode 100644
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -62,16 +62,18 @@ browser.jar:
+@@ -65,16 +65,18 @@ browser.jar:
          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
          content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
          content/browser/aboutSocialError.xhtml        (content/aboutSocialError.xhtml)
@@ -1239,11 +1217,11 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
  *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
  *       content/browser/chatWindow.xul                (content/chatWindow.xul)
          content/browser/content.js                    (content/content.js)
+         content/browser/fonts/ClearSans-Regular.woff  (content/fonts/ClearSans-Regular.woff)
+         content/browser/fonts/FiraSans-Regular.woff   (content/fonts/FiraSans-Regular.woff)
+         content/browser/fonts/FiraSans-Light.woff     (content/fonts/FiraSans-Light.woff)
          content/browser/newtab/newTab.xul             (content/newtab/newTab.xul)
  *       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
-         content/browser/newtab/newTab.css             (content/newtab/newTab.css)
-         content/browser/newtab/preloaderContent.js    (content/newtab/preloaderContent.js)
- *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 --- a/browser/components/build/nsModule.cpp
 +++ b/browser/components/build/nsModule.cpp
@@ -1307,7 +1285,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
 --- a/browser/components/preferences/advanced.js
 +++ b/browser/components/preferences/advanced.js
-@@ -24,16 +24,22 @@ var gAdvancedPane = {
+@@ -25,16 +25,22 @@ var gAdvancedPane = {
      if (extraArgs && extraArgs["advancedTab"]){
        advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
      } else {
@@ -1330,7 +1308,7 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
      // when the user will select the default.  We refresh here periodically
      // in case the default changes.  On other Windows OS's defaults can also
      // be set while the prefs are open.
-@@ -903,14 +909,25 @@ var gAdvancedPane = {
+@@ -884,14 +890,25 @@ var gAdvancedPane = {
     * Set browser as the operating system default browser.
     */
    setDefaultBrowser: function()
@@ -1398,16 +1376,18 @@ diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/compon
 new file mode 100644
 --- /dev/null
 +++ b/browser/components/shell/src/nsKDEShellService.cpp
-@@ -0,0 +1,234 @@
+@@ -0,0 +1,238 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +
++#include "mozilla/ArrayUtils.h"
++
++#include "nsCOMPtr.h"
 +#include "nsKDEShellService.h"
 +#include "nsShellService.h"
 +#include "nsKDEUtils.h"
-+#include "nsCOMPtr.h"
 +#include "nsIPrefService.h"
 +#include "nsIProcess.h"
 +#include "nsIFile.h"
@@ -1417,21 +1397,23 @@ new file mode 100644
 +#include "nsISupportsPrimitives.h"
 +#include "nsArrayUtils.h"
 +
++using namespace mozilla;
++
 +nsresult
 +nsKDEShellService::Init()
-+    {
++{
 +    if( !nsKDEUtils::kdeSupport())
 +        return NS_ERROR_NOT_AVAILABLE;
 +    return NS_OK;
-+    }
++}
 +
-+NS_IMPL_ISUPPORTS1(nsKDEShellService, nsIShellService)
++NS_IMPL_ISUPPORTS(nsKDEShellService, nsIShellService)
 +
 +NS_IMETHODIMP
 +nsKDEShellService::IsDefaultBrowser(bool aStartupCheck,
 +                                    bool aForAllTypes,
 +                                    bool* aIsDefaultBrowser)
-+    {
++{
 +    *aIsDefaultBrowser = false;
 +    if (aStartupCheck)
 +        mCheckedThisSession = true;
@@ -1450,12 +1432,12 @@ new file mode 100644
 +    if( nsKDEUtils::command( command ))
 +        *aIsDefaultBrowser = true;
 +    return NS_OK;
-+    }
++}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::SetDefaultBrowser(bool aClaimAllTypes,
 +                                     bool aForAllUsers)
-+    {
++{
 +    nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
 +    if (!command)
 +        return NS_ERROR_FAILURE;
@@ -1472,7 +1454,7 @@ new file mode 100644
 +    command->AppendElement( paramstr, false );
 +
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
-+    }
++}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::GetShouldCheckDefaultBrowser(bool* aResult)
@@ -1519,25 +1501,25 @@ new file mode 100644
 +NS_IMETHODIMP
 +nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement,
 +                                          PRInt32 aPosition)
-+    {
++{
 +    return NS_ERROR_NOT_IMPLEMENTED;
-+    }
++}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::GetDesktopBackgroundColor(PRUint32 *aColor)
-+    {
++{
 +    return NS_ERROR_NOT_IMPLEMENTED;
-+    }
++}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::SetDesktopBackgroundColor(PRUint32 aColor)
-+    {
++{
 +    return NS_ERROR_NOT_IMPLEMENTED;
-+    }
++}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::OpenApplication(PRInt32 aApplication)
-+    {
++{
 +    nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
 +    if (!command)
 +        return NS_ERROR_FAILURE;
@@ -1555,11 +1537,11 @@ new file mode 100644
 +
 +    command->AppendElement( str, false );
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
-+    }
++}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::OpenApplicationWithURI(nsIFile* aApplication, const nsACString& aURI)
-+    {
++{
 +    nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
 +    if (!command)
 +        return NS_ERROR_FAILURE;
@@ -1580,11 +1562,11 @@ new file mode 100644
 +    uristr->SetData( aURI );
 +    command->AppendElement( uristr, false );
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
-+    }
++}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::GetDefaultFeedReader(nsIFile** _retval)
-+    {
++{
 +    *_retval = nullptr;
 +
 +    nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
@@ -1632,12 +1614,12 @@ new file mode 100644
 +
 +    NS_ADDREF(*_retval = defaultReader);
 +    return NS_OK;
-+    }
++}
 diff --git a/browser/components/shell/src/nsKDEShellService.h b/browser/components/shell/src/nsKDEShellService.h
 new file mode 100644
 --- /dev/null
 +++ b/browser/components/shell/src/nsKDEShellService.h
-@@ -0,0 +1,59 @@
+@@ -0,0 +1,60 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -1679,11 +1661,12 @@ new file mode 100644
 +
 +#include "nsIShellService.h"
 +#include "nsStringAPI.h"
++#include "mozilla/Attributes.h"
 +
-+class nsKDEShellService : public nsIShellService
++class nsKDEShellService MOZ_FINAL : public nsIShellService
 +{
 +public:
-+  nsKDEShellService() : mCheckedThisSession(PR_FALSE) { }
++  nsKDEShellService() : mCheckedThisSession(false) { }
 +
 +  NS_DECL_ISUPPORTS
 +  NS_DECL_NSISHELLSERVICE
@@ -1693,7 +1676,7 @@ new file mode 100644
 +private:
 +  ~nsKDEShellService() {}
 +
-+  PRPackedBool mCheckedThisSession;
++  bool mCheckedThisSession;
 +};
 +
 +#endif // nskdeshellservice_h____
@@ -1807,7 +1790,7 @@ new file mode 100644
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -641,19 +641,21 @@
+@@ -643,19 +643,21 @@
  @BINPATH@/defaults/autoconfig/prefcalls.js
  @BINPATH@/browser/defaults/profile/prefs.js
  

l10n-30.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8e44a2e8fbe3fc63ae5867b2622f7b1dfdba83796a8533cbbfd494372ed8870
-size 40423444

l10n-31.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:475dead32b497029f817389c06c6ceb374032aa34e125667ea20361feed76c8d
+size 40772080

mozilla-kde.patch

@@ -44,7 +44,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
  #include "prefread.h"
  #include "prefapi_private_data.h"
  
-@@ -1119,16 +1120,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -1134,16 +1135,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
  {
@@ -79,7 +79,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
      return NS_OK;
  
    bool hasMore;
-@@ -1144,17 +1163,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1159,17 +1178,17 @@ static nsresult pref_LoadPrefsInDirList(
  
      nsAutoCString leaf;
      path->GetNativeLeafName(leaf);
@@ -98,7 +98,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
  {
    nsZipItemPtr<char> manifest(jarReader, name, true);
    NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1248,26 +1267,38 @@ static nsresult pref_InitInitialObjects(
+@@ -1263,26 +1282,38 @@ static nsresult pref_InitInitialObjects(
    /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
    static const char* specialFiles[] = {
  #if defined(XP_MACOSX)
@@ -196,7 +196,7 @@ diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downl
 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
 --- a/toolkit/components/downloads/nsDownloadManager.cpp
 +++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -42,16 +42,20 @@
+@@ -43,16 +43,20 @@
  #ifdef XP_WIN
  #include <shlobj.h>
  #include "nsWindowsHelpers.h"
@@ -217,7 +217,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
  #include "AndroidBridge.h"
  using namespace mozilla::widget::android;
  #endif
-@@ -2695,16 +2699,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2722,16 +2726,25 @@ nsDownload::SetState(DownloadState aStat
        nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
  
        // Master pref to control this function.
@@ -243,7 +243,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
          int64_t goat = PR_Now() - mStartTime;
          showTaskbarAlert = goat > alertIntervalUSec;
  
-@@ -2732,19 +2745,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2759,19 +2772,20 @@ nsDownload::SetState(DownloadState aStat
                // because if it is, they'll click open the download manager and
                // the items they downloaded will have been removed.
                alerts->ShowAlertNotification(
@@ -268,7 +268,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -56,29 +56,33 @@ toolkit.jar:
+@@ -58,29 +58,33 @@ toolkit.jar:
     content/global/viewZoomOverlay.js          (viewZoomOverlay.js)
  *+ content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)
     content/global/bindings/browser.xml         (widgets/browser.xml)
@@ -290,7 +290,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
     content/global/bindings/menulist.xml        (widgets/menulist.xml)
     content/global/bindings/notification.xml    (widgets/notification.xml)
     content/global/bindings/numberbox.xml       (widgets/numberbox.xml)
-    content/global/bindings/popup.xml           (widgets/popup.xml)
+ *  content/global/bindings/popup.xml           (widgets/popup.xml)
  *+ content/global/bindings/preferences.xml     (widgets/preferences.xml)
 +*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml)
 +% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde
@@ -760,7 +760,7 @@ diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widge
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1334 @@
+@@ -0,0 +1,1333 @@
 +<?xml version="1.0"?>
 +
 +<!DOCTYPE bindings [
@@ -1335,9 +1335,8 @@ new file mode 100644
 +          <children includes="prefpane"/>
 +        </xul:deck>
 +      </xul:hbox>
-+      <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons"
++      <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons" pack="end">
 +#ifdef XP_UNIX_GNOME
-+                >
 +        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
 +        <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
 +        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
@@ -1346,16 +1345,14 @@ new file mode 100644
 +        <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
 +        <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
 +#elif XP_UNIX
-+                >
++        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
-+	<xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
++        <xul:spacer anonid="spacer" flex="1"/>
-+	<xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
++        <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
-+	<xul:spacer anonid="spacer" flex="1"/>
++        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
-+	<xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
++        <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
-+	<xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
++        <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
-+	<xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
++        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
-+	<xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
 +#else
-+                pack="end">
 +        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
 +        <xul:spacer anonid="spacer" flex="1"/>
 +        <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
@@ -1384,6 +1381,8 @@ new file mode 100644
 +#ifdef XP_MACOSX
 +            // no buttons on Mac except Help
 +            cancelButton.hidden = true;
++            // Move Help button to the end
++            document.getAnonymousElementByAttribute(this, "anonid", "spacer").hidden = true;         
 +            // Also, don't fire onDialogAccept on enter
 +            acceptButton.disabled = true;
 +#else
@@ -2129,7 +2128,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
 +  nsresult GetProxyFromKDE(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
  };
  
- NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
+ NS_IMPL_ISUPPORTS(nsUnixSystemProxySettings, nsISystemProxySettings)
  
  NS_IMETHODIMP
  nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
@@ -2900,32 +2899,35 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
      if (QDesktopServices::openUrl(QUrl(spec.get()))) {
        rv = NS_OK;
      }
-@@ -48,22 +51,22 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
+@@ -50,24 +53,24 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
- {
-   // if mDefaultApplication is set, it means the application has been set from
    // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to
    // give the GNOME answer.
    if (mDefaultApplication)
      return nsMIMEInfoImpl::GetHasDefaultHandler(_retval);
  
    *_retval = false;
--  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
+ 
-+  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType);
+   if (mClass ==  eProtocolInfo) {
-   if (!mimeInfo) {
+-    *_retval = nsGNOMERegistry::HandlerExists(mSchemeOrType.get());
-     nsAutoCString ext;
++    *_retval = nsCommonRegistry::HandlerExists(mSchemeOrType.get());
-     nsresult rv = GetPrimaryExtension(ext);
+   } else {
-     if (NS_SUCCEEDED(rv)) {
+-    nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
--      mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
++    nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType);
-+      mimeInfo = nsCommonRegistry::GetFromExtension(ext);
+     if (!mimeInfo) {
+       nsAutoCString ext;
+       nsresult rv = GetPrimaryExtension(ext);
+       if (NS_SUCCEEDED(rv)) {
+-        mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
++        mimeInfo = nsCommonRegistry::GetFromExtension(ext);
+       }
      }
+     if (mimeInfo)
+       *_retval = true;
    }
-   if (mimeInfo)
-     *_retval = true;
  
    if (*_retval)
      return NS_OK;
- 
+@@ -102,16 +105,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
-@@ -97,16 +100,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
      ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
    if (action.isValid()) {
      action.trigger();
@@ -2959,7 +2961,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
      nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
      NS_ENSURE_SUCCESS(rv, rv);
      nsCOMPtr<nsIURI> uri;
-@@ -124,17 +144,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -129,17 +149,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
      /* Fallback to GnomeVFS */
      nsCOMPtr<nsIGnomeVFSMimeApp> app;
      if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
@@ -3000,7 +3002,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  #include "nsXPIDLString.h"
  #include "nsIURL.h"
  #include "nsIFileStreams.h"
-@@ -1157,26 +1157,26 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1146,26 +1146,26 @@ nsresult nsOSHelperAppService::OSProtoco
      ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':');
  
    if (action.isValid())
@@ -3029,12 +3031,12 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  
  nsresult nsOSHelperAppService::GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile)
  {
-@@ -1263,17 +1263,17 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1252,17 +1252,17 @@ nsOSHelperAppService::GetFromExtension(c
                                           mime_types_description,
                                           true);
  
    if (NS_FAILED(rv) || majorType.IsEmpty()) {
-     
+ 
  #ifdef MOZ_WIDGET_GTK
      LOG(("Looking in GNOME registry\n"));
      nsRefPtr<nsMIMEInfoBase> gnomeInfo =
@@ -3048,14 +3050,14 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  
      rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
                                    majorType,
-@@ -1386,17 +1386,17 @@ nsOSHelperAppService::GetFromType(const 
+@@ -1372,17 +1372,17 @@ nsOSHelperAppService::GetFromType(const 
  #ifdef MOZ_WIDGET_GTK
    nsRefPtr<nsMIMEInfoBase> gnomeInfo;
    if (handler.IsEmpty()) {
      // No useful data yet.  Check the GNOME registry.  Unfortunately, newer
      // GNOME versions no longer have type-to-extension mappings, so we might
      // get back a MIMEInfo without any extensions set.  In that case we'll have
-     // to look in our mime.types files for the extensions.    
+     // to look in our mime.types files for the extensions.
      LOG(("Looking in GNOME registry\n"));
 -    gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType);
 +    gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType);
@@ -3143,7 +3145,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  
    mFilters.AppendElement(filter);
    mFilterNames.AppendElement(name);
-@@ -350,16 +354,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -351,16 +355,32 @@ nsFilePicker::Show(int16_t *aReturn)
  
  NS_IMETHODIMP
  nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@@ -3176,7 +3178,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  
    GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
    const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -538,8 +558,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -539,8 +559,235 @@ nsFilePicker::Done(GtkWidget* file_choos
    if (mCallback) {
      mCallback->Done(result);
      mCallback = nullptr;
@@ -3600,7 +3602,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  #include "prmem.h"
  #include "plbase64.h"
  
-@@ -1813,46 +1814,52 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1816,46 +1817,52 @@ nsLocalFile::SetPersistentDescriptor(con
      return InitWithNativePath(aPersistentDescriptor);
  #endif
  }
@@ -3667,7 +3669,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
        return rv;
      }
      return NS_ERROR_FAILURE;
-@@ -1860,16 +1867,23 @@ nsLocalFile::Reveal()
+@@ -1863,16 +1870,23 @@ nsLocalFile::Reveal()
      return NS_ERROR_FAILURE;
  #endif
  }

mozilla-shared-nss-db.patch

@@ -7,7 +7,7 @@ References:
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8069,16 +8069,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+@@ -8231,16 +8231,31 @@ if test "$MOZ_ENABLE_SKIA"; then
      MOZ_ENABLE_SKIA_GPU=1
      AC_DEFINE(USE_SKIA_GPU)
      AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@@ -79,7 +79,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
  #include "nsCertVerificationThread.h"
  #include "nsAppDirectoryServiceDefs.h"
  #include "nsComponentManagerUtils.h"
-@@ -1129,17 +1136,31 @@ nsNSSComponent::InitializeNSS()
+@@ -1141,17 +1148,31 @@ nsNSSComponent::InitializeNSS()
    if (NS_FAILED(rv)) {
      nsPSMInitPanic::SetPanic();
      return NS_ERROR_NOT_AVAILABLE;
@@ -112,14 +112,14 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
      if (init_rv != SECSuccess) {
        PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n"));
      }
-diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
+diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk
---- a/toolkit/library/Makefile.in
+--- a/toolkit/library/libxul.mk
-+++ b/toolkit/library/Makefile.in
++++ b/toolkit/library/libxul.mk
-@@ -161,17 +161,17 @@ endif
+@@ -146,17 +146,17 @@ OS_LIBS += $(call EXPAND_LIBNAME,mfuuid 
- ifneq (,$(filter WINNT,$(OS_ARCH)))
+ endif
- SDK_LIBRARY = $(IMPORT_LIBRARY)
+ 
- else
+ ifdef MOZ_DIRECTSHOW
- SDK_LIBRARY = $(SHARED_LIBRARY)
+ OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo)
  endif
  
  EXTRA_DSO_LDOPTS += $(LIBS_DIR)
@@ -128,9 +128,9 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
 +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS)
  
  ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
- CXXFLAGS += $(TK_CFLAGS)
  OS_LIBS += \
    $(TK_LIBS) \
    $(NULL)
  endif
  
+ ifeq (OpenBSD,$(OS_ARCH))

source-stamp.txt

@@ -1,2 +1,2 @@
-REV=529a45c94e5a
+REV=32dddf30405a
 REPO=http://hg.mozilla.org/releases/mozilla-release