- update to Firefox 61.0

* Performance enhancements * Various improvements for dark theme support will provide a more consistent experience across the entire Firefox UI * OpenSearch plugins offered by web pages can now be added from the page action menu for easier installation * Improved support for allowing WebExtensions to manage and hide tabs - requires NSS 3.37.3 - requires python >= 3.5 to build - removed obsolete patches mozilla-i586-DecoderDoctorLogger.patch mozilla-i586-domPrefs.patch mozilla-fix-skia-aarch64.patch mozilla-bmo1375074.patch mozilla-enable-csd.patch - patch for new no-return warnings (mozilla-no-return.patch) - do not disable system installed locales (mozilla-bmo1464766.patch) - Add conditional for pkgconfig(gconf-2.0) BuildRequires, and pass conditional --disable-gconf to configure: no longer pull in obsolete gconf2 for Tumbleweed. OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=673
2018-06-25 20:56:47 +00:00 · 2018-06-25 20:56:47 +00:00 · 206b6f2820
commit 206b6f2820
parent 2633645712
20 changed files with 383 additions and 382 deletions
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Sat Jun 23 07:25:51 UTC 2018 - wr@rosenauer.org
+
+- update to Firefox 61.0
+  * Performance enhancements
+  * Various improvements for dark theme support will provide a more
+    consistent experience across the entire Firefox UI
+  * OpenSearch plugins offered by web pages can now be added from the
+    page action menu for easier installation
+  * Improved support for allowing WebExtensions to manage and hide tabs
+- requires NSS 3.37.3
+- requires python >= 3.5 to build
+- removed obsolete patches
+  mozilla-i586-DecoderDoctorLogger.patch
+  mozilla-i586-domPrefs.patch
+  mozilla-fix-skia-aarch64.patch
+  mozilla-bmo1375074.patch
+  mozilla-enable-csd.patch
+- patch for new no-return warnings (mozilla-no-return.patch)
+- do not disable system installed locales (mozilla-bmo1464766.patch)
+
+-------------------------------------------------------------------
+Fri Jun  8 10:52:13 UTC 2018 - bjorn.lie@gmail.com
+
+- Add conditional for pkgconfig(gconf-2.0) BuildRequires, and pass
+  conditional --disable-gconf to configure: no longer pull in
+  obsolete gconf2 for Tumbleweed.
+
 -------------------------------------------------------------------
 Thu Jun  7 12:11:06 UTC 2018 - wr@rosenauer.org

--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@ -18,12 +18,14 @@


 # changed with every update
-%define major 60
-%define mainver %major.0.2
+%define major          61
+%define mainver        %major.0
+%define orig_version   61.0
+%define orig_suffix    %{nil}
 %define update_channel release
-%define branding 1
-%define releasedate 20180605171542
-%define source_prefix firefox-%{mainver}
+%define branding       1
+%define releasedate    20180621125625
+%define source_prefix  firefox-%{orig_version}

 # PIE, full relro (x86_64 for now)
 %define build_hardened 1
@ -73,9 +75,10 @@ BuildRequires:  libnotify-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  makeinfo
 BuildRequires:  mozilla-nspr-devel >= 4.19
-BuildRequires:  mozilla-nss-devel >= 3.36.4
+BuildRequires:  mozilla-nss-devel >= 3.37.3
 BuildRequires:  python-devel
 BuildRequires:  python2-xml
+BuildRequires:  python3 >= 3.5
 BuildRequires:  rust >= 1.24
 BuildRequires:  rust-std
 BuildRequires:  startup-notification-devel
@ -84,7 +87,9 @@ BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-libXt-devel
 BuildRequires:  yasm
 BuildRequires:  zip
+%if 0%{?suse_version} < 1550
 BuildRequires:  pkgconfig(gconf-2.0)
