# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1437224519 -7200
# Node ID 284da266ec465181f3aed60dc57674ffdd2ef3a6
# Parent  3af93b7e5e3dd1eff3603d64a8fa4342b2ab996e
40beta rebase

diff -r 3af93b7e5e3d -r 284da266ec46 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Sat Jul 18 14:48:41 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Sat Jul 18 15:01:59 2015 +0200
@@ -2,6 +2,9 @@
 Sat Jul 18 12:47:47 UTC 2015 - wr@rosenauer.org
 
 - update to Firefox 40.0b5
+- remove obsolete patch
+  * mozilla-add-glibcxx_use_cxx11_abi.patch
+- rebased patches
 
 -------------------------------------------------------------------
 Wed Jul  1 06:43:02 UTC 2015 - wr@rosenauer.org
diff -r 3af93b7e5e3d -r 284da266ec46 MozillaFirefox/mozilla-add-glibcxx_use_cxx11_abi.patch
--- a/MozillaFirefox/mozilla-add-glibcxx_use_cxx11_abi.patch	Sat Jul 18 14:48:41 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-add-glibcxx_use_cxx11_abi.patch
\ No newline at end of file
diff -r 3af93b7e5e3d -r 284da266ec46 firefox-branded-icons.patch
--- a/firefox-branded-icons.patch	Sat Jul 18 14:48:41 2015 +0200
+++ b/firefox-branded-icons.patch	Sat Jul 18 15:01:59 2015 +0200
@@ -1,10 +1,11 @@
 # HG changeset patch
 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
+# Parent  d938107fbc91e13c9cc60be7de200fe891826ca1
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -62,16 +62,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
+@@ -55,16 +55,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
  endif
  
  ifdef MOZ_WIDGET_GTK
@@ -26,37 +27,31 @@
  	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
  	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
  endif
-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
-@@ -35,18 +35,21 @@ BRANDING_FILES := \
- 	document.icns \
- 	dsstore \
- 	$(NULL)
- endif
- 
- ifdef MOZ_WIDGET_GTK
- BRANDING_FILES := \
- 	default16.png \
-+	default22.png \
-+	default24.png \
- 	default32.png \
- 	default48.png \
-+	default256.png \
- 	mozicon128.png \
- 	$(NULL)
- endif
- 
- BRANDING_DEST := $(DIST)/branding
- BRANDING_TARGET := export
- INSTALL_TARGETS += BRANDING
- 
+diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild
+--- a/browser/branding/branding-common.mozbuild
++++ b/browser/branding/branding-common.mozbuild
+@@ -32,12 +32,15 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
+         'disk.icns',
+         'document.icns',
+         'dsstore',
+         'firefox.icns',
+     ]
+ elif CONFIG['MOZ_WIDGET_GTK']:
+     BRANDING_FILES += [
+         'default16.png',
++	'default22.png',
++	'default24.png',
+         'default32.png',
+         'default48.png',
++	'default256.png',
+         'mozicon128.png',
+     ]
 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
-@@ -654,18 +654,21 @@
+@@ -669,18 +669,21 @@
+ @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
  @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
- @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
  @RESPATH@/chrome/toolkit@JAREXT@
  @RESPATH@/chrome/toolkit.manifest
  @RESPATH@/chrome/recording.manifest
diff -r 3af93b7e5e3d -r 284da266ec46 firefox-kde.patch
--- a/firefox-kde.patch	Sat Jul 18 14:48:41 2015 +0200
+++ b/firefox-kde.patch	Sat Jul 18 15:01:59 2015 +0200
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  cd94ee18bd0cdda7f5eb5503d8d072efe02a8033
+# Parent  32cde807c82c4420d152346fd441826a1658f27c
 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1308 @@
+@@ -0,0 +1,1314 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -788,6 +788,7 @@
 +                <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
++                <image id="push-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
@@ -838,7 +839,7 @@
 +                <image id="readinglist-addremove-button"
 +                       class="urlbar-icon"
 +                       hidden="true"
