sync up some changes between common and source

patches/remove_addons.patch

@@ -13,7 +13,7 @@ index 269dcb2..ed7c31d 100644
 -    "report-site-issue",
      "pictureinpicture",
      "proxy-failover",
- ]
+     "search-detection",
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 index 496379c..dd6f359 100644
 --- a/browser/locales/Makefile.in

patches/unity-menubar.patch

@@ -32,7 +32,7 @@
 +      continue;
 +    }
 +
-     if (toolbar.id == "PersonalToolbar" && gBookmarksToolbar2h2020) {
+     if (toolbar.id == "PersonalToolbar") {
        let menu = BookmarkingUI.buildBookmarksToolbarSubmenu(toolbar);
        popup.insertBefore(menu, firstMenuItem);
 --- a/browser/components/places/content/places.xhtml
@@ -5236,7 +5236,7 @@
 +
  EXPORTS.mozilla += [
      "BasicEvents.h",
-     "CommandList.h",
+     "ColorScheme.h",
 --- /dev/null
 +++ b/widget/nsINativeMenuService.h
 @@ -0,0 +1,39 @@

themes/browser/base/content/aboutDialog.js

@@ -2,86 +2,123 @@
  * 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/. */
 
-"use strict";
+ "use strict";
 
-/* import-globals-from aboutDialog-appUpdater.js */
+ /* import-globals-from aboutDialog-appUpdater.js */
-
+ 
-// Services = object with smart getters for common XPCOM services
+ // Services = object with smart getters for common XPCOM services
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+ var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-var { AppConstants } = ChromeUtils.import(
+ var { AppConstants } = ChromeUtils.import(
-  "resource://gre/modules/AppConstants.jsm"
+   "resource://gre/modules/AppConstants.jsm"
-);
+ );
-if (AppConstants.MOZ_UPDATER) {
+ if (AppConstants.MOZ_UPDATER) {
-  Services.scriptloader.loadSubScript(
+   Services.scriptloader.loadSubScript(
-    "chrome://browser/content/aboutDialog-appUpdater.js",
+     "chrome://browser/content/aboutDialog-appUpdater.js",
-    this
+     this
-  );
+   );
-}
+ }
-
+ 
-async function init(aEvent) {
+ async function init(aEvent) {
-  if (aEvent.target != document) {
+   if (aEvent.target != document) {
-    return;
+     return;
-  }
+   }
-
+ 
-  var distroId = Services.prefs.getCharPref("distribution.id", "");
+   var distroId = Services.prefs.getCharPref("distribution.id", "");
-  if (distroId) {
+   if (distroId) {
-    var distroAbout = Services.prefs.getStringPref("distribution.about", "");
+     var distroAbout = Services.prefs.getStringPref("distribution.about", "");
-    // If there is about text, we always show it.
+     // If there is about text, we always show it.
-    if (distroAbout) {
+     if (distroAbout) {
-      var distroField = document.getElementById("distribution");
+       var distroField = document.getElementById("distribution");
-      distroField.value = distroAbout;
+       distroField.value = distroAbout;
-      distroField.style.display = "block";
+       distroField.style.display = "block";
-    }
+     }
-    // If it's not a mozilla distribution, show the rest,
+     // If it's not a mozilla distribution, show the rest,
-    // unless about text exists, then we always show.
+     // unless about text exists, then we always show.
-    if (!distroId.startsWith("mozilla-") || distroAbout) {
+     if (!distroId.startsWith("mozilla-") || distroAbout) {
-      var distroVersion = Services.prefs.getCharPref(
+       var distroVersion = Services.prefs.getCharPref(
-        "distribution.version",
+         "distribution.version",
-        ""
+         ""
-      );
+       );
-      if (distroVersion) {
+       if (distroVersion) {
-        distroId += " - " + distroVersion;
+         distroId += " - " + distroVersion;
-      }
+       }
-
+ 
-      var distroIdField = document.getElementById("distributionId");
+       var distroIdField = document.getElementById("distributionId");
-      distroIdField.value = distroId;
+       distroIdField.value = distroId;
-      distroIdField.style.display = "block";
+       distroIdField.style.display = "block";
-    }
+     }
-  }
+   }
-
+ 
-  // Include the build ID and display warning if this is an "a#" (nightly or aurora) build
+   // Include the build ID and display warning if this is an "a#" (nightly or aurora) build
-  let versionId = "aboutDialog-version";
+   let versionId = "aboutDialog-version";
-  let versionAttributes = {
+   let versionAttributes = {
-    version: AppConstants.MOZ_APP_VERSION_DISPLAY,
+     version: AppConstants.MOZ_APP_VERSION_DISPLAY,
-    bits: Services.appinfo.is64Bit ? 64 : 32,
+     bits: Services.appinfo.is64Bit ? 64 : 32,
-  };
+   };
-
+ 
-  let version = Services.appinfo.version;
+   let version = Services.appinfo.version;
-  if (/a\d+$/.test(version)) {
+   if (/a\d+$/.test(version)) {
-    versionId = "aboutDialog-version-nightly";
+     versionId = "aboutDialog-version-nightly";
-    let buildID = Services.appinfo.appBuildID;
+     let buildID = Services.appinfo.appBuildID;
-    let year = buildID.slice(0, 4);
+     let year = buildID.slice(0, 4);
-    let month = buildID.slice(4, 6);
+     let month = buildID.slice(4, 6);
-    let day = buildID.slice(6, 8);
+     let day = buildID.slice(6, 8);
-    versionAttributes.isodate = `${year}-${month}-${day}`;
+     versionAttributes.isodate = `${year}-${month}-${day}`;
-
+ 
-    document.getElementById("experimental").hidden = false;
+     document.getElementById("experimental").hidden = false;
-    document.getElementById("communityDesc").hidden = true;
+     document.getElementById("communityDesc").hidden = true;
-  }
+   }
-
+ 
-  // Use Fluent arguments for append version and the architecture of the build
+   // Use Fluent arguments for append version and the architecture of the build
-  let versionField = document.getElementById("version");
+   let versionField = document.getElementById("version");
-
+ 
-  document.l10n.setAttributes(versionField, versionId, versionAttributes);
+   document.l10n.setAttributes(versionField, versionId, versionAttributes);
-
+ 
-  await document.l10n.translateElements([versionField]);
+   await document.l10n.translateElements([versionField]);
-
+ 
-  window.sizeToContent();
+   // Show a release notes link if we have a URL.
-
+   let relNotesLink = document.getElementById("releasenotes");
-  if (AppConstants.platform == "macosx") {
+   let relNotesPrefType = Services.prefs.getPrefType(
-    window.moveTo(
+     "app.releaseNotesURL.aboutDialog"
-      screen.availWidth / 2 - window.outerWidth / 2,
+   );
-      screen.availHeight / 5
+   if (relNotesPrefType != Services.prefs.PREF_INVALID) {
-    );
+     let relNotesURL = Services.urlFormatter.formatURLPref(
-  }
+       "app.releaseNotesURL.aboutDialog"
-}
+     );
+     if (relNotesURL != "about:blank") {
+       relNotesLink.href = relNotesURL;
+       relNotesLink.hidden = false;
+     }
+   }
+ 
+   if (AppConstants.MOZ_UPDATER) {
+     gAppUpdater = new appUpdater({ buttonAutoFocus: true });
+ 
+     let channelLabel = document.getElementById("currentChannel");
+     let currentChannelText = document.getElementById("currentChannelText");
+     channelLabel.value = UpdateUtils.UpdateChannel;
+     let hasWinPackageId = false;
+     try {
+       hasWinPackageId = Services.sysinfo.getProperty("hasWinPackageId");
+     } catch (_ex) {
+       // The hasWinPackageId property doesn't exist; assume it should be false.
+     }
+     if (/^release($|\-)/.test(channelLabel.value) || hasWinPackageId) {
+       currentChannelText.hidden = true;
+     }
+   }
+ 
+   if (AppConstants.IS_ESR) {
+     document.getElementById("release").hidden = false;
+   }
+ 
+   window.sizeToContent();
+ 
+   if (AppConstants.platform == "macosx") {
+     window.moveTo(
+       screen.availWidth / 2 - window.outerWidth / 2,
+       screen.availHeight / 5
+     );
+   }
+ }
+ 

themes/browser/base/content/aboutDialog.xhtml

@@ -6,6 +6,7 @@
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/aboutDialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>
 
 <window xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

themes/browser/branding/librewolf/content/jar.mn

@@ -12,5 +12,3 @@ browser.jar:
   content/branding/logo.svg
   content/branding/identity-icons-brand.svg
   content/branding/horizontal-lockup.svg
-  content/branding/about-logo.png                (../empty.png)
-  content/branding/firefox-wordmark.svg          (../empty.svg)