+%endif
 BuildRequires:  pkgconfig(gdk-x11-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.22
 BuildRequires:  pkgconfig(gobject-2.0)
@ -122,13 +127,13 @@ Summary:        Mozilla %{appname} Web Browser
 License:        MPL-2.0
 Group:          Productivity/Networking/Web/Browsers
 Url:            http://www.mozilla.org/
-Source:         http://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz
+Source:         http://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{orig_version}%{orig_suffix}.source.tar.xz
 Source1:        MozillaFirefox.desktop
 Source2:        MozillaFirefox-rpmlintrc
 Source3:        mozilla.sh.in
 Source5:        source-stamp.txt
 Source6:        kde.js
-Source7:        l10n-%{version}.tar.xz
+Source7:        l10n-%{orig_version}%{orig_suffix}.tar.xz
 Source8:        firefox-mimeinfo.xml
 Source9:        firefox.js
 Source10:       compare-locales.tar.xz
@ -143,7 +148,7 @@ Source16:       MozillaFirefox.changes
 # please get your own set of keys.
 Source18:       mozilla-api-key
 Source19:       google-api-key
-Source20:       http://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz.asc
+Source20:       http://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{orig_version}%{orig_suffix}.source.tar.xz.asc
 Source21:       mozilla.keyring
 # Gecko/Toolkit
 Patch1:         mozilla-nongnome-proxies.patch
@ -154,11 +159,8 @@ Patch5:         mozilla-no-stdcxx-check.patch
 Patch6:         mozilla-reduce-files-per-UnifiedBindings.patch
 Patch7:         mozilla-aarch64-startup-crash.patch
 Patch8:         mozilla-bmo256180.patch
-Patch9:         mozilla-i586-DecoderDoctorLogger.patch
-Patch10:        mozilla-i586-domPrefs.patch
-Patch11:        mozilla-enable-csd.patch
-Patch12:        mozilla-fix-skia-aarch64.patch
-Patch13:        mozilla-bmo1375074.patch
+Patch9:         mozilla-no-return.patch
+Patch10:        mozilla-bmo1464766.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-branded-icons.patch
@ -268,13 +270,8 @@ cd $RPM_BUILD_DIR/%{source_prefix}
 %endif
 %patch7 -p1
 %patch8 -p1
-%ifarch %ix86
 %patch9 -p1
 %patch10 -p1
-%endif
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
@ -340,6 +337,9 @@ ac_add_options --libdir=%{_libdir}
 ac_add_options --includedir=%{_includedir}
 ac_add_options --enable-release
 ac_add_options --enable-default-toolkit=cairo-gtk3
+%if 0%{?suse_version} >= 1550
+ac_add_options --disable-gconf
+%endif
 %if 0%{?build_hardened}
 ac_add_options --enable-pie
 %endif
@ -418,6 +418,7 @@ install -m 644 %{SOURCE6} %{buildroot}%{progdir}/browser/defaults/preferences/kd
 install -m 644 %{SOURCE9} %{buildroot}%{progdir}/browser/defaults/preferences/firefox.js
 # install additional locales
 %if %localize
+mkdir -p %{buildroot}%{progdir}/browser/extensions
 truncate -s 0 %{_tmppath}/translations.{common,other}
 sed -r '/^(ja-JP-mac|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{source_prefix}/browser/locales/shipped-locales \
    | xargs -P 8 -n 1 -I {} /bin/sh -c '
@ -576,11 +577,9 @@ exit 0
 %dir %{progdir}
 %dir %{progdir}/browser/
 %dir %{progdir}/browser/chrome/
-%dir %{progdir}/browser/extensions/
 %{progdir}/browser/defaults
 %{progdir}/browser/features/
 %{progdir}/browser/chrome/icons
-%{progdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
 %{progdir}/browser/blocklist.xml
 %{progdir}/browser/chrome.manifest
 %{progdir}/browser/omni.ja
@ -597,7 +596,6 @@ exit 0
 %{progdir}/application.ini
 %{progdir}/chrome.manifest
 %{progdir}/dependentlibs.list
-#%{progdir}/icudt*.dat
 %{progdir}/*.so
 %{progdir}/omni.ja
 %{progdir}/fonts/
--- a/compare-locales.tar.xz
+++ b/compare-locales.tar.xz
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:971053a42b39417bb7d549e3de0d4b267732bb961e5178bbc3a2340b58f84b31
+oid sha256:afe9b5aaf788e86ff4d2249b500e8cd457f7102a04d1d23db0ca6aa629e228d6
 size 28368
--- a/create-tar.sh
+++ b/create-tar.sh
@ -7,45 +7,15 @@

 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_60_0_2_RELEASE"
-VERSION="60.0.2"
+RELEASE_TAG="785d242a5b01d5f1094882aa2144d8e5e2791e06"
+VERSION="61.0"
+VERSION_SUFFIX=""
+LOCALE_FILE="firefox-$VERSION/browser/locales/l10n-changesets.json"

 # check required tools
 test -x /usr/bin/hg || ( echo "hg missing: execute zypper in mercurial"; exit 5 )
 test -x /usr/bin/jq || ( echo "jq missing: execute zypper in jq"; exit 5 )

-
-# mozilla
-if [ -d mozilla ]; then
-  pushd mozilla
-  _repourl=$(hg paths)
-  case "$_repourl" in
-    *$BRANCH*)
-      echo "updating previous tree"
-      hg pull
-      popd
-      ;;
-    * )
-      echo "removing obsolete tree"
-      popd
-      rm -rf mozilla
-      ;;
-  esac
-fi
-if [ ! -d mozilla ]; then
-  echo "cloning new $BRANCH..."
-  hg clone http://hg.mozilla.org/$BRANCH mozilla
-fi
-pushd mozilla
-hg update --check
-[ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG
-# get repo and source stamp
-echo -n "REV=" > ../source-stamp.txt
-hg -R . parent --template="{node|short}\n" >> ../source-stamp.txt
-echo -n "REPO=" >> ../source-stamp.txt
-hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" >> ../source-stamp.txt
-popd
-
 # use parallel compression, if available
 compression='-J'
 pixz -h > /dev/null 2>&1
@ -53,13 +23,52 @@ if (($? != 127)); then
  compression='-Ipixz'
 fi

-echo "creating archive..."
-tar $compression -cf firefox-$VERSION.source.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla
+# we might have an upstream archive already and can skip the checkout
+if [ -e firefox-$VERSION$VERSION_SUFFIX.source.tar.xz ]; then
+  echo "skip firefox checkout and use available archive"
+  # still need to extract the locale information from the archive
+  echo "extract locale changesets"
+  tar -xf firefox-$VERSION$VERSION_SUFFIX.source.tar.xz $LOCALE_FILE
+else
+  # mozilla
+  if [ -d firefox-$VERSION ]; then
+    pushd firefox-$VERSION
+    _repourl=$(hg paths)
+    case "$_repourl" in
+      *$BRANCH*)
+        echo "updating previous tree"
+        hg pull
+        popd
+        ;;
+      * )
+        echo "removing obsolete tree"
+        popd
+        rm -rf firefox-$VERSION
+        ;;
+    esac
+  fi
+  if [ ! -d firefox-$VERSION ]; then
+    echo "cloning new $BRANCH..."
+    hg clone http://hg.mozilla.org/$BRANCH firefox-$VERSION
+  fi
+  pushd firefox-$VERSION
+  hg update --check
+  [ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG
+  # get repo and source stamp
+  echo -n "REV=" > ../source-stamp.txt
+  hg -R . parent --template="{node|short}\n" >> ../source-stamp.txt
+  echo -n "REPO=" >> ../source-stamp.txt
+  hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" >> ../source-stamp.txt
+  popd
+
+  echo "creating archive..."
+  tar $compression -cf firefox-$VERSION$VERSION_SUFFIX.source.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS firefox-$VERSION
+fi

 # l10n
 echo "fetching locales..."
 test ! -d l10n && mkdir l10n
-jq -r 'to_entries[]| "\(.key) \(.value|.revision)"' mozilla/browser/locales/l10n-changesets.json | \
+jq -r 'to_entries[]| "\(.key) \(.value|.revision)"' $LOCALE_FILE | \
  while read locale changeset ; do
    case $locale in
      ja-JP-mac|en-US)
@ -73,7 +82,7 @@ jq -r 'to_entries[]| "\(.key) \(.value|.revision)"' mozilla/browser/locales/l10n
    esac
  done
 echo "creating l10n archive..."
-tar $compression -cf l10n-$VERSION.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n
+tar $compression -cf l10n-$VERSION$VERSION_SUFFIX.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n

 # compare-locales
 echo "creating compare-locales"
--- a/firefox-60.0.2.source.tar.xz
+++ b/firefox-60.0.2.source.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:764566a06b71164e7fd20b2b0e6b08a71b4ccd4d6fd61867eb08011a551f6725
-size 271930220
--- a/firefox-60.0.2.source.tar.xz.asc
+++ b/firefox-60.0.2.source.tar.xz.asc
@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iQIcBAABCAAGBQJbFuptAAoJELu+vbskxvNV2LMP/iZWM65JBnCbUL2GFecRvf41
-l8izB7XhECYWJE9XOJt0/wOCyugBpcM+Fmf5a3vrwt57cpANLIxoeefEUOU6VNPD
-a//aWs9m1GbCupO6Pxuhrwo+oUGUgMXDiEnfVhujriXWB5ZP/QlqvyqERJLYA5sk
-gvMvm5ua2ZfN0ko3qxpJfs0d+k70TDBFkNKcqmhROMCn+VY7sItqUSRcAe9Bu33A
-bVyahF9k4ko6HLV6JztqO8UHRh4bOnR3aYG++CqRrmTpzme/RbeLG37JW4oHPGPb
-jJwBzU1gHl7VQyhqKkdLLEvtz4O711xU45yksgaWTAtO+2hN6gdQTVsD7OaRuuE+
-hDeWYhqiXZGqqAHz2Mh+9bwa2NaJXPLpGAbNaMzk7eC4eQ+fcnNULA58XYuI3gkN
-8SVoE+7tCjvoTTOxW3jWmDwGnG/ObP8z5qtnOh81HZyKFxy9kzyL3DPOJKVhiSNo
-HBPXZd1z/Io6MlK6d0NntIavJkO+0RJ8m1EZYpvqZql0NKk9XpnOveWCGW1nwuXv
-oHddFavyuNw7u67WQrQdaSD3yCoCoB8Qc9IwcLiDy/Aznp9iLpbvZ569R3ehe9QK
-+V7DEIy+wM/yBu/qHGM/sPQwmgTMnItgECBxZaF4ikrb/XjVYmbvjrA7D4834zyt
-HfV/bjMvQdbV7v7QVKU8
-=FXyF
-----END PGP SIGNATURE-----
--- a/firefox-61.0.source.tar.xz
+++ b/firefox-61.0.source.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3453e8ac7c602390bda0d34a4a636e0d65fd89d9ae69f7aa1740926715c42268
+size 266932956
--- a/firefox-61.0.source.tar.xz.asc
+++ b/firefox-61.0.source.tar.xz.asc
@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAABCAAGBQJbLAYAAAoJELu+vbskxvNV74MQAImAjaPBzW2ytG6f3pK8A4VB
+fwhex7/7gaJv+Y5YdcIolRRMEzUJ7dVqPkoiQK+fE5yc3HX+/Vs5/YnGa6nt8Tml
+cootnuiXnONb3wClUByLbgFw2vfE7uy6vgoL2HaoWYKGVMo1n3zvs24upi6w3XV
+rbj0vvHY1Y7GfCUIuU8S85VYRxvtQB+UcGEUXy6Rtpb/hyPqzPqgctMRUmfLGUUr
+rTxgHhmOlPoMsCYp1QeFzhmAwHXa88I57KjIchMsVZhOWQ9rUQzU1WXSmIvUEU6C
+ukpouiFd7mMRkNpSVa86r+IWR40y6C8YpXq/yE3aSYiVZugenC3R2BkkAhBd5u++
+4AZN+yE7saA8EESmSGJ3BPKFe+4237Ux6cmpRjRjRMM805RdD2CBxuInYe07WSaY
+jQpV0zQY/AOI5m9wdqsH32F1u7B9GUt4u7L2wsOnvDT244OWL3OFWr1H1pGdWosJ
+y9WugGrR6qTfw76AUpc/GSkIsLDvs0552PwwAumkZ254hwA/pEnQlE1W5V81rMpr
+deB9ONVY7ZWLRNSM4G3M3Zh6a+FkLdDfBwvcyTazdEtjujxmgzUs2XNS4BPSxiu4
+fiRnyjkjY3ZLjDpAB1K4EvLg3kYhYop4XyUCnFTX0mopETFs84mRAKmzkIbT8osZ
+0aXJpCAJEq4ml8kSTvoS
+=TGCY
+-----END PGP SIGNATURE-----
--- a/firefox-branded-icons.patch
+++ b/firefox-branded-icons.patch
@ -1,11 +1,11 @@
 # HG changeset patch
 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
-# Parent  38e46d7f98d3e392de95d83660ecd147b30dc9aa
+# Parent  8a401a01454e9f5e8a357262d774e0ff348d9bc1

 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
-@@ -17,12 +17,15 @@ def FirefoxBranding():
+@@ -22,12 +22,15 @@ def FirefoxBranding():
         FINAL_TARGET_FILES.VisualElements += [
             'VisualElements_150.png',
             'VisualElements_70.png',
@ -24,9 +24,9 @@ diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/brandi
 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
-@@ -601,20 +601,23 @@
- @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
- @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+@@ -404,20 +404,23 @@
+ @RESPATH@/browser/chrome/pdfjs.manifest
+ @RESPATH@/browser/chrome/pdfjs/*
 @RESPATH@/chrome/toolkit@JAREXT@
 @RESPATH@/chrome/toolkit.manifest
 @RESPATH@/chrome/recording.manifest
@ -46,5 +46,5 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
 ; [Webide Files]
 @RESPATH@/browser/chrome/webide@JAREXT@
 @RESPATH@/browser/chrome/webide.manifest
- @RESPATH@/browser/@PREF_DIR@/webide-prefs.js
+ @RESPATH@/browser/@PREF_DIR@/webide.js
 
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  1b44c077e473c5a7d02fab26e2a220ebf219e0ab
+# Parent  242712e5a1879111d1a93a5d55dfae3fd5d47abc

 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,1280 @@
+@@ -0,0 +1,1293 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@ -21,14 +21,17 @@ new file mode 100644
 +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css"?>
+<?xml-stylesheet href="chrome://browser/skin/places/places.css"?>
+<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css"?>
 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/content/tabbrowser.css" type="text/css"?>
-+
-+<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?>
+<?xml-stylesheet href="chrome://browser/skin/compacttheme.css" type="text/css" alternate="yes" title="Light/Dark"?>
 +
 +# All DTD information is stored in a separate file so that it can be shared by
 +# hiddenWindow.xul.
+<!DOCTYPE window [
 +#include browser-doctype.inc
+]>
 +
 +<window id="main-window"
 +        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@ -51,14 +54,12 @@ new file mode 100644
 +        titlemodifier_normal="&mainWindow.titlemodifier;"
 +        titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
 +#endif
-+#ifdef CAN_DRAW_IN_TITLEBAR
 +#ifdef XP_WIN
 +        chromemargin="0,2,2,2"
 +#else
 +        chromemargin="0,-1,-1,-1"
 +#endif
 +        tabsintitlebar="true"
-+#endif
 +        titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
 +        windowtype="navigator:browser"
 +        macanimationtype="document"
@ -68,18 +69,33 @@ new file mode 100644
 +        retargetdocumentfocus="urlbar"
 +        persist="screenX screenY width height sizemode">
 +
-+# All JS files which are not content (only) dependent that browser.xul
-+# wishes to include *must* go into the global-scripts.inc file
-+# so that they can be shared by macBrowserOverlay.xul.
+# All JS files which are needed by browser.xul and other top level windows to
+# support MacOS specific features *must* go into the global-scripts.inc file so
+# that they can be shared with macWindow.inc.xul.
 +#include global-scripts.inc
 +
 +<script type="application/javascript">
 +  Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
 +  Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this);
+
+  ChromeUtils.defineModuleGetter(window,
+    "PlacesUtils", "resource://gre/modules/PlacesUtils.jsm");
+  ChromeUtils.defineModuleGetter(window,
+    "PlacesUIUtils", "resource:///modules/PlacesUIUtils.jsm");
+  ChromeUtils.defineModuleGetter(window,
+    "PlacesTransactions", "resource://gre/modules/PlacesTransactions.jsm");
+
+  ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+  XPCOMUtils.defineLazyScriptGetter(window, "PlacesTreeView",
+    "chrome://browser/content/places/treeView.js");
+  XPCOMUtils.defineLazyScriptGetter(window,
+    ["PlacesInsertionPoint", "PlacesController", "PlacesControllerDragHelper"],
+     "chrome://browser/content/places/controller.js");
 +</script>
 +
-+# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
-+# browser-sets.inc file for sharing with hiddenWindow.xul.
+# All sets except for popupsets (commands, keys, stringbundles and broadcasters)
+# *must* go into the browser-sets.inc file so that they can be shared with other
+# top level windows in macWindow.inc.xul.
 +#define FULL_BROWSER_WINDOW
 +#include browser-sets.inc
 +#undef FULL_BROWSER_WINDOW
@ -219,7 +235,7 @@ new file mode 100644
 +          <description id="editBookmarkPanelDescription"/>
 +        </vbox>
 +      </row>
-+      <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
+#include ../../components/places/content/editBookmarkPanel.inc.xul
 +      <hbox id="editBookmarkPanelBottomButtons" pack="end">
 +#ifdef XP_UNIX
 +        <button id="editBookmarkPanelDoneButton"
@ -403,7 +419,7 @@ new file mode 100644
 +#include browser-context.inc
 +    </menupopup>
 +
-+    <menupopup id="placesContext"/>
+#include ../../components/places/content/placesContextMenu.inc.xul
 +
 +    <panel id="ctrlTab-panel" hidden="true" norestorefocus="true" level="top">
 +      <hbox>
@ -432,7 +448,8 @@ new file mode 100644
 +           copyURL-title="&pageAction.copyLink.label;"
 +           emailLink-title="&emailPageCmd.label;"
 +           sendToDevice-title="&pageAction.sendTabToDevice.label;"
-+           sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;">
+           sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;"
+           shareURL-title="&pageAction.shareUrl.label;">
 +      <panelmultiview id="pageActionPanelMultiView"
 +                      mainViewId="pageActionPanelMainView"
 +                      viewCacheId="appMenu-viewCache">
@ -480,8 +497,7 @@ new file mode 100644
 +                oncommand="BrowserPageActions.openAboutAddonsForContextAction();"/>
 +    </menupopup>
 +
-+    <!-- Bookmarks and history tooltip -->
-+    <tooltip id="bhTooltip"/>
+#include ../../components/places/content/bookmarksHistoryTooltip.inc.xul
 +
 +    <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
 +
@ -515,15 +531,6 @@ new file mode 100644
 +      </vbox>
 +    </hbox>
 +
-+    <hbox id="bookmarked-notification-container" mousethrough="always">
-+      <vbox id="bookmarked-notification-anchor">
-+        <vbox id="bookmarked-notification"/>
-+      </vbox>
-+      <vbox id="bookmarked-notification-dropmarker-anchor">
-+        <image id="bookmarked-notification-dropmarker-icon"/>
-+      </vbox>
-+    </hbox>
-+
 +    <tooltip id="dynamic-shortcut-tooltip"
 +             onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
 +
@ -589,7 +596,6 @@ new file mode 100644
 +  </popupset>
 +  <box id="appMenu-viewCache" hidden="true"/>
 +
-+#ifdef CAN_DRAW_IN_TITLEBAR
 +<vbox id="titlebar">
 +  <hbox id="titlebar-content">
 +    <spacer id="titlebar-spacer" flex="1"/>
@ -611,7 +617,6 @@ new file mode 100644
 +#endif
 +  </hbox>
 +</vbox>
-+#endif
 +
 +  <toolbox id="navigator-toolbox">
 +    <!-- Menu -->
@ -626,17 +631,15 @@ new file mode 100644
 +#endif
 +             context="toolbar-context-menu">
 +      <toolbaritem id="menubar-items" align="center">
-+# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
-+# hiddenWindow.xul.
+# The entire main menubar is placed into browser-menubar.inc, so that it can be
+# shared with other top level windows in macWindow.inc.xul.
 +#include browser-menubar.inc
 +      </toolbaritem>
 +
-+#ifdef CAN_DRAW_IN_TITLEBAR
 +#ifndef XP_MACOSX
 +      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"
 +            skipintoolbarset="true"/>
 +#endif
-+#endif
 +    </toolbar>
 +
 +    <toolbar id="TabsToolbar"
@ -645,13 +648,9 @@ new file mode 100644
 +             customizable="true"
 +             mode="icons"
 +             aria-label="&tabsToolbar.label;"
-+             context="toolbar-context-menu"
-+             collapsed="true">
-+
-+#ifdef CAN_DRAW_IN_TITLEBAR
+             context="toolbar-context-menu">
 +      <hbox class="titlebar-placeholder" type="pre-tabs"
 +            skipintoolbarset="true"/>
-+#endif
 +
 +      <tabs id="tabbrowser-tabs"
 +            flex="1"
@ -675,7 +674,7 @@ new file mode 100644
 +                     removable="true"/>
 +
 +      <toolbarbutton id="alltabs-button"
-+                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button"
+                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button badged-button"
 +                     type="menu"
 +                     label="&listAllTabs.label;"
 +                     tooltiptext="&listAllTabs.label;"
@ -692,21 +691,23 @@ new file mode 100644
 +            <menupopup id="alltabs_containersMenuTab" />
 +          </menu>
 +          <menuseparator id="alltabs-popup-separator-2"/>
+          <menu id="alltabs_hiddenTabs"
+                label="&hiddenTabs.label;">
+            <menupopup id="alltabs_hiddenTabsMenu"/>
+          </menu>
+          <menuseparator id="alltabs-popup-separator-3"/>
 +        </menupopup>
 +      </toolbarbutton>
 +
-+#ifdef CAN_DRAW_IN_TITLEBAR
 +      <hbox class="titlebar-placeholder" type="post-tabs"
 +            ordinal="1000"
 +            skipintoolbarset="true"/>
-+#endif
 +
 +      <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;"
 +              ordinal="1000"
 +              aria-live="polite" skipintoolbarset="true"/>
 +      <hbox class="private-browsing-indicator" skipintoolbarset="true"
 +            ordinal="1000"/>
-+#ifdef CAN_DRAW_IN_TITLEBAR
 +      <hbox class="titlebar-placeholder" type="caption-buttons"
 +#ifndef XP_MACOSX
 +            ordinal="1000"
@ -717,7 +718,6 @@ new file mode 100644
 +      <hbox class="titlebar-placeholder" type="fullscreen-button"
 +            skipintoolbarset="true"/>
 +#endif
-+#endif
 +    </toolbar>
 +
 +    <toolbar id="nav-bar"
@ -876,7 +876,7 @@ new file mode 100644
 +                  <image id="midi-notification-icon" class="notification-anchor-icon midi-icon" role="button"
 +                         tooltiptext="&urlbar.midiNotificationAnchor.tooltip;"/>
 +                  <image id="webauthn-notification-icon" class="notification-anchor-icon" role="button"
-+                         tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/>
+                         tooltiptext="&urlbar.webAuthnAnchor.tooltip;"/>
 +                </box>
 +                <image id="connection-icon"/>
 +                <image id="extension-icon"/>
@ -1228,8 +1228,12 @@ new file mode 100644
 +                    onselect="if (event.target.localName == 'tabpanels') gBrowser.updateCurrentBrowser();">
 +          <tabpanels flex="1" class="plain" selectedIndex="0" id="tabbrowser-tabpanels">
 +            <notificationbox flex="1" notificationside="top">
-+              <hbox flex="1" class="browserSidebarContainer">
-+                <vbox flex="1" class="browserContainer">
+              <!-- Set large flex to allow the devtools toolbox to set a flex attribute.
+                   We don't want the toolbox to actually take up free space, but we do want it to collapse when the window shrinks, and with flex=0 it can't.
+                   When the toolbox is on the bottom it's a sibling of browserSidebarContainer,
+                   and when it's on the side it's a sibling of browserContainer.  -->
+              <hbox flex="10000" class="browserSidebarContainer">
+                <vbox flex="10000" class="browserContainer">
 +                  <stack flex="1" class="browserStack">
 +                    <browser id="tabbrowser-initialBrowser" type="content"
 +                             message="true" messagemanagergroup="browsers"
@ -1240,6 +1244,15 @@ new file mode 100644
 +                             selectmenulist="ContentSelectDropdown"
 +                             datetimepicker="DateTimePickerPanel"/>
 +                  </stack>
+                  <hbox id="statuspanel" inactive="true" layer="true">
+                    <hbox id="statuspanel-inner">
+                      <label id="statuspanel-label"
+                             role="status"
+                             aria-live="off"
+                             flex="1"
+                             crop="end"/>
+                    </hbox>
+                  </hbox>
 +                </vbox>
 +              </hbox>
 +            </notificationbox>
@ -1289,7 +1302,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
-@@ -42,16 +42,18 @@ browser.jar:
+@@ -44,16 +44,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/aboutTabCrashed.css           (content/aboutTabCrashed.css)
@ -1330,7 +1343,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
 
 #include "rdf.h"
 #include "nsFeedSniffer.h"
-@@ -32,18 +32,16 @@ using namespace mozilla::browser;
+@@ -31,18 +31,16 @@ using namespace mozilla::browser;
 
 /////////////////////////////////////////////////////////////////////////////
 
@ -1349,9 +1362,9 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
 
-@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsSessionStoreUtils)
- NS_DEFINE_NAMED_CID(NS_SESSIONSTOREUTILS_CID);
+@@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME
+ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
+ #endif
 
 static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
     { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor },
@ -1371,7 +1384,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
 --- a/browser/components/preferences/in-content/main.js
 +++ b/browser/components/preferences/in-content/main.js
-@@ -333,16 +333,23 @@ var gMainPane = {
+@@ -327,16 +327,23 @@ var gMainPane = {
           this._backoffIndex++ : backoffTimes.length - 1]);
       };
 
@ -1395,7 +1408,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
     performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
 
     this.updateDefaultPerformanceSettingsPref();
-@@ -1060,16 +1067,27 @@ var gMainPane = {
+@@ -868,16 +875,27 @@ var gMainPane = {
       // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
       this._backoffIndex = 0;
 
@ -1442,9 +1455,9 @@ diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.b
 if SOURCES:
     FINAL_LIBRARY = 'browsercomps'
 
- EXTRA_COMPONENTS += [
-     'nsSetDefaultBrowser.js',
-     'nsSetDefaultBrowser.manifest',
+ EXTRA_JS_MODULES += [
+     'HeadlessShell.jsm',
+     'ShellService.jsm',
 diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp
 new file mode 100644
 --- /dev/null
@ -1537,7 +1550,7 @@ new file mode 100644
 +}
 +
 +NS_IMETHODIMP
-+nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement,
+nsKDEShellService::SetDesktopBackground(dom::Element* aElement,
 +                                        int32_t aPosition,
 +                                        const nsACString& aImageName)
 +{
@ -1677,8 +1690,8 @@ new file mode 100644
 +  nsKDEShellService() : mCheckedThisSession(false) { }
 +
 +  NS_DECL_ISUPPORTS
-+  NS_DECL_NSIGNOMESHELLSERVICE
 +  NS_DECL_NSISHELLSERVICE
+  NS_DECL_NSIGNOMESHELLSERVICE
 +
 +  nsresult Init();
 +
@ -1739,7 +1752,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
-@@ -646,16 +646,18 @@
+@@ -452,16 +452,18 @@
 @RESPATH@/browser/defaults/blocklists
 @RESPATH@/browser/defaults/pinning
 
@ -1748,13 +1761,13 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
 ; gre location for now.
 @RESPATH@/defaults/pref/channel-prefs.js
 
-+@BINPATH@/defaults/pref/kde.js
+@RESPATH@/defaults/pref/kde.js
 +
- ; Remote control protocol prefs
- ; defined in ../../testing/marionette/prefs/marionette.js
- @RESPATH@/defaults/pref/marionette.js
- 
 ; Services (gre) prefs
 @RESPATH@/defaults/pref/services-sync.js
 
 ; [Layout Engine Resources]
+ ; Style Sheets, Graphics and other Resources used by the layout engine.
+ @RESPATH@/res/EditorOverride.css
+ @RESPATH@/res/contenteditable.css
+ @RESPATH@/res/designmode.css
--- a/l10n-60.0.2.tar.xz
+++ b/l10n-60.0.2.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:818593ebff301f74bf90ad714e263398c2fc67d318f687b8049c774ffdc56a2b
-size 49782444
--- a/l10n-61.0.tar.xz
+++ b/l10n-61.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd26ea35915c7b5e526588daa10ae26bcb265bd343c85d81ed2ed8925aa5760d
+size 50086832
--- a/mozilla-bmo1375074.patch
+++ b/mozilla-bmo1375074.patch
@ -1,95 +0,0 @@
-
-# HG changeset patch
-# User Lars T Hansen <lhansen@mozilla.com>
-# Date 1519822672 -3600
-# Node ID 800abe66894d6b07b24bccecbf6a65e2261076f6
-# Parent  223c97459e96183eb616aed39147207bdb953ba8
-Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object constructor.  r=sstangl
-
-diff --git a/js/src/jit-test/tests/bug1375074.js b/js/src/jit-test/tests/bug1375074.js
-new file mode 100644
--- /dev/null
-+++ b/js/src/jit-test/tests/bug1375074.js
-@@ -0,0 +1,18 @@
-+// This forces the VM to start creating unboxed objects and thus stresses a
-+// particular path into generated code for a specialized unboxed object
-+// constructor.
-+
-+var K = 2000;			// 2000 should be plenty
-+var s = "[";
-+var i;
-+for ( i=0; i < K-1; i++ )
-+    s = s + `{"i":${i}},`;
-+s += `{"i":${i}}]`;
-+var v = JSON.parse(s);
-+
-+assertEq(v.length == K, true);
-+
-+for ( i=0; i < K; i++) {
-+    assertEq(v[i] instanceof Object, true);
-+    assertEq(v[i].i, i);
-+}
-diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp
--- a/js/src/vm/UnboxedObject.cpp
-+++ b/js/src/vm/UnboxedObject.cpp
-@@ -90,17 +90,25 @@ UnboxedLayout::makeConstructorCode(JSCon
-     masm.loadPtr(Address(masm.getStackPointer(), sizeof(void*)), propertiesReg);
-     masm.loadPtr(Address(masm.getStackPointer(), 2 * sizeof(void*)), newKindReg);
- #else
-     propertiesReg = IntArgReg0;
-     newKindReg = IntArgReg1;
- #endif
- 
- #ifdef JS_CODEGEN_ARM64
-    // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.
-+    // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
-+    // addressing.  The register we use for PSP may however also be used by
-+    // calling code, and it is nonvolatile, so save it.  Do this as a special
-+    // case first because the generic save/restore code needs the PSP to be
-+    // initialized already.
-+    MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
-+    masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
-+
-+    // Initialize the PSP from the SP.
-     masm.initStackPtr();
- #endif
- 
-     MOZ_ASSERT(propertiesReg.volatile_());
-     MOZ_ASSERT(newKindReg.volatile_());
- 
-     AllocatableGeneralRegisterSet regs(GeneralRegisterSet::All());
-     regs.take(propertiesReg);
-@@ -228,17 +236,32 @@ UnboxedLayout::makeConstructorCode(JSCon
-     if (object != ReturnReg)
-         masm.movePtr(object, ReturnReg);
- 
-     // Restore non-volatile registers which were saved on entry.
-     if (ScratchDoubleReg.volatile_())
-         masm.pop(ScratchDoubleReg);
-     masm.PopRegsInMask(savedNonVolatileRegisters);
- 
-+#ifdef JS_CODEGEN_ARM64
-+    // Now restore the value that was in the PSP register on entry, and return.
-+
-+    // Obtain the correct SP from the PSP.
-+    masm.Mov(sp, PseudoStackPointer64);
-+
-+    // Restore the saved value of the PSP register, this value is whatever the
-+    // caller had saved in it, not any actual SP value, and it must not be
-+    // overwritten subsequently.
-+    masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
-+
-+    // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
-+    masm.Ret(vixl::lr);
-+#else
-     masm.abiret();
-+#endif
- 
-     masm.bind(&failureStoreOther);
- 
-     // There was a failure while storing a value which cannot be stored at all
-     // in the unboxed object. Initialize the object so it is safe for GC and
-     // return null.
-     masm.initUnboxedObjectContents(object, templateObject);
- 
-
--- a/mozilla-bmo1464766.patch
+++ b/mozilla-bmo1464766.patch
@ -0,0 +1,119 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1527491713 -32400
+# Node ID c28becad0c10b906454d7e424f9a9402799ea8dd
+# Parent  86eaa6799cf51660c0b598937121305b8f70c84d
+Bug 1464766 - Allow to relax the addon signature requirements. r?rhelmer
+
+diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
+--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
+@@ -1134,16 +1134,19 @@ pref("print.print_via_parent", true);
+ pref("print.print_via_parent", false);
+ #endif
+ 
+ // Pref used by the spellchecker extension to control the
+ // maximum number of misspelled words that will be underlined
+ // in a document.
+ pref("extensions.spellcheck.inline.max-misspellings", 500);
+ 
+// Add-on manager scoped allowing unsigned addons. None by default.
+pref("extensions.unsignedScopes", 12, locked);
+
+ // Prefs used by libeditor. Prefs specific to seamonkey composer
+ // belong in comm-central/editor/ui/composer.js
+ 
+ pref("editor.use_custom_colors", false);
+ pref("editor.singleLine.pasteNewlines",      2);
+ pref("editor.use_css",                       false);
+ pref("editor.css.default_length_unit",       "px");
+ pref("editor.resizing.preserve_ratio",       true);
+diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
+--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
+@@ -42,16 +42,17 @@ XPCOMUtils.defineLazyPreferenceGetter(th
+ const PREF_DISCOVERURL = "extensions.webservice.discoverURL";
+ const PREF_DISCOVER_ENABLED = "extensions.getAddons.showPane";
+ const PREF_GETADDONS_CACHE_ENABLED = "extensions.getAddons.cache.enabled";
+ const PREF_GETADDONS_CACHE_ID_ENABLED = "extensions.%ID%.getAddons.cache.enabled";
+ const PREF_UI_TYPE_HIDDEN = "extensions.ui.%TYPE%.hidden";
+ const PREF_UI_LASTCATEGORY = "extensions.ui.lastCategory";
+ const PREF_LEGACY_EXCEPTIONS = "extensions.legacy.exceptions";
+ const PREF_LEGACY_ENABLED = "extensions.legacy.enabled";
+const PREF_UNSIGNED_SCOPES = "extensions.unsignedScopes";
+ 
+ const LOADING_MSG_DELAY = 100;
+ 
+ const UPDATES_RECENT_TIMESPAN = 2 * 24 * 3600000; // 2 days (in milliseconds)
+ const UPDATES_RELEASENOTES_TRANSFORMFILE = "chrome://mozapps/content/extensions/updateinfo.xsl";
+ 
+ const XMLURI_PARSE_ERROR = "http://www.mozilla.org/newlayout/xml/parsererror.xml";
+ 
+@@ -223,19 +224,21 @@ function loadView(aViewId) {
+ 
+ function isCorrectlySigned(aAddon) {
+   // Add-ons without an "isCorrectlySigned" property are correctly signed as
+   // they aren't the correct type for signing.
+   return aAddon.isCorrectlySigned !== false;
+ }
+ 
+ function isDisabledUnsigned(addon) {
+-  let signingRequired = (addon.type == "locale") ?
+-                        AddonSettings.LANGPACKS_REQUIRE_SIGNING :
+-                        AddonSettings.REQUIRE_SIGNING;
+  let unsignedScopes = Services.prefs.getIntPref(PREF_UNSIGNED_SCOPES, 0);
+  let signingRequired = !(addon.scope & unsignedScopes) &&
+                        ((addon.type == "locale") ?
+                         AddonSettings.LANGPACKS_REQUIRE_SIGNING :
+                         AddonSettings.REQUIRE_SIGNING);
+   return signingRequired && !isCorrectlySigned(addon);
+ }
+ 
+ function isLegacyExtension(addon) {
+   let legacy = false;
+   if (addon.type == "extension" && !addon.isWebExtension) {
+     legacy = true;
+   }
+diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
+--- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
+@@ -78,16 +78,17 @@ const KEY_PROFILEDIR                  = 
+ const FILE_JSON_DB                    = "extensions.json";
+ 
+ // The last version of DB_SCHEMA implemented in SQLITE
+ const LAST_SQLITE_DB_SCHEMA           = 14;
+ 
+ const PREF_BLOCKLIST_ITEM_URL         = "extensions.blocklist.itemURL";
+ const PREF_DB_SCHEMA                  = "extensions.databaseSchema";
+ const PREF_EM_AUTO_DISABLED_SCOPES    = "extensions.autoDisableScopes";
+const PREF_EM_UNSIGNED_SCOPES         = "extensions.unsignedScopes";
+ const PREF_EM_EXTENSION_FORMAT        = "extensions.";
+ const PREF_PENDING_OPERATIONS         = "extensions.pendingOperations";
+ const PREF_XPI_SIGNATURES_DEV_ROOT    = "xpinstall.signatures.dev-root";
+ 
+ const TOOLKIT_ID                      = "toolkit@mozilla.org";
+ 
+ const KEY_APP_SYSTEM_ADDONS           = "app-system-addons";
+ const KEY_APP_SYSTEM_DEFAULTS         = "app-system-defaults";
+@@ -1959,17 +1960,19 @@ this.XPIDatabase = {
+    * Calculates whether an add-on should be appDisabled or not.
+    *
+    * @param {AddonInternal} aAddon
+    *        The add-on to check
+    * @returns {boolean}
+    *        True if the add-on should not be appDisabled
+    */
+   isUsableAddon(aAddon) {
+-    if (this.mustSign(aAddon.type) && !aAddon.isCorrectlySigned) {
+    let unsignedScopes = Services.prefs.getIntPref(PREF_EM_UNSIGNED_SCOPES, 0);
+    if (!(aAddon._installLocation.scope & unsignedScopes) &&
+        this.mustSign(aAddon.type) && !aAddon.isCorrectlySigned) {
+       logger.warn(`Add-on ${aAddon.id} is not correctly signed.`);
+       if (Services.prefs.getBoolPref(PREF_XPI_SIGNATURES_DEV_ROOT, false)) {
+         logger.warn(`Preference ${PREF_XPI_SIGNATURES_DEV_ROOT} is set.`);
+       }
+       return false;
+     }
+ 
+     if (aAddon.blocklistState == nsIBlocklistService.STATE_BLOCKED) {
--- a/mozilla-fix-skia-aarch64.patch
+++ b/mozilla-fix-skia-aarch64.patch
@ -1,20 +0,0 @@
--- firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.orig	2018-05-14 13:23:26.001095058 +0200
-+++ firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp	2018-05-14 13:24:46.851416500 +0200
-@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) {
- }
- 
- SI F from_half(U16 h) {
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-     return vcvt_f32_f16(h);
- 
- #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
-@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
- }
- 
- SI U16 to_half(F f) {
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-     return vcvt_f16_f32(f);
- 
- #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
--- a/mozilla-i586-DecoderDoctorLogger.patch
+++ b/mozilla-i586-DecoderDoctorLogger.patch
@ -1,26 +0,0 @@
-# HG changeset patch
-# Parent  f3fe334a20e8a63266eb06c5d298ad793cefc015
-Mozilla Bug#1447070 - DecoderDoctorLogger.h must be included in MediaKeySession.h
-                      to fix non-unified build error for i586 target.
-
-diff --git a/dom/media/eme/MediaKeySession.h b/dom/media/eme/MediaKeySession.h
--- a/dom/media/eme/MediaKeySession.h
-+++ b/dom/media/eme/MediaKeySession.h
-@@ -2,16 +2,17 @@
- /* vim: set ts=8 sts=2 et sw=2 tw=80: */
- /* 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/. */
- 
- #ifndef mozilla_dom_MediaKeySession_h
- #define mozilla_dom_MediaKeySession_h
- 
-+#include "DecoderDoctorLogger.h"
- #include "mozilla/Attributes.h"
- #include "mozilla/ErrorResult.h"
- #include "nsCycleCollectionParticipant.h"
- #include "mozilla/DOMEventTargetHelper.h"
- #include "nsCOMPtr.h"
- #include "mozilla/dom/TypedArray.h"
- #include "mozilla/Mutex.h"
- #include "mozilla/dom/Date.h"
--- a/mozilla-i586-domPrefs.patch
+++ b/mozilla-i586-domPrefs.patch
@ -1,27 +0,0 @@
-# HG changeset patch
-# User Andrea Marchesini <amarchesini@mozilla.com>
-# Parent  fab938f4757d8487a87fbf911200ff0317612746
-Mozilla Bug#1447409 - DOMPrefs.h must be included in WorkerScope, r=qdot
-                      To fix 32bit build error for i586 target.
-
-diff --git a/dom/workers/WorkerScope.h b/dom/workers/WorkerScope.h
--- a/dom/workers/WorkerScope.h
-+++ b/dom/workers/WorkerScope.h
-@@ -4,16 +4,17 @@
-  * 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/. */
- 
- #ifndef mozilla_dom_workerscope_h__
- #define mozilla_dom_workerscope_h__
- 
- #include "mozilla/dom/WorkerCommon.h"
- #include "mozilla/DOMEventTargetHelper.h"
-+#include "mozilla/dom/DOMPrefs.h"
- #include "mozilla/dom/Headers.h"
- #include "mozilla/dom/RequestBinding.h"
- #include "nsWeakReference.h"
- #include "mozilla/dom/ImageBitmapSource.h"
- 
- #ifdef XP_WIN
- #undef PostMessage
- #endif
--- a/mozilla-kde.patch
+++ b/mozilla-kde.patch
@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  d7a4d772ba2afb3ac43e2f2f234ffa55bcf50e70
+# Parent  8671b358718cb8898a55fada20fc9999408daefe
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@ -9,7 +9,7 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 --- a/modules/libpref/Preferences.cpp
 +++ b/modules/libpref/Preferences.cpp
-@@ -76,16 +76,17 @@
+@@ -77,16 +77,17 @@
 #include "nsXPCOMCID.h"
 #include "nsXPCOM.h"
 #include "nsXULAppAPI.h"
@ -27,7 +27,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 using namespace mozilla;
 
 #ifdef DEBUG
-@@ -3868,25 +3869,37 @@ Preferences::InitInitialObjects()
+@@ -4201,25 +4202,37 @@ Preferences::InitInitialObjects(bool aIs
   // application pref files for backwards compatibility.
   static const char* specialFiles[] = {
 #if defined(XP_MACOSX)
@ -65,7 +65,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 
   // Load jar:$app/omni.jar!/defaults/preferences/*.js
   // or jar:$gre/omni.jar!/defaults/preferences/*.js.
-@@ -3935,17 +3948,17 @@ Preferences::InitInitialObjects()
+@@ -4268,17 +4281,17 @@ Preferences::InitInitialObjects(bool aIs
       }
 
       nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
@ -79,17 +79,17 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
     }
   }
 
- #ifdef MOZ_WIDGET_ANDROID
-   // Set up the correct default for toolkit.telemetry.enabled. If this build
-   // has MOZ_TELEMETRY_ON_BY_DEFAULT *or* we're on the beta channel, telemetry
-   // is on by default, otherwise not. This is necessary so that beta users who
-   // are testing final release builds don't flipflop defaults.
+   if (XRE_IsParentProcess()) {
+     SetupTelemetryPref();
+   }
+ 
+   NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID,
 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
-@@ -27,16 +27,20 @@ XPIDL_MODULE = 'pref'
- EXPORTS.mozilla += [
+@@ -29,16 +29,20 @@ EXPORTS.mozilla += [
     'Preferences.h',
+     'StaticPrefs.h',
 ]
 
 UNIFIED_SOURCES += [
@ -171,7 +171,7 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloa
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -69,16 +69,18 @@ toolkit.jar:
+@@ -68,16 +68,18 @@ toolkit.jar:
    content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
    content/global/bindings/colorpicker.xml     (widgets/colorpicker.xml)
    content/global/bindings/datekeeper.js       (widgets/datekeeper.js)
@ -183,13 +183,13 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 +*  content/global/bindings/dialog-kde.xml      (widgets/dialog-kde.xml)
 +% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde
    content/global/bindings/editor.xml          (widgets/editor.xml)
-    content/global/bindings/filefield.xml       (widgets/filefield.xml)
 *  content/global/bindings/findbar.xml         (widgets/findbar.xml)
    content/global/bindings/general.xml         (widgets/general.xml)
    content/global/bindings/groupbox.xml        (widgets/groupbox.xml)
    content/global/bindings/listbox.xml         (widgets/listbox.xml)
    content/global/bindings/menu.xml            (widgets/menu.xml)
    content/global/bindings/menulist.xml        (widgets/menulist.xml)
+    content/global/bindings/notification.xml    (widgets/notification.xml)
 diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
 new file mode 100644
 --- /dev/null
@ -676,45 +676,7 @@ new file mode 100644
 diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js
 --- a/toolkit/mozapps/downloads/nsHelperAppDlg.js
 +++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js
-@@ -627,17 +627,17 @@ nsUnknownContentTypeDialog.prototype = {
-       else
-         typeString = mimeInfo.MIMEType;
-     }
-     // When the length is unknown, contentLength would be -1
-     if (this.mLauncher.contentLength >= 0) {
-       let [size, unit] = DownloadUtils.
-                          convertByteUnits(this.mLauncher.contentLength);
-       type.value = this.dialogElement("strings")
-                       .getFormattedString("orderedFileSizeWithType", 
-+                       .getFormattedString("orderedFileSizeWithType",
-                                            [typeString, size, unit]);
-     }
-     else {
-       type.value = typeString;
-     }
-   },
- 
-   // Returns true if opening the default application makes sense.
-@@ -801,17 +801,17 @@ nsUnknownContentTypeDialog.prototype = {
-       switch (this.dialogElement("openHandler").selectedIndex) {
-       case 0:
-         // No app need be specified in this case.
-         ok = true;
-         break;
-       case 1:
-         // only enable the OK button if we have a default app to use or if
-         // the user chose an app....
-        ok = this.chosenApp || /\S/.test(this.dialogElement("otherHandler").getAttribute("path")); 
-+        ok = this.chosenApp || /\S/.test(this.dialogElement("otherHandler").getAttribute("path"));
-         break;
-       }
-     }
- 
-     // Enable Ok button if ok to press.
-     this.mDialog.document.documentElement.getButton("accept").disabled = !ok;
-   },
- 
-@@ -1066,30 +1066,60 @@ nsUnknownContentTypeDialog.prototype = {
+@@ -1035,30 +1035,60 @@ nsUnknownContentTypeDialog.prototype = {
 
       if (params.handlerApp &&
           params.handlerApp.executable &&
@ -1371,7 +1333,7 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
         'android/nsExternalSharingAppService.cpp',
         'android/nsExternalURLHandlerService.cpp',
         'android/nsMIMEInfoAndroid.cpp',
-@@ -124,16 +126,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -122,16 +124,17 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
@ -1808,7 +1770,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -121,16 +121,17 @@ else:
+@@ -122,16 +122,17 @@ else:
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
@ -2204,7 +2166,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
   const char* directive;
   int argc;
 
-@@ -444,16 +445,17 @@ ParseManifest(NSLocationType aType, File
+@@ -441,16 +442,17 @@ ParseManifest(NSLocationType aType, File
   NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
   NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
   NS_NAMED_LITERAL_STRING(kApplication, "application");
@ -2222,7 +2184,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
   NS_NAMED_LITERAL_STRING(kMain, "main");
   NS_NAMED_LITERAL_STRING(kContent, "content");
 
-@@ -499,44 +501,49 @@ ParseManifest(NSLocationType aType, File
+@@ -496,44 +498,49 @@ ParseManifest(NSLocationType aType, File
         CopyUTF8toUTF16(s, abi);
         abi.Insert(char16_t('_'), 0);
         abi.Insert(osTarget, 0);
@ -2272,7 +2234,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
     process = kMain;
   }
 
-@@ -638,25 +645,27 @@ ParseManifest(NSLocationType aType, File
+@@ -635,25 +642,27 @@ ParseManifest(NSLocationType aType, File
     TriState stOsVersion = eUnspecified;
     TriState stOs = eUnspecified;
     TriState stABI = eUnspecified;
@ -2300,7 +2262,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
       }
 
 #if defined(MOZ_WIDGET_ANDROID)
-@@ -701,16 +710,17 @@ ParseManifest(NSLocationType aType, File
+@@ -698,16 +707,17 @@ ParseManifest(NSLocationType aType, File
     }
 
     if (!ok ||
@ -2321,16 +2283,16 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 --- a/xpcom/components/moz.build
 +++ b/xpcom/components/moz.build
-@@ -44,12 +44,13 @@ FINAL_LIBRARY = 'xul'
+@@ -43,12 +43,13 @@ FINAL_LIBRARY = 'xul'
+ 
 LOCAL_INCLUDES += [
     '!..',
     '../base',
     '../build',
     '../ds',
-     '../reflect/xptinfo',
     '/chrome',
     '/modules/libjar',
-+    '/toolkit/xre'
+    '/toolkit/xre',
 ]
 
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
--- a/mozilla-no-return.patch
+++ b/mozilla-no-return.patch
@ -0,0 +1,40 @@
+# HG changeset patch
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+# Parent  242712e5a1879111d1a93a5d55dfae3fd5d47abc
+
+diff --git a/intl/icu/source/i18n/number_grouping.cpp b/intl/icu/source/i18n/number_grouping.cpp
+--- a/intl/icu/source/i18n/number_grouping.cpp
+++ b/intl/icu/source/i18n/number_grouping.cpp
+@@ -43,16 +43,17 @@ Grouper Grouper::forStrategy(UGroupingSt
+     case UNUM_GROUPING_MIN2:
+         return {-2, -2, -3};
+     case UNUM_GROUPING_ON_ALIGNED:
+         return {-4, -4, 1};
+     case UNUM_GROUPING_THOUSANDS:
+         return {3, 3, 1};
+     default:
+         U_ASSERT(FALSE);
+        return {0, 0, 0};
+     }
+ }
+ 
+ void Grouper::setLocaleData(const impl::ParsedPatternInfo &patternInfo, const Locale& locale) {
+     if (fGrouping1 != -2 && fGrouping2 != -4) {
+         return;
+     }
+     auto grouping1 = static_cast<int16_t> (patternInfo.positive.groupingSizes & 0xffff);
+diff --git a/media/libcubeb/src/cubeb_utils.cpp b/media/libcubeb/src/cubeb_utils.cpp
+--- a/media/libcubeb/src/cubeb_utils.cpp
+++ b/media/libcubeb/src/cubeb_utils.cpp
+@@ -14,10 +14,11 @@ size_t cubeb_sample_size(cubeb_sample_fo
+     case CUBEB_SAMPLE_S16BE:
+       return sizeof(int16_t);
+     case CUBEB_SAMPLE_FLOAT32LE:
+     case CUBEB_SAMPLE_FLOAT32BE:
+       return sizeof(float);
+     default:
+       // should never happen as all cases are handled above.
+       assert(false);
+      return sizeof(float);
+   }
+ }
--- a/source-stamp.txt
+++ b/source-stamp.txt
@ -1,2 +1,2 @@
-REV=a0b222c551f5
+REV=785d242a5b01
 REPO=http://hg.mozilla.org/releases/mozilla-release