-+                       onclick="ReadingListUI.togglePageByBrowser(gBrowser.selectedBrowser);"/>
++                       onclick="ReadingListUI.buttonClick(event);"/>
 +                <image id="reader-mode-button"
 +                       class="urlbar-icon"
 +                       hidden="true"
@@ -1298,13 +1299,18 @@
 +
 +  <svg:svg height="0">
 +#include tab-shape.inc.svg
-+    <svg:clipPath id="urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
++    <svg:clipPath id="urlbar-back-button-clip-path">
 +#ifndef XP_MACOSX
-+      <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"/>
++      <svg:path d="M -9,-4 l 0,1 a 15 15 0 0,1 0,30 l 0,1 l 10000,0 l 0,-32 l -10000,0 z" />
 +#else
 +      <svg:path d="M -11,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/>
 +#endif
 +    </svg:clipPath>
++#ifdef XP_WIN
++    <svg:clipPath id="urlbar-back-button-clip-path-win10">
++      <svg:path d="M -6,-2 l 0,1 a 15 15 0 0,1 0,30 l 0,1 l 10000,0 l 0,-32 l -10000,0 z" />
++    </svg:clipPath>
++#endif
 +  </svg:svg>
 +
 +</vbox>
@@ -1336,7 +1342,7 @@
          <button id="editBookmarkPanelDeleteButton"
                  class="editBookmarkPanelBottomButton"
                  label="&editBookmark.cancel.label;"
-@@ -1234,17 +1234,17 @@
+@@ -1235,17 +1235,17 @@
  
    <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
      <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@@ -1463,7 +1469,7 @@
      // 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.
-@@ -549,16 +555,27 @@ var gMainPane = {
+@@ -524,16 +530,27 @@ var gMainPane = {
     */
    setDefaultBrowser: function()
    {
@@ -1931,7 +1937,7 @@
 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
-@@ -698,19 +698,21 @@
+@@ -703,19 +703,21 @@
  @RESPATH@/defaults/autoconfig/prefcalls.js
  @RESPATH@/browser/defaults/profile/prefs.js
  
diff -r 3af93b7e5e3d -r 284da266ec46 firefox-multilocale-chrome.patch
--- a/firefox-multilocale-chrome.patch	Sat Jul 18 14:48:41 2015 +0200
+++ b/firefox-multilocale-chrome.patch	Sat Jul 18 15:01:59 2015 +0200
@@ -1,17 +1,17 @@
 # HG changeset patch
 # Parent 16846914f968944f991c8b12fdc38ce8fc099d73
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent  c0a406c7a6cc5edc8fb34549428866ff39ad878f
+# Parent  adcf975f1f5a796da0b1926a67beba003fd08b6b
 Add searchplugins to chrome packaging for proper localization
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -378,16 +378,20 @@ pref("browser.helperApps.deleteTempFileO
- #endif
+@@ -389,16 +389,20 @@ pref("browser.search.searchEnginesURL", 
  
- // search engines URL
- pref("browser.search.searchEnginesURL",      "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
+ // Tell the search service to load search plugins from the locale JAR
+ pref("browser.search.loadFromJars", true);
+ pref("browser.search.jarURIs", "chrome://browser/locale/searchplugins/");
  
  // pointer to the default engine name
  pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
@@ -31,23 +31,20 @@
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -66,27 +66,30 @@ STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST
+@@ -63,24 +63,27 @@ UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(ST
+ 
+ STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST)/$(PKG_INST_PATH)'; \
+     $(RM) '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
      cp ../installer/windows/l10ngen/stub.exe '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
      chmod 0755 '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
      $(NULL)
  endif
  
- ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
- SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt))
- else
 -SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg
 +SEARCHPLUGINS_NAMES = $(shell cat \
 +    $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
 +    @srcdir@/en-US/searchplugins/list.txt ) ) ddg
- endif
- SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins
- # metro build call a searchplugins target for search engine plugins
- .PHONY: searchplugins
+ SEARCHPLUGINS_PATH := .deps/generated_$(AB_CD)
  SEARCHPLUGINS_TARGET := libs searchplugins
 -SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
 +#SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
@@ -58,14 +55,14 @@
 -PP_TARGETS += SEARCHPLUGINS
 +#PP_TARGETS += SEARCHPLUGINS
  
+ list-txt = $(SEARCHPLUGINS_PATH)/list.txt
+ GARBAGE += $(list-txt)
+ 
+ libs:: searchplugins
+ 
  # Required for l10n.mk - defines a list of app sub dirs that should
  # be included in langpack xpis.
- ifdef MOZ_METRO
- # metro build, include both app folders
- DIST_SUBDIRS = browser metro
- else
- DIST_SUBDIRS = $(DIST_SUBDIR)
-@@ -120,16 +123,39 @@ NO_JA_JP_MAC_AB_CD := $(if $(filter ja-J
+@@ -119,16 +122,39 @@ NO_JA_JP_MAC_AB_CD := $(if $(filter ja-J
  libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
  
  libs:: $(addprefix generic/profile/,$(PROFILE_FILES))
@@ -108,9 +105,9 @@
 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 --- a/browser/locales/jar.mn
 +++ b/browser/locales/jar.mn
-@@ -146,14 +146,15 @@
-     locale/browser/syncQuota.properties         (%chrome/browser/syncQuota.properties)
- #endif
+@@ -152,14 +152,15 @@
+     locale/browser/searchplugins/list.txt       (.deps/generated_@AB_CD@/list.txt)
+     locale/browser/searchplugins/               (.deps/generated_@AB_CD@/*.xml)
  % locale browser-region @AB_CD@ %locale/browser-region/
      locale/browser-region/region.properties        (%chrome/browser-region/region.properties)
  # the following files are browser-specific overrides
diff -r 3af93b7e5e3d -r 284da266ec46 firefox-no-default-ualocale.patch
--- a/firefox-no-default-ualocale.patch	Sat Jul 18 14:48:41 2015 +0200
+++ b/firefox-no-default-ualocale.patch	Sat Jul 18 15:01:59 2015 +0200
@@ -1,14 +1,14 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
 # Parent 099312626f5f7c9cb5573a61d0230574ee12a660
-# Parent  9e46107bf33966236739600abba9dc8d97fd9d7f
+# Parent  970a562bc8bcf10cdcb0ae5b6f0f8b360bb2f241
 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -251,17 +251,17 @@ pref("browser.uitour.url", "https://www.
- pref("browser.uitour.readerViewTrigger", "^https:\/\/www\.mozilla\.org\/[^\/]+\/firefox\/reading\/start");
+@@ -254,17 +254,17 @@ pref("browser.uitour.url", "https://www.
+ pref("browser.uitour.readerViewTrigger", "^https:\\/\\/www\\.mozilla\\.org\\/[^\\/]+\\/firefox\\/reading\\/start");
  
  pref("browser.customizemode.tip0.shown", false);
  pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");
diff -r 3af93b7e5e3d -r 284da266ec46 mozilla-add-glibcxx_use_cxx11_abi.patch
--- a/mozilla-add-glibcxx_use_cxx11_abi.patch	Sat Jul 18 14:48:41 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-From 32b9943e0d2c7c28d9d113c0e83d121c356fe5d5 Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh+mozilla@glandium.org>
-Date: Fri, 10 Apr 2015 16:53:05 +0900
-Subject: [PATCH] Bug 1153109 - Add -D_GLIBCXX_USE_CXX11_ABI=0 to CXXFLAGS when
- building with --enable-stdcxx-compat
-
-patch grab from https://bugzilla.mozilla.org/show_bug.cgi?id=1153109
-
----
- configure.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.in b/configure.in
-index 95d2a70..6c858b3 100644
---- a/configure.in
-+++ b/configure.in
-@@ -7375,16 +7375,18 @@ STDCXX_COMPAT=
- MOZ_ARG_ENABLE_BOOL(stdcxx-compat,
- [  --enable-stdcxx-compat  Enable compatibility with older libstdc++],
-     STDCXX_COMPAT=1)
- 
- if test -n "$STDCXX_COMPAT"; then
-    eval $(CXX="$CXX" HOST_CXX="$HOST_CXX" $PYTHON -m mozbuild.configure.libstdcxx)
-    AC_SUBST(MOZ_LIBSTDCXX_TARGET_VERSION)
-    AC_SUBST(MOZ_LIBSTDCXX_HOST_VERSION)
-+   CXXFLAGS="$CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
-+   HOST_CXXFLAGS="$HOST_CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
- fi
- 
- dnl ========================================================
- dnl =
- dnl = Profiling and Instrumenting
- dnl =
- dnl ========================================================
- MOZ_ARG_HEADER(Profiling and Instrumenting)
diff -r 3af93b7e5e3d -r 284da266ec46 mozilla-kde.patch
--- a/mozilla-kde.patch	Sat Jul 18 14:48:41 2015 +0200
+++ b/mozilla-kde.patch	Sat Jul 18 15:01:59 2015 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  214f99f3ce4f1f8ae9b3d18da44e5d66b3105663
+# Parent  372d46509a8899feb3473becff869159d01f1f4c
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -46,7 +46,7 @@
  #include "prefread.h"
  #include "prefapi_private_data.h"
  
-@@ -1165,16 +1166,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -1154,16 +1155,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
  {
@@ -81,7 +81,7 @@
      return NS_OK;
  
    bool hasMore;
-@@ -1190,17 +1209,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1179,17 +1198,17 @@ static nsresult pref_LoadPrefsInDirList(
  
      nsAutoCString leaf;
      path->GetNativeLeafName(leaf);
@@ -100,7 +100,7 @@
  {
    nsZipItemPtr<char> manifest(jarReader, name, true);
    NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1294,26 +1313,38 @@ static nsresult pref_InitInitialObjects(
+@@ -1283,26 +1302,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)
@@ -184,7 +184,7 @@
 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
 --- a/toolkit/components/downloads/moz.build
 +++ b/toolkit/components/downloads/moz.build
-@@ -52,14 +52,15 @@ if not CONFIG['MOZ_SUITE']:
+@@ -67,14 +67,15 @@ if not CONFIG['MOZ_SUITE']:
      ]
  
  FAIL_ON_WARNINGS = True
@@ -225,7 +225,7 @@
  #include "AndroidBridge.h"
  #endif
  
-@@ -2716,16 +2720,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2711,16 +2715,25 @@ nsDownload::SetState(DownloadState aStat
        nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
  
        // Master pref to control this function.
@@ -251,7 +251,7 @@
          int64_t goat = PR_Now() - mStartTime;
          showTaskbarAlert = goat > alertIntervalUSec;
  
-@@ -2756,16 +2769,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2751,16 +2764,17 @@ nsDownload::SetState(DownloadState aStat
                    NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
                    message, !removeWhenDone,
                    mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
@@ -272,7 +272,7 @@
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -57,29 +57,33 @@ toolkit.jar:
+@@ -60,29 +60,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)
@@ -310,7 +310,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/dialog-kde.xml
-@@ -0,0 +1,455 @@
+@@ -0,0 +1,460 @@
 +<?xml version="1.0"?>
 +<!-- 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
@@ -344,7 +344,7 @@
 +        <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
 +#elif XP_UNIX
 +                >
-+        <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
++	<xul:button dlgtype="help" class="dialog-button" hidden="true"/>
 +	<xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
 +	<xul:spacer anonid="spacer" flex="1"/>
 +	<xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
@@ -426,11 +426,16 @@
 +            sizeToContent();
 +          }
 +
-+          var xOffset = (opener.outerWidth - window.outerWidth) / 2;
-+          var yOffset = opener.outerHeight / 5;
++          if (opener) {
++            var xOffset = (opener.outerWidth - window.outerWidth) / 2;
++            var yOffset = opener.outerHeight / 5;
 +
-+          var newX = opener.screenX + xOffset;
-+          var newY = opener.screenY + yOffset;
++            var newX = opener.screenX + xOffset;
++            var newY = opener.screenY + yOffset;
++          } else {
++            newX = (screen.availWidth - window.outerWidth) / 2;
++            newY = (screen.availHeight - window.outerHeight) / 2;
++          }
 +
 +          // ensure the window is fully onscreen (if smaller than the screen)
 +          if (newX < screen.availLeft)
@@ -770,7 +775,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1350 @@
+@@ -0,0 +1,1357 @@
 +<?xml version="1.0"?>
 +
 +<!DOCTYPE bindings [
@@ -1394,9 +1399,11 @@
 +      <constructor>
 +      <![CDATA[
 +        if (this.type != "child") {
-+          var psvc = Components.classes["@mozilla.org/preferences-service;1"]
-+                               .getService(Components.interfaces.nsIPrefBranch);
-+          this.instantApply = psvc.getBoolPref("browser.preferences.instantApply");
++          if (!this._instantApplyInitialized) {
++            let psvc = Components.classes["@mozilla.org/preferences-service;1"]
++                                 .getService(Components.interfaces.nsIPrefBranch);
++            this.instantApply = psvc.getBoolPref("browser.preferences.instantApply");
++          }
 +          if (this.instantApply) {
 +            var docElt = document.documentElement;
 +            var acceptButton = docElt.getButton("accept");
@@ -1466,8 +1473,13 @@
 +      ]]>
 +      </destructor>
 +
++      <!-- Derived bindings can set this to true to cause us to skip
++           reading the browser.preferences.instantApply pref in the constructor.
++           Then they can set instantApply to their wished value. -->
++      <field name="_instantApplyInitialized">false</field>
++      <!-- Controls whether changed pref values take effect immediately. -->
 +      <field name="instantApply">false</field>
-+      
++
 +      <property name="preferencePanes"
 +                onget="return this.getElementsByTagName('prefpane');"/>
 +
@@ -3466,7 +3478,7 @@
 diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
 --- a/xpcom/components/ManifestParser.cpp
 +++ b/xpcom/components/ManifestParser.cpp
-@@ -34,16 +34,17 @@
+@@ -35,16 +35,17 @@
  
  #include "nsIConsoleService.h"
  #include "nsIScriptError.h"
@@ -3484,7 +3496,7 @@
  #define XPTONLY_MANIFEST nullptr
  #define XPTONLY_XPT nullptr
  #endif
-@@ -489,16 +490,17 @@ ParseManifest(NSLocationType aType, File
+@@ -494,16 +495,17 @@ ParseManifest(NSLocationType aType, File
    NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
    NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
    NS_NAMED_LITERAL_STRING(kApplication, "application");
@@ -3502,7 +3514,7 @@
    NS_NAMED_LITERAL_STRING(kMain, "main");
    NS_NAMED_LITERAL_STRING(kContent, "content");
  
-@@ -549,44 +551,49 @@ ParseManifest(NSLocationType aType, File
+@@ -554,44 +556,49 @@ ParseManifest(NSLocationType aType, File
          CopyUTF8toUTF16(s, abi);
          abi.Insert(char16_t('_'), 0);
          abi.Insert(osTarget, 0);
@@ -3552,7 +3564,7 @@
      process = kMain;
    }
  
-@@ -681,25 +688,27 @@ ParseManifest(NSLocationType aType, File
+@@ -694,25 +701,27 @@ ParseManifest(NSLocationType aType, File
      TriState stOsVersion = eUnspecified;
      TriState stOs = eUnspecified;
      TriState stABI = eUnspecified;
@@ -3580,7 +3592,7 @@
        }
  
  #if defined(MOZ_WIDGET_ANDROID)
-@@ -749,16 +758,17 @@ ParseManifest(NSLocationType aType, File
+@@ -762,16 +771,17 @@ ParseManifest(NSLocationType aType, File
      }
  
      if (!ok ||
@@ -3601,7 +3613,7 @@
 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 --- a/xpcom/components/moz.build
 +++ b/xpcom/components/moz.build
-@@ -48,12 +48,13 @@ FINAL_LIBRARY = 'xul'
+@@ -46,12 +46,13 @@ FINAL_LIBRARY = 'xul'
  GENERATED_INCLUDES += ['..']
  LOCAL_INCLUDES += [
      '../base',
@@ -3636,7 +3648,7 @@
  #include "prmem.h"
  #include "plbase64.h"
  
-@@ -1964,42 +1965,52 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1960,42 +1961,52 @@ nsLocalFile::SetPersistentDescriptor(con
    return InitWithNativePath(aPersistentDescriptor);
  #endif
  }
@@ -3695,7 +3707,7 @@
      return rv;
    }
    return NS_ERROR_FAILURE;
-@@ -2007,16 +2018,22 @@ nsLocalFile::Reveal()
+@@ -2003,16 +2014,22 @@ nsLocalFile::Reveal()
    return NS_ERROR_FAILURE;
  #endif
  }
diff -r 3af93b7e5e3d -r 284da266ec46 mozilla-repo.patch
--- a/mozilla-repo.patch	Sat Jul 18 14:48:41 2015 +0200
+++ b/mozilla-repo.patch	Sat Jul 18 15:01:59 2015 +0200
@@ -1,11 +1,11 @@
 # HG changeset patch
 # Parent 80b6464bd883864fce57e8748010869af1be69e9
-# Parent  7f246bc54e416716e50efe50c0edf154b26be658
+# Parent  af6547866a1a2fe0a3a84064f77d8693bff5becc
 
 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
 --- a/toolkit/mozapps/installer/package-name.mk
 +++ b/toolkit/mozapps/installer/package-name.mk
-@@ -137,24 +137,24 @@ else
+@@ -142,24 +142,24 @@ else
  BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
  endif
  
@@ -29,6 +29,6 @@
  MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt
  MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json
  MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json
+ MOZ_TEST_PACKAGES_FILE = $(DIST)/$(PKG_PATH)/test_packages.json
+ MOZ_TEST_PACKAGES_FILE_TC = $(DIST)/$(PKG_PATH)/test_packages_tc.json
  
- # JavaScript Shell
- PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip
diff -r 3af93b7e5e3d -r 284da266ec46 mozilla-shared-nss-db.patch
--- a/mozilla-shared-nss-db.patch	Sat Jul 18 14:48:41 2015 +0200
+++ b/mozilla-shared-nss-db.patch	Sat Jul 18 15:01:59 2015 +0200
@@ -7,7 +7,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8247,16 +8247,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+@@ -8217,16 +8217,31 @@ if test "$MOZ_ENABLE_SKIA"; then
      MOZ_ENABLE_SKIA_GPU=1
      AC_DEFINE(USE_SKIA_GPU)
      AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@@ -42,9 +42,9 @@
 diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build
 --- a/security/manager/ssl/src/moz.build
 +++ b/security/manager/ssl/src/moz.build
-@@ -74,16 +74,19 @@ UNIFIED_SOURCES += [
- SOURCES += [
-     'nsNSSCertificateDB.cpp',
+@@ -81,16 +81,19 @@ SOURCES += [
+ IPDL_SOURCES += [
+     'PPSMContentDownloader.ipdl',
  ]
  
  LOCAL_INCLUDES += [
@@ -87,7 +87,7 @@
  #include "nsAppDirectoryServiceDefs.h"
  #include "nsCertVerificationThread.h"
  #include "nsAppDirectoryServiceDefs.h"
-@@ -997,17 +1004,31 @@ nsNSSComponent::InitializeNSS()
+@@ -998,17 +1005,31 @@ nsNSSComponent::InitializeNSS()
    if (NS_FAILED(rv)) {
      nsPSMInitPanic::SetPanic();
      return NS_ERROR_NOT_AVAILABLE;
@@ -123,7 +123,7 @@
 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
 --- a/toolkit/library/moz.build
 +++ b/toolkit/library/moz.build
-@@ -207,16 +207,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG['
+@@ -197,16 +197,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG['
          'stagefright_omx',
      ]
  
diff -r 3af93b7e5e3d -r 284da266ec46 series
--- a/series	Sat Jul 18 14:48:41 2015 +0200
+++ b/series	Sat Jul 18 15:01:59 2015 +0200
@@ -14,7 +14,6 @@
 mozilla-openaes-decl.patch
 mozilla-skia-be-le.patch
 mozilla-bmo1005535.patch
-mozilla-add-glibcxx_use_cxx11_abi.patch
 mozilla-arm64-libjpeg-turbo.patch
 
 # Firefox patches