From 3aad3669f32cbe6ca9f2365ea45457d90f4d9484 Mon Sep 17 00:00:00 2001
From: "B. Stack" <bgstack15@gmail.com>
Date: Tue, 18 Jan 2022 15:28:15 -0500
Subject: [PATCH 01/54] remove_addons.patch again

---
 patches/remove_addons.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/remove_addons.patch b/patches/remove_addons.patch
index a6585ed..3487f6d 100644
--- a/patches/remove_addons.patch
+++ b/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

From 5ca67704edddcb563168fe12b8bf13cf2601c6df Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Wed, 19 Jan 2022 13:19:28 +0100
Subject: [PATCH 02/54] removed the xmas.patch from assets/patches.txt and
 added librewolf-pref-pane.patch

---
 assets/patches.txt                |   2 +-
 patches/librewolf-pref-pane.patch | 782 ++++++++++++++++++++++++++++++
 scripts/fetch-pref-pane-patch.sh  |   1 +
 scripts/librewolf-patches.py      |   2 +
 4 files changed, 786 insertions(+), 1 deletion(-)
 create mode 100644 patches/librewolf-pref-pane.patch
 create mode 100755 scripts/fetch-pref-pane-patch.sh

diff --git a/assets/patches.txt b/assets/patches.txt
index aa3b1c7..fcc0f83 100644
--- a/assets/patches.txt
+++ b/assets/patches.txt
@@ -1,6 +1,7 @@
 patches/allow-ubo-private-mode.patch
 patches/context-menu.patch
 patches/disable-data-reporting-at-compile-time.patch
+patches/librewolf-pref-pane.patch
 patches/mozilla-vpn-ad.patch
 patches/mozilla_dirs.patch
 patches/remove_addons.patch
@@ -16,4 +17,3 @@ patches/ui-patches/remove-organization-policy-banner.patch
 patches/ui-patches/remove-snippets-from-home.patch
 patches/ui-patches/sanitizing-description.patch
 patches/urlbarprovider-interventions.patch
-patches/xmas.patch
diff --git a/patches/librewolf-pref-pane.patch b/patches/librewolf-pref-pane.patch
new file mode 100644
index 0000000..d28f101
--- /dev/null
+++ b/patches/librewolf-pref-pane.patch
@@ -0,0 +1,782 @@
+diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
+new file mode 100644
+index 0000000..2badfe9
+--- /dev/null
++++ b/.gitlab-ci.yml
+@@ -0,0 +1,12 @@
++stages:
++  - build
++
++create-patch:
++  stage: build
++  variables:
++    GIT_DEPTH: 200
++  script:
++    - git diff 1fee314adc81000294fc0cf3196a758e4b64dace > librewolf-pref-pane.patch
++  artifacts:
++    paths:
++      - librewolf-pref-pane.patch
+diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
+index 4f3babe..97c7ec2 100644
+--- a/browser/components/preferences/jar.mn
++++ b/browser/components/preferences/jar.mn
+@@ -11,6 +11,7 @@ browser.jar:
+    content/browser/preferences/home.js
+    content/browser/preferences/search.js
+    content/browser/preferences/privacy.js
++   content/browser/preferences/librewolf.js
+    content/browser/preferences/containers.js
+    content/browser/preferences/sync.js
+    content/browser/preferences/experimental.js
+diff --git a/browser/components/preferences/librewolf.inc.xhtml b/browser/components/preferences/librewolf.inc.xhtml
+new file mode 100644
+index 0000000..b627417
+--- /dev/null
++++ b/browser/components/preferences/librewolf.inc.xhtml
+@@ -0,0 +1,206 @@
++# 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/.
++
++<script src="chrome://browser/content/preferences/librewolf.js"/>
++
++<html:template id="template-paneLibrewolf">
++
++<hbox class="subcategory" hidden="true" data-category="paneLibrewolf">
++  <html:h1 data-l10n-id="librewolf-header"/>
++</hbox>
++
++<groupbox hidden="true" data-category="paneLibrewolf">
++  <html:h2 data-l10n-id="librewolf-general-heading"/>
++
++  <!-- TEMPLATE FOR A NEW PREFERENCE
++  <hbox>
++    <checkbox id="librewolf-LABEL-checkbox" data-l10n-id="librewolf-LABEL-checkbox" preference="PREF" flex="1" />
++    <html:label for="librewolf-LABEL-collapse" class="sidebar-footer-link" pack="end"> <image class="sidebar-footer-icon help-icon"/> </html:label>
++  </hbox>
++  <vbox class="librewolf-collapse indent">
++    <html:input type="checkbox" id="librewolf-LABEL-collapse" />
++    <vbox class="librewolf-collapsed tracking-protection-ui content-blocking-category">
++      <label data-l10n-id="librewolf-LABEL-description" />
++      <html:div> <image src="chrome://browser/skin/warning.svg" /> <label data-l10n-id="librewolf-LABEL-warning1" class="librewolf-warning" /> </html:div>
++      <checkbox preference="PREF" label="PREF" />
++    </vbox>
++  </vbox>
++  -->
++
++  <hbox>
++    <checkbox id="librewolf-extension-update-checkbox" data-l10n-id="librewolf-extension-update-checkbox" preference="extensions.update.autoUpdateDefault" flex="1" />
++    <html:label for="librewolf-extension-update-collapse" class="sidebar-footer-link" pack="end"> <image class="sidebar-footer-icon help-icon"/> </html:label>
++  </hbox>
++  <vbox class="librewolf-collapse indent">
++    <html:input type="checkbox" id="librewolf-extension-update-collapse" />
++    <vbox class="librewolf-collapsed tracking-protection-ui content-blocking-category">
++      <label data-l10n-id="librewolf-extension-update-description" />
++      <html:div> <image src="chrome://browser/skin/warning.svg" /> <label data-l10n-id="librewolf-extension-update-warning1" class="librewolf-warning" /> </html:div>
++      <checkbox preference="extensions.update.autoUpdateDefault" label="extensions.update.autoUpdateDefault" />
++      <checkbox preference="extensions.update.enabled" label="extensions.update.enabled" />
++    </vbox>
++  </vbox>
++
++  <hbox>
++    <checkbox id="librewolf-autocopy-checkbox" data-l10n-id="librewolf-autocopy-checkbox" preference="clipboard.autocopy" flex="1" />
++    <html:label for="librewolf-autocopy-collapse" class="sidebar-footer-link" pack="end"> <image class="sidebar-footer-icon help-icon"/> </html:label>
++  </hbox>
++  <vbox class="librewolf-collapse indent">
++    <html:input type="checkbox" id="librewolf-autocopy-collapse" />
++    <vbox class="librewolf-collapsed tracking-protection-ui content-blocking-category">
++      <label data-l10n-id="librewolf-autocopy-description" />
++      <checkbox preference="clipboard.autocopy" label="clipboard.autocopy" />
++      <checkbox preference="middlemouse.paste" label="middlemouse.paste" />
++    </vbox>
++  </vbox>
++
++  <hbox>
++    <checkbox id="librewolf-styling-checkbox" data-l10n-id="librewolf-styling-checkbox" preference="toolkit.legacyUserProfileCustomizations.stylesheets" flex="1" />
++    <html:label for="librewolf-styling-collapse" class="sidebar-footer-link" pack="end"> <image class="sidebar-footer-icon help-icon"/> </html:label>
++  </hbox>
++  <vbox class="librewolf-collapse indent">
++    <html:input type="checkbox" id="librewolf-styling-collapse" />
++    <vbox class="librewolf-collapsed tracking-protection-ui content-blocking-category">
++      <label data-l10n-id="librewolf-styling-description" />
++      <html:div> <image src="chrome://browser/skin/warning.svg" /> <label data-l10n-id="librewolf-styling-warning1" class="librewolf-warning" /> </html:div>
++      <checkbox preference="toolkit.legacyUserProfileCustomizations.stylesheets" label="toolkit.legacyUserProfileCustomizations.stylesheets" />
++    </vbox>
++  </vbox>
++
++</groupbox>
++
++<groupbox hidden="true" data-category="paneLibrewolf">
++  <html:h2 data-l10n-id="librewolf-network-heading" />
++
++  <hbox>
++    <checkbox id="librewolf-ipv6-checkbox" data-l10n-id="librewolf-ipv6-checkbox" preference="network.dns.disableIPv6" flex="1" />
++    <html:label for="librewolf-ipv6-collapse" class="sidebar-footer-link" pack="end"> <image class="sidebar-footer-icon help-icon"/> </html:label>
++  </hbox>
++  <vbox class="librewolf-collapse indent">
++    <html:input type="checkbox" id="librewolf-ipv6-collapse" />
++    <vbox class="librewolf-collapsed tracking-protection-ui content-blocking-category">
++      <label data-l10n-id="librewolf-ipv6-description" />
++      <html:div> <image src="chrome://browser/skin/warning.svg" /> <label data-l10n-id="librewolf-ipv6-warning1" class="librewolf-warning" /> </html:div>
++      <checkbox preference="network.dns.disableIPv6" label="network.dns.disableIPv6" />
++    </vbox>
++  </vbox>
++
++</groupbox>
++
++<groupbox hidden="true" data-category="paneLibrewolf">
++  <html:h2 data-l10n-id="librewolf-broken-heading" />
++
++  <hbox>
++    <checkbox id="librewolf-rfp-checkbox" data-l10n-id="librewolf-rfp-checkbox" preference="privacy.resistFingerprinting" flex="1" />
++    <html:label for="librewolf-rfp-collapse" class="sidebar-footer-link" pack="end"> <image class="sidebar-footer-icon help-icon"/> </html:label>
++  </hbox>
++  <vbox class="librewolf-collapse indent">
++    <html:input type="checkbox" id="librewolf-rfp-collapse" />
++    <vbox class="librewolf-collapsed tracking-protection-ui content-blocking-category">
++      <label data-l10n-id="librewolf-rfp-description" />
++      <html:div> <image src="chrome://browser/skin/warning.svg" /> <label data-l10n-id="librewolf-rfp-warning1" class="librewolf-warning" /> </html:div>
++      <checkbox preference="privacy.resistFingerprinting" label="privacy.resistFingerprinting" />
++    </vbox>
++  </vbox>
++
++  <vbox class="indent">
++
++    <hbox>
++      <checkbox id="librewolf-letterboxing-checkbox" data-l10n-id="librewolf-letterboxing-checkbox" preference="privacy.resistFingerprinting.letterboxing" flex="1" />
++      <html:label for="librewolf-letterboxing-collapse" class="sidebar-footer-link" pack="end"> <image class="sidebar-footer-icon help-icon"/> </html:label>
++    </hbox>
++    <vbox class="librewolf-collapse indent">
++      <html:input type="checkbox" id="librewolf-letterboxing-collapse" />
++      <vbox class="librewolf-collapsed tracking-protection-ui content-blocking-category">
++        <label data-l10n-id="librewolf-letterboxing-description" />
++        <checkbox preference="privacy.resistFingerprinting.letterboxing" label="privacy.resistFingerprinting.letterboxing" />
++      </vbox>
++    </vbox>
++
++    <hbox>
++      <checkbox id="librewolf-auto-decline-canvas-checkbox" data-l10n-id="librewolf-auto-decline-canvas-checkbox" preference="privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" flex="1" />
++      <html:label for="librewolf-auto-decline-canvas-collapse" class="sidebar-footer-link" pack="end"> <image class="sidebar-footer-icon help-icon"/> </html:label>
++    </hbox>
++    <vbox class="librewolf-collapse indent">
++      <html:input type="checkbox" id="librewolf-auto-decline-canvas-collapse" />
++      <vbox class="librewolf-collapsed tracking-protection-ui content-blocking-category">
++        <label data-l10n-id="librewolf-auto-decline-canvas-description" />
++        <html:div> <label data-l10n-id="librewolf-auto-decline-canvas-warning1" class="librewolf-warning" /> </html:div>
++        <checkbox preference="privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" label="privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" />
++      </vbox>
++    </vbox>
++
++  </vbox>
++
++  <hbox>
++    <checkbox id="librewolf-webgl-checkbox" data-l10n-id="librewolf-webgl-checkbox" preference="webgl.disabled" flex="1" />
++    <html:label for="librewolf-webgl-collapse" class="sidebar-footer-link" pack="end"> <image class="sidebar-footer-icon help-icon"/> </html:label>
++  </hbox>
++  <vbox class="librewolf-collapse indent">
++    <html:input type="checkbox" id="librewolf-webgl-collapse" />
++    <vbox class="librewolf-collapsed tracking-protection-ui content-blocking-category">
++      <label data-l10n-id="librewolf-webgl-description" />
++      <html:div> <image src="chrome://browser/skin/warning.svg" /> <label data-l10n-id="librewolf-webgl-warning1" class="librewolf-warning" /> </html:div>
++      <checkbox preference="webgl.disabled" label="webgl.disabled" />
++    </vbox>
++  </vbox>
++
++</groupbox>
++
++<groupbox hidden="true" data-category="paneLibrewolf">
++  <html:h2 data-l10n-id="librewolf-security-heading" />
++
++  <hbox>
++    <checkbox id="librewolf-goog-safe-checkbox" data-l10n-id="librewolf-goog-safe-checkbox" preference="browser.safebrowsing.malware.enabled" flex="1" />
++    <html:label for="librewolf-goog-safe-collapse" class="sidebar-footer-link" pack="end"> <image class="sidebar-footer-icon help-icon"/> </html:label>
++  </hbox>
++  <vbox class="librewolf-collapse indent">
++    <html:input type="checkbox" id="librewolf-goog-safe-collapse" />
++    <vbox class="librewolf-collapsed tracking-protection-ui content-blocking-category">
++      <label data-l10n-id="librewolf-goog-safe-description" />
++      <html:div> <image src="chrome://browser/skin/warning.svg" /> <label data-l10n-id="librewolf-goog-safe-warning1" class="librewolf-warning" /> </html:div>
++      <checkbox preference="browser.safebrowsing.malware.enabled" label="browser.safebrowsing.malware.enabled" />
++      <checkbox preference="browser.safebrowsing.phishing.enabled" label="browser.safebrowsing.phishing.enabled" />
++      <checkbox preference="browser.safebrowsing.blockedURIs.enabled" label="browser.safebrowsing.blockedURIs.enabled" />
++      <checkbox preference="browser.safebrowsing.provider.google4.gethashURL" label="browser.safebrowsing.provider.google4.gethashURL" id="librewolf-goog-safe-hash4"/>
++      <checkbox preference="browser.safebrowsing.provider.google4.updateURL" label="browser.safebrowsing.provider.google4.updateURL" id="librewolf-goog-safe-up4"/>
++      <checkbox preference="browser.safebrowsing.provider.google.gethashURL" label="browser.safebrowsing.provider.google.gethashURL" id="librewolf-goog-safe-hash"/>
++      <checkbox preference="browser.safebrowsing.provider.google.updateURL" label="browser.safebrowsing.provider.google.updateURL" id="librewolf-goog-safe-up"/>
++    </vbox>
++  </vbox>
++
++  <vbox class="indent">
++    <hbox>
++      <checkbox id="librewolf-goog-safe-download-checkbox" data-l10n-id="librewolf-goog-safe-download-checkbox" preference="browser.safebrowsing.downloads.enabled" flex="1" />
++      <html:label for="librewolf-goog-safe-download-collapse" class="sidebar-footer-link" pack="end"> <image class="sidebar-footer-icon help-icon"/> </html:label>
++    </hbox>
++    <vbox class="librewolf-collapse indent">
++      <html:input type="checkbox" id="librewolf-goog-safe-download-collapse" />
++      <vbox class="librewolf-collapsed tracking-protection-ui content-blocking-category">
++        <label data-l10n-id="librewolf-goog-safe-download-description" />
++        <html:div> <image src="chrome://browser/skin/warning.svg" /> <label data-l10n-id="librewolf-goog-safe-download-warning1" class="librewolf-warning" /> </html:div>
++        <checkbox preference="browser.safebrowsing.downloads.enabled" label="browser.safebrowsing.downloads.enabled" />
++      </vbox>
++    </vbox>
++  </vbox>
++
++</groupbox>
++
++<hbox class="subcategory" hidden="true" data-category="paneLibrewolf">
++    <html:h1 data-l10n-id="librewolf-footer"/>
++</hbox>
++
++<groupbox data-category="paneLibrewolf" hidden="true">
++  <hbox>
++    <label id="librewolf-config-link-wrapper" class="sidebar-footer-link" is="text-link" flex="1">
++      <image class="sidebar-footer-icon" src="chrome://browser/skin/ion.svg" /> <!-- TODO not the typical way a picture is defined I think, and also we should copy the svg file in case they change it -->
++      <label id="librewolf-config-link" data-l10n-id="librewolf-config-link"></label>
++    </label>
++    <hbox pack="end">
++      <button id="librewolf-open-profile-button" class="accessory-button" is="highlightable-button" data-l10n-id="librewolf-open-profile"/>
++    </hbox>
++  </hbox>
++</groupbox>
++
++</html:template>
+diff --git a/browser/components/preferences/librewolf.js b/browser/components/preferences/librewolf.js
+new file mode 100644
+index 0000000..c460b8c
+--- /dev/null
++++ b/browser/components/preferences/librewolf.js
+@@ -0,0 +1,234 @@
++/* 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/. */
++
++/* import-globals-from extensionControlled.js */
++/* import-globals-from preferences.js */
++
++var { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm");
++XPCOMUtils.defineLazyGetter(this, "L10n", () => {
++  return new Localization([
++    "branding/brand.ftl",
++    "browser/preferences/preferences.ftl",
++  ]);
++});
++
++Preferences.addAll([
++  // IPv6
++  { id: "network.dns.disableIPv6", type: "bool" },
++  // WebGL
++  { id: "webgl.disabled", type: "bool" },
++  // RFP
++  { id: "privacy.resistFingerprinting", type: "bool" },
++  // Automatically Update Extensions
++  { id: "extensions.update.enabled", type: "bool" },
++  { id: "extensions.update.autoUpdateDefault", type: "bool" },
++  // Clipboard autocopy/paste
++  { id: "clipboard.autocopy", type: "bool" },
++  { id: "middlemouse.paste", type: "bool" },
++  // Harden
++  { id: "privacy.resistFingerprinting.letterboxing", type: "bool" },
++  // Google Safe Browsing
++  //{ id: "browser.safebrowsing.malware.enabled", type: "bool" }, // Already loaded
++  //{ id: "browser.safebrowsing.phishing.enabled", type: "bool" },
++  { id: "browser.safebrowsing.blockedURIs.enabled", type: "bool" },
++  { id: "browser.safebrowsing.provider.google4.gethashURL", type: "string" },
++  { id: "browser.safebrowsing.provider.google4.updateURL", type: "string" },
++  { id: "browser.safebrowsing.provider.google.gethashURL", type: "string" },
++  { id: "browser.safebrowsing.provider.google.updateURL", type: "string" },
++  /**** Prefs that require changing a lockPref ****/
++  // Google safe browsing check downloads
++  //{ id: "browser.safebrowsing.downloads.enabled", type: "bool" }, //Also already added
++  { id: "toolkit.legacyUserProfileCustomizations.stylesheets", type: "bool" },
++  // Canvas UI when blocked
++  { id: "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", type: "bool" },
++]);
++
++var gLibrewolfPane = {
++  _pane: null,
++
++  // called when the document is first parsed
++  init() {
++    this._pane = document.getElementById("paneLibrewolf");
++
++    // Set all event listeners on checkboxes
++    setBoolSyncListeners(
++      "librewolf-extension-update-checkbox",
++      ["extensions.update.autoUpdateDefault", "extensions.update.enabled"],
++      [true,                                  true                       ],
++    );
++    setBoolSyncListeners(
++      "librewolf-ipv6-checkbox",
++      ["network.dns.disableIPv6"],
++      [false,                   ],
++    );
++    setBoolSyncListeners(
++      "librewolf-autocopy-checkbox",
++      ["clipboard.autocopy", "middlemouse.paste"],
++      [true,                 true               ],
++    );
++    setBoolSyncListeners(
++      "librewolf-styling-checkbox",
++      ["toolkit.legacyUserProfileCustomizations.stylesheets"],
++      [true,                                                ],
++    );
++
++    setBoolSyncListeners(
++      "librewolf-webgl-checkbox",
++      ["webgl.disabled"],
++      [false           ],
++    );
++    setBoolSyncListeners(
++      "librewolf-rfp-checkbox",
++      ["privacy.resistFingerprinting"],
++      [true                          ],
++    );
++    setBoolSyncListeners(
++      "librewolf-auto-decline-canvas-checkbox",
++      ["privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts"],
++      [true                                      ],
++    );
++
++    setBoolSyncListeners(
++      "librewolf-letterboxing-checkbox",
++      ["privacy.resistFingerprinting.letterboxing"],
++      [true                                       ],
++    );
++
++    setSyncListeners(
++      "librewolf-goog-safe-checkbox",
++      [
++        "browser.safebrowsing.malware.enabled",
++        "browser.safebrowsing.phishing.enabled",
++        "browser.safebrowsing.blockedURIs.enabled",
++        "browser.safebrowsing.provider.google4.gethashURL",
++        "browser.safebrowsing.provider.google4.updateURL",
++        "browser.safebrowsing.provider.google.gethashURL",
++        "browser.safebrowsing.provider.google.updateURL",
++      ],
++      [
++        true,
++        true,
++        true,
++        "https://safebrowsing.googleapis.com/v4/fullHashes:find?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST",
++        "https://safebrowsing.googleapis.com/v4/threatListUpdates:fetch?$ct=application/x-protobuf&key=%GOOGLE_SAFEBROWSING_API_KEY%&$httpMethod=POST",
++        "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2",
++        "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2&key=%GOOGLE_SAFEBROWSING_API_KEY%",
++      ],
++      [
++        false,
++        false,
++        false,
++        "",
++        "",
++        "",
++        "",
++      ]
++    );
++
++    // Set event listener on open profile directory button
++    setEventListener("librewolf-open-profile-button", "command", openProfileDirectory);
++    // Set event listener on open about:config button
++    setEventListener("librewolf-config-link", "click", openAboutConfig);
++
++    // Notify observers that the UI is now ready
++    Services.obs.notifyObservers(window, "librewolf-pane-loaded");
++  },
++};
++
++function openProfileDirectory() {
++  // Get the profile directory.
++  let currProfD = Services.dirsvc.get("ProfD", Ci.nsIFile);
++  let profileDir = currProfD.path;
++
++  // Show the profile directory.
++  let nsLocalFile = Components.Constructor(
++    "@mozilla.org/file/local;1",
++    "nsIFile",
++    "initWithPath"
++  );
++  new nsLocalFile(profileDir).reveal();
++}
++
++function openAboutConfig() {
++  window.open("about:config", "_blank");
++}
++
++function setBoolSyncListeners(checkboxid, opts, vals) {
++  setSyncFromPrefListener(checkboxid, () => readGenericBoolPrefs(opts, vals));
++  setSyncToPrefListener(checkboxid, () => writeGenericBoolPrefs(opts, vals, document.getElementById(checkboxid).checked));
++  for (let i = 1; i < opts.length; i++) {
++    Preferences.get(opts[i]).on("change", () => makeMasterCheckboxesReactive(checkboxid, () => readGenericBoolPrefs(opts, vals)));
++  }
++}
++function setSyncListeners(checkboxid, opts, onVals, offVals) {
++  setSyncFromPrefListener(checkboxid, () => readGenericPrefs(opts, onVals, offVals));
++  setSyncToPrefListener(checkboxid, () => writeGenericPrefs(opts, onVals, offVals, document.getElementById(checkboxid).checked));
++  for (let i = 1; i < opts.length; i++) {
++    Preferences.get(opts[i]).on("change", () => makeMasterCheckboxesReactive(checkboxid, () => readGenericPrefs(opts, onVals, offVals)));
++  }
++}
++
++function makeMasterCheckboxesReactive(checkboxid, func) {
++  let shouldBeChecked = func();
++  document.getElementById(checkboxid).checked = shouldBeChecked;
++}
++
++// Wrapper function in case something more is required (as I suspected in the first iteration of this)
++function getPref(pref) {
++  let retval = Preferences.get(pref);
++/*  if (retval === undefined) {
++    return defaultValue;
++  } */
++  return retval._value;
++}
++// Returns true if all the preferences in prefs are equal to onVals, false otherwise TODO may need a third array for their default values because mozilla is dumb, after testing though pretty sure this was misinformation being spread by comments in default FF code that has long since been fixed
++function readGenericBoolPrefs(prefs, onVals) {
++  for (let i = 0; i < prefs.length; i++) {
++    if (getPref(prefs[i]) != onVals[i]) {
++      return false;
++    }
++  }
++  return true;
++}
++function writeGenericBoolPrefs(opts, vals, changeToOn) {
++  valsCopy = [...vals];
++  if (!changeToOn) {
++    for (let i = 0; i < vals.length; i++) {
++      valsCopy[i] = !vals[i];
++    }
++  }
++  // Start at 1 because returning sets the last one
++  for (let i = 1; i < vals.length; i++) {
++    Services.prefs.setBoolPref(opts[i], valsCopy[i]);
++  }
++  return valsCopy[0];
++}
++
++// Returns true if all the preferences in prefs are equal to onVals, false otherwise... currently the same as for Bool as offVals is ignored
++function readGenericPrefs(prefs, onVals, offVals) {
++  for (let i = 0; i < prefs.length; i ++) {
++    let temp = getPref(prefs[i]);
++    if (getPref(prefs[i]) != onVals[i]) {
++      return false;
++    }
++  }
++  return true;
++}
++function writeGenericPrefs(opts, onVals, offVals, changeToOn) {
++  let writeArr = (changeToOn) ? onVals : offVals;
++  for (let i = 1; i < opts.length; i++) {
++    let type = typeof(writeArr[i]);
++    if (type == "number") {
++      Services.prefs.setIntPref(opts[i], writeArr[i]);
++    } else if (type == "boolean") {
++      Services.prefs.setBoolPref(opts[i], writeArr[i]);
++    } else if (type == "string") {
++      Services.prefs.setCharPref(opts[i], writeArr[i]);
++    } else {
++      console.log("BADNESS 10000");
++    }
++  }
++  return writeArr[0];
++}
++
+diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
+index 91e9e46..763ab49 100644
+--- a/browser/components/preferences/preferences.js
++++ b/browser/components/preferences/preferences.js
+@@ -8,6 +8,7 @@
+ /* import-globals-from search.js */
+ /* import-globals-from containers.js */
+ /* import-globals-from privacy.js */
++/* import-globals-from librewolf.js */
+ /* import-globals-from sync.js */
+ /* import-globals-from experimental.js */
+ /* import-globals-from findInPage.js */
+@@ -117,6 +118,7 @@ function init_all() {
+   register_module("paneHome", gHomePane);
+   register_module("paneSearch", gSearchPane);
+   register_module("panePrivacy", gPrivacyPane);
++  register_module("paneLibrewolf", gLibrewolfPane);
+   register_module("paneContainers", gContainersPane);
+   if (Services.prefs.getBoolPref("browser.preferences.experimental")) {
+     // Set hidden based on previous load's hidden value.
+diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
+index aab4a9e..907a631 100644
+--- a/browser/components/preferences/preferences.xhtml
++++ b/browser/components/preferences/preferences.xhtml
+@@ -12,6 +12,7 @@
+ <?xml-stylesheet href="chrome://browser/skin/preferences/search.css"?>
+ <?xml-stylesheet href="chrome://browser/skin/preferences/containers.css"?>
+ <?xml-stylesheet href="chrome://browser/skin/preferences/privacy.css"?>
++<?xml-stylesheet href="chrome://browser/skin/preferences/librewolf.css"?>
+ 
+ <!DOCTYPE html>
+ 
+@@ -128,6 +129,17 @@
+           <label class="category-name" flex="1" data-l10n-id="pane-privacy-title"></label>
+         </richlistitem>
+ 
++        <richlistitem id="category-librewolf"
++                      class="category"
++                      value="paneLibrewolf"
++                      helpTopic="prefs-librewolf"
++                      data-l10n-id="category-librewolf"
++                      data-l10n-attrs="tooltiptext"
++                      align="center">
++          <image class="category-icon"/>
++          <label class="category-name" flex="1" data-l10n-id="pane-librewolf-title"></label>
++        </richlistitem>
++
+         <richlistitem id="category-sync"
+                       class="category"
+                       hidden="true"
+@@ -201,6 +213,7 @@
+ #include home.inc.xhtml
+ #include search.inc.xhtml
+ #include privacy.inc.xhtml
++#include librewolf.inc.xhtml
+ #include containers.inc.xhtml
+ #include sync.inc.xhtml
+ #include experimental.inc.xhtml
+diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
+index d276f7a..39f3660 100644
+--- a/browser/locales/en-US/browser/preferences/preferences.ftl
++++ b/browser/locales/en-US/browser/preferences/preferences.ftl
+@@ -1347,3 +1347,78 @@ choose-download-folder-title = Choose Download Folder:
+ #   $service-name (String) - Name of a cloud storage provider like Dropbox, Google Drive, etc...
+ save-files-to-cloud-storage =
+     .label = Save files to { $service-name }
++
++## LibreWolf preferences
++
++# Sidebar
++pane-librewolf-title = LibreWolf
++category-librewolf =
++    .tooltiptext = about:config changes, logically grouped and easily accessible
++
++# Main content
++librewolf-header = Librewolf Preferences
++librewolf-warning-title = Heads up!
++librewolf-warning-description = We carefully choose default settings to focus on privacy and security. When changing these settings, read the descriptions to understand the implications of those changes.
++
++# Page Layout
++librewolf-general-heading = Browser Behavior
++librewolf-extension-update-checkbox =
++    .label = Update add-ons automatically
++librewolf-autocopy-checkbox =
++    .label = Enable middle click paste
++librewolf-styling-checkbox = 
++    .label = Allow userChrome.css customization
++
++librewolf-network-heading = Networking
++librewolf-ipv6-checkbox =
++    .label = Enable IPv6
++
++librewolf-broken-heading = Fingerprinting
++librewolf-webgl-checkbox =
++    .label = Enable WebGL
++librewolf-rfp-checkbox =
++    .label = Enable ResistFingerprinting
++librewolf-auto-decline-canvas-checkbox =
++    .label = Silently block canvas access requests
++librewolf-letterboxing-checkbox =
++    .label = Enable letterboxing
++
++librewolf-security-heading = Security
++librewolf-goog-safe-checkbox =
++    .label = Enable Google Safe Browsing
++librewolf-goog-safe-download-checkbox =
++    .label = Scan downloads
++
++# In-depth descriptions
++librewolf-extension-update-description = Keep extensions up to date without manual intervention. A good choice for your security.
++librewolf-extension-update-warning1 = If you don't review the code of your extensions before every update, you should enable this option.
++
++librewolf-ipv6-description = Allow { -brand-short-name } to connect using IPv6.
++librewolf-ipv6-warning1 = Before you change this, make sure your OS uses the IPv6 privacy extension.
++
++librewolf-autocopy-description = Select some text to copy it, then paste it with a middle-mouse click.
++
++librewolf-styling-description = Enable this if you want to customize the UI with a manually loaded theme.
++librewolf-styling-warning1 = Make sure you trust the provider of the theme.
++
++librewolf-webgl-description = WebGL is a strong fingerprinting vector.
++librewolf-webgl-warning1 = If you need to enable it, consider using an extension like Canvas Blocker.
++
++librewolf-rfp-description = ResistFingerprinting is the best in class anti-fingerprinting tool.
++librewolf-rfp-warning1 = If you need to disable it, consider using an extension like Canvas Blocker.
++
++librewolf-auto-decline-canvas-description = Automatically deny canvas access to websites, without prompting the user.
++librewolf-auto-decline-canvas-warning1 = It is still possible to allow canvas access from the urlbar.
++
++librewolf-letterboxing-description = Letterboxing applies margins around your windows, in order to return a limited set of rounded resolutions.
++
++librewolf-goog-safe-description = If you are worried about malware and phishing, consider enabling it.
++librewolf-goog-safe-warning1 = Disabled over censorship concerns but recommended for less advanced users. All the checks happen locally.
++
++librewolf-goog-safe-download-description = Allow Safe Browsing to scan your downloads to identify suspicious files.
++librewolf-goog-safe-download-warning1 = All the checks happen locally.
++
++# Footer
++librewolf-footer = Useful links
++librewolf-config-link = All advanced settings (about:config)
++librewolf-open-profile = Open user profile directory
+diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
+index cf1ebf0..336118c 100644
+--- a/browser/themes/shared/jar.inc.mn
++++ b/browser/themes/shared/jar.inc.mn
+@@ -105,6 +105,7 @@
+   skin/classic/browser/preferences/category-experiments.svg    (../shared/preferences/category-experiments.svg)
+   skin/classic/browser/preferences/category-general.svg        (../shared/preferences/category-general.svg)
+   skin/classic/browser/preferences/category-privacy-security.svg    (../shared/preferences/category-privacy-security.svg)
++  skin/classic/browser/preferences/category-librewolf.svg    (../shared/preferences/category-librewolf.svg)
+   skin/classic/browser/preferences/category-search.svg         (../shared/preferences/category-search.svg)
+   skin/classic/browser/preferences/category-sync.svg           (../shared/preferences/category-sync.svg)
+   skin/classic/browser/preferences/critters-postcard.jpg       (../shared/preferences/critters-postcard.jpg)
+@@ -119,6 +120,7 @@
+   skin/classic/browser/preferences/search-bar.svg              (../shared/preferences/search-bar.svg)
+   skin/classic/browser/preferences/search.css                  (../shared/preferences/search.css)
+   skin/classic/browser/preferences/siteDataSettings.css        (../shared/preferences/siteDataSettings.css)
++  skin/classic/browser/preferences/librewolf.css               (../shared/preferences/librewolf.css)
+ * skin/classic/browser/preferences/containers.css              (../shared/preferences/containers.css)
+ * skin/classic/browser/preferences/containers-dialog.css       (../shared/preferences/containers-dialog.css)
+   skin/classic/browser/upgradeDialog/highlights-24.svg         (../shared/upgradeDialog/highlights-24.svg)
+diff --git a/browser/themes/shared/preferences/category-librewolf.svg b/browser/themes/shared/preferences/category-librewolf.svg
+new file mode 100644
+index 0000000..8ebf2eb
+--- /dev/null
++++ b/browser/themes/shared/preferences/category-librewolf.svg
+@@ -0,0 +1,96 @@
++<!-- 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/. 
++<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="20" height="20" fill="context-fill" fill-opacity="context-fill-opacity">
++  <path d="M15.5 9 15 9l0-4A5 5 0 0 0 5 5l0 4-.5 0A2.5 2.5 0 0 0 2 11.5l0 6A2.5 2.5 0 0 0 4.5 20l11 0a2.5 2.5 0 0 0 2.5-2.5l0-6A2.5 2.5 0 0 0 15.5 9zm-9-4c0-1.93 1.57-3.5 3.5-3.5 1.93 0 3.5 1.57 3.5 3.5l0 4-7 0 0-4zm10 12.7-.8.8-11.4 0-.8-.8 0-6.4.8-.8 11.4 0 .8.8 0 6.4z"/>
++</svg>
++-->
++
++<svg
++   xmlns:dc="http://purl.org/dc/elements/1.1/"
++   xmlns:cc="http://creativecommons.org/ns#"
++   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++   xmlns:svg="http://www.w3.org/2000/svg"
++   xmlns="http://www.w3.org/2000/svg"
++   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
++   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
++   width="67.733337mm"
++   height="67.733337mm"
++   viewBox="0 0 67.733337 67.733337"
++   version="1.1"
++   id="svg8"
++   inkscape:version="0.92.4 5da689c313, 2019-01-14"
++   sodipodi:docname="LibreWolf.svg">
++  <defs
++     id="defs2" />
++  <sodipodi:namedview
++     id="base"
++     pagecolor="#ffffff"
++     bordercolor="#666666"
++     borderopacity="1.0"
++     inkscape:pageopacity="0.0"
++     inkscape:pageshadow="2"
++     inkscape:zoom="0.9899495"
++     inkscape:cx="-15.106575"
++     inkscape:cy="110.91343"
++     inkscape:document-units="mm"
++     inkscape:current-layer="layer1"
++     showgrid="false"
++     inkscape:window-width="1366"
++     inkscape:window-height="711"
++     inkscape:window-x="0"
++     inkscape:window-y="30"
++     inkscape:window-maximized="1"
++     inkscape:showpageshadow="false"
++     units="px"
++     fit-margin-top="0"
++     fit-margin-left="0"
++     fit-margin-right="0"
++     fit-margin-bottom="0" />
++  <metadata
++     id="metadata5">
++    <rdf:RDF>
++      <cc:Work
++         rdf:about="">
++        <dc:format>image/svg+xml</dc:format>
++        <dc:type
++           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
++        <dc:title />
++      </cc:Work>
++    </rdf:RDF>
++  </metadata>
++  <g
++     inkscape:label="Layer 1"
++     inkscape:groupmode="layer"
++     id="layer1"
++     transform="translate(-42.106554,-153.8982)">
++    <circle
++       style="fill:#00acff;fill-opacity:1;stroke:none;stroke-width:0.53545821;stroke-miterlimit:4;stroke-dasharray:none"
++       id="path875"
++       cx="75.973221"
++       cy="187.76486"
++       r="33.866669" />
++    <path
++       style="fill:#ffffff;stroke-width:0.13229167"
++       d="m 72.543594,214.67719 c -4.744093,-0.60875 -9.281981,-2.49991 -13.241953,-5.51858 -1.29157,-0.98455 -3.714943,-3.42363 -4.772834,-4.80375 -2.96241,-3.86476 -4.804479,-8.2508 -5.41218,-12.88661 -0.260164,-1.98464 -0.258719,-5.63349 0.0029,-7.44738 1.308078,-9.0677 7.01463,-16.8454 15.20915,-20.72918 3.811512,-1.80647 7.300266,-2.57114 11.730683,-2.57114 7.165903,0 13.5265,2.56749 18.680882,7.54063 2.483054,2.39575 4.148141,4.66808 5.573968,7.60677 1.92868,3.9751 2.70979,7.43276 2.70979,11.99526 0,6.00619 -1.7345,11.24407 -5.336957,16.11672 -1.070527,1.44797 -3.161747,3.64749 -4.549468,4.78507 -3.806562,3.12041 -8.658642,5.23183 -13.473174,5.86296 -1.663528,0.21807 -5.593318,0.24524 -7.120854,0.0492 z m 10.041381,-4.86547 c 2.898391,-0.91366 5.260364,-2.14146 7.540624,-3.91979 1.212494,-0.9456 3.308223,-3.06144 4.186916,-4.22711 2.38328,-3.16162 4.004927,-7.12196 4.482067,-10.94597 0.229814,-1.84182 0.09634,-5.73827 -0.2545,-7.4296 -0.9294,-4.48046 -2.931647,-8.26499 -6.086007,-11.50342 -1.966575,-2.01898 -3.756882,-3.34972 -6.060203,-4.50458 -3.495001,-1.75236 -6.489835,-2.46043 -10.423481,-2.46442 -4.164073,-0.004 -7.815325,0.95024 -11.429055,2.98766 -3.289753,1.85476 -6.690628,5.25952 -8.553227,8.563 -1.371786,2.43299 -2.37583,5.32029 -2.767595,7.95869 -0.256867,1.72991 -0.261933,5.16508 -0.01006,6.82145 0.504067,3.31489 1.761474,6.59111 3.584314,9.33904 0.995409,1.50058 0.964154,1.48393 1.842248,0.98153 1.570774,-0.8987 1.980396,-1.33342 2.836087,-3.00984 1.000624,-1.96036 2.070459,-3.6735 3.037094,-4.86332 1.115822,-1.37347 1.269228,-1.61793 1.828988,-2.9147 0.281654,-0.65249 0.786977,-1.61074 1.122938,-2.12943 l 0.61084,-0.94309 -0.79023,-0.77671 c -1.049647,-1.03168 -1.922751,-2.2016 -2.087012,-2.79651 -0.167761,-0.60758 0.03021,-0.9466 0.818744,-1.40207 0.797354,-0.46057 1.367585,-0.5929 3.498657,-0.81193 1.037629,-0.10665 2.164153,-0.30199 2.518962,-0.43681 0.353024,-0.13414 1.407825,-0.70824 2.344001,-1.27579 2.702947,-1.63863 2.931619,-1.72344 4.552111,-1.68831 1.368686,0.0297 1.371262,0.0291 2.182813,-0.46143 1.700674,-1.02802 4.14305,-2.88289 7.357044,-5.58733 0.61632,-0.5186 1.21002,-0.92569 1.31934,-0.90464 0.45462,0.0876 1.289567,2.13636 1.416407,3.47562 0.07693,0.81225 -0.08023,1.6155 -0.562014,2.87261 -0.13146,0.34301 -0.19208,0.67043 -0.134706,0.7276 0.13774,0.13726 0.610706,-0.4535 0.610706,-0.76279 0,-0.39435 0.261127,-0.43936 0.616327,-0.10623 0.258235,0.24218 0.480842,0.31151 1.000202,0.31151 0.567073,0 0.707447,0.0526 0.928773,0.3479 0.375574,0.50112 0.463647,1.86688 0.176201,2.73231 -0.279641,0.84191 -1.124801,1.81287 -1.891829,2.17341 -0.686334,0.32262 -2.075841,1.67928 -2.726081,2.66164 -0.248906,0.37604 -0.715586,1.15995 -1.037066,1.74204 -0.321487,0.58208 -0.86074,1.46154 -1.19834,1.95436 -0.664294,0.96972 -1.233147,2.3224 -1.782214,4.23798 -0.322553,1.1253 -0.34962,1.41826 -0.362953,3.92797 -0.01613,3.0317 -0.172894,3.77561 -0.9925,4.7091 -0.931805,1.06126 -1.861937,3.39186 -1.940127,4.8613 -0.04935,0.92751 -0.192246,1.83164 -0.395304,2.50122 -0.08942,0.29484 0.07752,0.2914 1.072102,-0.0221 z"
++       id="path847"
++       inkscape:connector-curvature="0" />
++    <path
++       sodipodi:type="star"
++       style="fill:#00acff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none"
++       id="path814"
++       sodipodi:sides="4"
++       sodipodi:cx="18.854025"
++       sodipodi:cy="172.98837"
++       sodipodi:r1="1.6036172"
++       sodipodi:r2="1.1339285"
++       sodipodi:arg1="1.5707963"
++       sodipodi:arg2="2.3561945"
++       inkscape:flatsided="true"
++       inkscape:rounded="0"
++       inkscape:randomized="0"
++       d="m 18.854025,174.59199 -1.603617,-1.60362 1.603617,-1.60361 1.603617,1.60361 z"
++       transform="matrix(0.23203125,0.40188991,-0.99392962,0.57384553,246.21921,73.888081)" />
++  </g>
++</svg>
++
+diff --git a/browser/themes/shared/preferences/librewolf.css b/browser/themes/shared/preferences/librewolf.css
+new file mode 100644
+index 0000000..aeb550c
+--- /dev/null
++++ b/browser/themes/shared/preferences/librewolf.css
+@@ -0,0 +1,16 @@
++.librewolf-collapse > input {
++	display: none;
++}
++.librewolf-collapse > input ~ .librewolf-collapsed {
++	display: none;
++	/* max-height: 0; */
++	transition: max-height 0.25s ease-in-out;
++}
++.librewolf-collapse > input:checked ~ .librewolf-collapsed {
++	display: block;
++	/* max-height: 20rem; */
++}
++.librewolf-warning {
++	display: inline;
++	font-size: 0.8em;
++}
+diff --git a/browser/themes/shared/preferences/preferences.inc.css b/browser/themes/shared/preferences/preferences.inc.css
+index 31bffd0..1f9fbcf 100644
+--- a/browser/themes/shared/preferences/preferences.inc.css
++++ b/browser/themes/shared/preferences/preferences.inc.css
+@@ -201,6 +201,10 @@ checkbox {
+   list-style-image: url("chrome://browser/skin/preferences/category-privacy-security.svg");
+ }
+ 
++#category-librewolf > .category-icon {
++  list-style-image: url("chrome://browser/skin/preferences/category-librewolf.svg");
++}
++
+ #category-sync > .category-icon {
+   list-style-image: url("chrome://browser/skin/preferences/category-sync.svg");
+ }
diff --git a/scripts/fetch-pref-pane-patch.sh b/scripts/fetch-pref-pane-patch.sh
new file mode 100755
index 0000000..13555af
--- /dev/null
+++ b/scripts/fetch-pref-pane-patch.sh
@@ -0,0 +1 @@
+wget -O patches/librewolf-pref-pane.patch https://gitlab.com/librewolf-community/browser/librewolf-pref-pane/-/jobs/artifacts/main/raw/librewolf-pref-pane.patch?job=create-patch
diff --git a/scripts/librewolf-patches.py b/scripts/librewolf-patches.py
index f178c01..7554e0a 100755
--- a/scripts/librewolf-patches.py
+++ b/scripts/librewolf-patches.py
@@ -110,6 +110,8 @@ def librewolf_patches():
     for p in patches:
         patch(p)
 
+    # apply xmas.patch seperately
+    patch('../patches/xmas.patch')
 
     #
     # Create the 'lw' folder, it contains the librewolf.cfg and policies.json files.

From f77123356f2d1a5be01468aed884abfc7b5f3d60 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Wed, 19 Jan 2022 13:22:07 +0100
Subject: [PATCH 03/54] removed first non-reproducible part

---
 scripts/librewolf-patches.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/scripts/librewolf-patches.py b/scripts/librewolf-patches.py
index 7554e0a..27c75c7 100755
--- a/scripts/librewolf-patches.py
+++ b/scripts/librewolf-patches.py
@@ -119,19 +119,6 @@ def librewolf_patches():
     
     exec('mkdir -p lw')
     
-    # insert the settings pane source (experimental)
-    exec('rm -rf librewolf-pref-pane')
-    exec('git clone https://gitlab.com/librewolf-community/browser/librewolf-pref-pane.git')
-    os.chdir('librewolf-pref-pane')
-    exec('git diff 1fee314adc81000294fc0cf3196a758e4b64dace > ../lw/librewolf-pref-pane.patch')
-    os.chdir('..')        
-    exec('rm -rf librewolf-pref-pane')
-    
-    patch('lw/librewolf-pref-pane.patch')
-    exec('rm -f lw/librewolf-pref-pane.patch')
-
-
-        
     ##! This is the moment in time we grab the Settings repo HEAD revision
     exec('git clone https://gitlab.com/librewolf-community/settings.git')
     exec("cp -v settings/defaults/pref/local-settings.js lw/")
@@ -139,7 +126,7 @@ def librewolf_patches():
     exec("cp -v settings/librewolf.cfg lw/")
     exec('rm -rf settings')
 
-    # provide a script that fetches and bootstraps Nightly
+    # provide a script that fetches and bootstraps Nightly and some mozconfigs
     exec('cp -v ../scripts/mozfetch.sh lw')
     exec('cp -v ../assets/mozconfig.new ../assets/mozconfig.new.without-wasi ../scripts/setup-wasi-linux.sh lw')
     

From b8af7a1ea45649f9eeb477128944bf9ae45089fa Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Wed, 19 Jan 2022 13:42:43 +0100
Subject: [PATCH 04/54] added a few comments

---
 scripts/librewolf-patches.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/librewolf-patches.py b/scripts/librewolf-patches.py
index 27c75c7..3d9e8d3 100755
--- a/scripts/librewolf-patches.py
+++ b/scripts/librewolf-patches.py
@@ -110,7 +110,8 @@ def librewolf_patches():
     for p in patches:
         patch(p)
 
-    # apply xmas.patch seperately
+    # apply xmas.patch seperately because not all builders use this repo the same way, and
+    # we don't want to disturbe those workflows.
     patch('../patches/xmas.patch')
 
     #
@@ -119,7 +120,7 @@ def librewolf_patches():
     
     exec('mkdir -p lw')
     
-    ##! This is the moment in time we grab the Settings repo HEAD revision
+    ##! [non-reproducible] This is the moment in time we grab the Settings repo HEAD revision
     exec('git clone https://gitlab.com/librewolf-community/settings.git')
     exec("cp -v settings/defaults/pref/local-settings.js lw/")
     exec("cp -v settings/distribution/policies.json lw/")

From 0db2a9e59f09222607256a21c32efe888f6beb2a Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Fri, 21 Jan 2022 10:52:26 +0100
Subject: [PATCH 05/54] v96.0.2-1

---
 README.md | 16 ++++++++--------
 version   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index e37abf8..119cb03 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 ## Building LibreWolf from source:
 
-First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.1-1.source.tar.gz?job=build-job)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
+First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-1.source.tar.gz?job=build-job)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
 
 To download the latest from a script, use wget/curl like this:
 ```
-wget -O librewolf-96.0.1-1.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.1-1.source.tar.gz?job=build-job
-curl -L -o librewolf-96.0.1-1.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.1-1.source.tar.gz?job=build-job
+wget -O librewolf-96.0.2-1.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-1.source.tar.gz?job=build-job
+curl -L -o librewolf-96.0.2-1.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-1.source.tar.gz?job=build-job
 ```
 
 Next, we create ourselves a build folder and extract the tarball.
@@ -13,14 +13,14 @@ Next, we create ourselves a build folder and extract the tarball.
 ```
 mkdir build
 cd build
-tar xf ../librewolf-96.0.1-1.source.tar.gz
+tar xf ../librewolf-96.0.2-1.source.tar.gz
 ```
 
 ### build environment
 
 Next step, if you have not done so already, you must _create the build environment_:
 ```
-./librewolf-96.0.1/lw/mozfetch.sh
+./librewolf-96.0.2/lw/mozfetch.sh
 ```
 This would create a _mozilla-unified_ folder in our 'build' folder, or basically anywhere that is your current working directory. It takes about an hour for me to complete, but it needs to be done only once. This step might fail and cause problems. Hack a bit, and if that fails you can ask on our [Gitter](https://gitter.im/librewolf-community/librewolf)/[Matrix](https://matrix.to/#/#librewolf:matrix.org) channels. There is no need to actually build _mozilla-unified_ (Mozilla Nightly) itself, nor is the folder needed to build LibreWolf. So you can remove it: `rm -rf mozilla-unfied` if you don't plan on using/exploring it.
 
@@ -33,12 +33,12 @@ A few resources:
 * [Compiling C to WebAssembly using clang/LLVM and WASI](https://00f.net/2019/04/07/compiling-to-webassembly-with-llvm-and-clang/).
 * [Firefox 95 on POWER](https://www.talospace.com/2021/12/firefox-95-on-power.html).
 
-To setup the wasi sdk _headers_, you can use _librewolf-96.0.1/lw/setup-wasi-linux.sh_. Please note that this script is a bit experimental and not all kinks have been worked out, but it should work.
+To setup the wasi sdk _headers_, you can use _librewolf-96.0.2/lw/setup-wasi-linux.sh_. Please note that this script is a bit experimental and not all kinks have been worked out, but it should work.
 This might not be enough on all systems. Some systems have the wasi-libc library already installed, and some don't. It depends on the installed version of Clang/LLVM it seems, which should be v8 or above. On debian-based systems: `sudo apt install wasi-libc`, on Arch: `https://archlinux.org/packages/community/any/wasi-libc/` (`pacman -Syu wasi-libc`). Instructions for macos/windows and perhaps other Linux distro's will be added here soon.
 
 Or, the other option is to not use these sandbox libraries: In this case we can't use our standard _mozconfig_ symlink from _mozconfig.new_ into _mozconfig.new.without-wasi_. In that case you have to type something along the lines of:
 ```
-cd librewolf-96.0.1
+cd librewolf-96.0.2
 cp lw/mozconfig.new.without-wasi mozconfig
 cd ..
 ```
@@ -46,7 +46,7 @@ cd ..
 
 Now we're ready to actually build LibreWolf:
 ```
-cd librewolf-96.0.1
+cd librewolf-96.0.2
 ./mach build
 ```
 Also takes me an hour. Then, we can run it:
diff --git a/version b/version
index 8f64e41..00a2ccf 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-96.0.1
\ No newline at end of file
+96.0.2
\ No newline at end of file

From c44517105f688e57d375a603db0ff83a6819b4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Fri, 21 Jan 2022 20:51:43 +0000
Subject: [PATCH 06/54] Add "Release" Stage to GitLab CI

---
 .gitlab-ci.yml | 40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c4ae324..9c37579 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,47 @@
 stages:
   - build
+  - release
 
-build-job:
+Build:
   stage: build
   script:
     - make all
+    - echo VERSION=$(cat version) >> variables.env
+    - echo RELEASE=$(cat release) >> variables.env
   artifacts:
     paths:
-      - librewolf-*.source.*
+      - librewolf-*.source.tar.gz
+    reports:
+      dotenv: variables.env
 
+Release:
+  stage: release
+  when: manual
+  allow_failure: false
+  image: ubuntu
+  needs:
+    - job: "Build"
+      artifacts: true
+  only:
+    - main
+  except:
+    - merge_requests
+  before_script:
+    - apt-get update
+    - apt-get install -y curl
+    - curl -L --output /usr/local/bin/release-cli "https://release-cli-downloads.s3.amazonaws.com/latest/release-cli-linux-amd64"
+    - chmod +x /usr/local/bin/release-cli
+  script:
+    - |
+      curl \
+        --header "JOB-TOKEN: $CI_JOB_TOKEN" \
+        --upload-file librewolf-$VERSION-$RELEASE.source.tar.gz \
+        "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf-source/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.source.tar.gz"
+  release:
+    tag_name: "$VERSION-$RELEASE"
+    description: "LibreWolf v$VERSION-$RELEASE"
+    assets:
+      links:
+        - name: librewolf-$VERSION-$RELEASE.source.tar.gz
+          link_type: package
+          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf-source/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.source.tar.gz

From 73830b6e80e1005eb81f4270daf521749a7d84ec Mon Sep 17 00:00:00 2001
From: fabrizio <fxbrit@tuta.io>
Date: Fri, 21 Jan 2022 21:06:17 +0000
Subject: [PATCH 07/54] close #11

---
 patches/remove_addons.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/remove_addons.patch b/patches/remove_addons.patch
index 3487f6d..bff7319 100644
--- a/patches/remove_addons.patch
+++ b/patches/remove_addons.patch
@@ -2,14 +2,14 @@ diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
 index 269dcb2..ed7c31d 100644
 --- a/browser/extensions/moz.build
 +++ b/browser/extensions/moz.build
-@@ -5,11 +5,8 @@
+@@ -5,11 +5,9 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  DIRS += [
 -    "doh-rollout",
      "formautofill",
      "screenshots",
--    "webcompat",
+     "webcompat",
 -    "report-site-issue",
      "pictureinpicture",
      "proxy-failover",

From 99f2b046ecac6e8e0aa1bbcf99bc98714e1c4b18 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sun, 23 Jan 2022 12:26:41 +0100
Subject: [PATCH 08/54] fix build-job into Build

---
 README.md    | 6 +++---
 README.md.in | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 119cb03..79f0af7 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 ## Building LibreWolf from source:
 
-First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-1.source.tar.gz?job=build-job)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
+First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-1.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
 
 To download the latest from a script, use wget/curl like this:
 ```
-wget -O librewolf-96.0.2-1.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-1.source.tar.gz?job=build-job
-curl -L -o librewolf-96.0.2-1.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-1.source.tar.gz?job=build-job
+wget -O librewolf-96.0.2-1.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-1.source.tar.gz?job=Build
+curl -L -o librewolf-96.0.2-1.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-1.source.tar.gz?job=Build
 ```
 
 Next, we create ourselves a build folder and extract the tarball.
diff --git a/README.md.in b/README.md.in
index a26b5d6..13657dc 100644
--- a/README.md.in
+++ b/README.md.in
@@ -1,11 +1,11 @@
 ## Building LibreWolf from source:
 
-First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=build-job)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
+First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
 
 To download the latest from a script, use wget/curl like this:
 ```
-wget -O librewolf-__VERSION__-__RELEASE__.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=build-job
-curl -L -o librewolf-__VERSION__-__RELEASE__.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=build-job
+wget -O librewolf-__VERSION__-__RELEASE__.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build
+curl -L -o librewolf-__VERSION__-__RELEASE__.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build
 ```
 
 Next, we create ourselves a build folder and extract the tarball.

From 84cd52f3670fa9f4f876c42a59ed5029fce14d5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Sun, 23 Jan 2022 19:50:03 +0100
Subject: [PATCH 09/54] overwrite firefox version with librewolf version

---
 Makefile                     |  3 +--
 scripts/librewolf-patches.py | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 63b42a6..7653488 100644
--- a/Makefile
+++ b/Makefile
@@ -51,10 +51,9 @@ librewolf-$(version)-$(release).source$(ext) : $(upstream_filename) ./version ./
 	$(MAKE) clean_upstream_dir
 	rm -rf librewolf-$(version)
 	$(MAKE) create_lw_from_upstream_dir
-	python3 scripts/librewolf-patches.py $(version)
+	python3 scripts/librewolf-patches.py $(version) $(release)
 	rm -f librewolf-$(version)-$(release).source$(ext)
 	$(archive_create) librewolf-$(version)-$(release).source$(ext) librewolf-$(version)
-	rm -rf librewolf-$(version)
 
 librewolf-$(version) : librewolf-$(version)-$(release).source$(ext)
 	tar xf librewolf-$(version)-$(release).source$(ext)
diff --git a/scripts/librewolf-patches.py b/scripts/librewolf-patches.py
index 3d9e8d3..f86c8c7 100755
--- a/scripts/librewolf-patches.py
+++ b/scripts/librewolf-patches.py
@@ -9,7 +9,6 @@ import os
 import sys
 import optparse
 import time
-import glob
 
 
 #
@@ -99,16 +98,9 @@ def librewolf_patches():
     exec('cp -v ../assets/search-config.json services/settings/dumps/main/search-config.json')
 
     # read lines of .txt file into 'patches'
-    f = open('../assets/patches.txt'.format(version), "r")
-    lines = f.readlines()
-    f.close()
-    patches = []
-    for line in lines:
-        patches.append('../'+line)
-
-        
-    for p in patches:
-        patch(p)
+    with open('../assets/patches.txt'.format(version), "r") as f:
+        for line in f.readlines():
+            patch('../'+line)
 
     # apply xmas.patch seperately because not all builders use this repo the same way, and
     # we don't want to disturbe those workflows.
@@ -130,6 +122,11 @@ def librewolf_patches():
     # provide a script that fetches and bootstraps Nightly and some mozconfigs
     exec('cp -v ../scripts/mozfetch.sh lw')
     exec('cp -v ../assets/mozconfig.new ../assets/mozconfig.new.without-wasi ../scripts/setup-wasi-linux.sh lw')
+
+    # override the firefox version
+    for file in ["browser/config/version.txt", "browser/config/version_display.txt"]:
+        with open(file, "w") as f:
+            f.write("{}-{}".format(version,release))
     
     leave_srcdir()
 
@@ -139,10 +136,11 @@ def librewolf_patches():
 # Main functionality in this script.. which is to call librewolf_patches()
 #
 
-if len(args) != 1:
-    sys.stderr.write('error: please specify version of librewolf source')
+if len(args) != 2:
+    sys.stderr.write('error: please specify version and release of librewolf source')
     sys.exit(1)
 version = args[0]
+release = args[1]
 if not os.path.exists('librewolf-{}'.format(version) + '/configure.py'):
     sys.stderr.write('error: folder doesn\'t look like a Firefox folder.')
     sys.exit(1)

From ac6b20c699a03a572126bf396422bd32d9659268 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Mon, 24 Jan 2022 12:49:36 +0100
Subject: [PATCH 10/54] fix .PHONY and some dependencies

---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7653488..57b4429 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY : all help clean veryclean librewolf-patches check librewolf
+.PHONY : help check all clean veryclean build package run
 
 version:=$(shell cat ./version)
 release:=$(shell cat ./release)
@@ -54,6 +54,7 @@ librewolf-$(version)-$(release).source$(ext) : $(upstream_filename) ./version ./
 	python3 scripts/librewolf-patches.py $(version) $(release)
 	rm -f librewolf-$(version)-$(release).source$(ext)
 	$(archive_create) librewolf-$(version)-$(release).source$(ext) librewolf-$(version)
+	touch librewolf-$(version)
 
 librewolf-$(version) : librewolf-$(version)-$(release).source$(ext)
 	tar xf librewolf-$(version)-$(release).source$(ext)
@@ -61,10 +62,10 @@ librewolf-$(version) : librewolf-$(version)-$(release).source$(ext)
 build : librewolf-$(version)
 	(cd librewolf-$(version) && ./mach build)
 
-package : build
+package : librewolf-$(version)
 	(cd librewolf-$(version) && ./mach package)
 
-run : build
+run : librewolf-$(version)
 	(cd librewolf-$(version) && ./mach run)
 
 README.md : README.md.in ./version ./release

From 554e896e297e08af9391099ae6e166f12993ac09 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Mon, 24 Jan 2022 12:57:44 +0100
Subject: [PATCH 11/54] changed to using Settings as a submodule

---
 .gitmodules                  |  3 +++
 scripts/librewolf-patches.py | 15 +++++++--------
 submodules/settings          |  1 +
 3 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 submodules/settings

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..bc0e837
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "submodules/settings"]
+	path = submodules/settings
+	url = git@gitlab.com:librewolf-community/settings.git
diff --git a/scripts/librewolf-patches.py b/scripts/librewolf-patches.py
index f86c8c7..8bc58e3 100755
--- a/scripts/librewolf-patches.py
+++ b/scripts/librewolf-patches.py
@@ -112,16 +112,15 @@ def librewolf_patches():
     
     exec('mkdir -p lw')
     
-    ##! [non-reproducible] This is the moment in time we grab the Settings repo HEAD revision
-    exec('git clone https://gitlab.com/librewolf-community/settings.git')
-    exec("cp -v settings/defaults/pref/local-settings.js lw/")
-    exec("cp -v settings/distribution/policies.json lw/")
-    exec("cp -v settings/librewolf.cfg lw/")
-    exec('rm -rf settings')
+    # getting the librewolf settings repository
+    exec("cp -v ../submodules/settings/defaults/pref/local-settings.js lw/")
+    exec("cp -v ../submodules/settings/distribution/policies.json lw/")
+    exec("cp -v ../submodules/settings/librewolf.cfg lw/")
 
+    
     # provide a script that fetches and bootstraps Nightly and some mozconfigs
-    exec('cp -v ../scripts/mozfetch.sh lw')
-    exec('cp -v ../assets/mozconfig.new ../assets/mozconfig.new.without-wasi ../scripts/setup-wasi-linux.sh lw')
+    exec('cp -v ../scripts/mozfetch.sh lw/')
+    exec('cp -v ../assets/mozconfig.new ../assets/mozconfig.new.without-wasi ../scripts/setup-wasi-linux.sh lw/')
 
     # override the firefox version
     for file in ["browser/config/version.txt", "browser/config/version_display.txt"]:
diff --git a/submodules/settings b/submodules/settings
new file mode 160000
index 0000000..c256656
--- /dev/null
+++ b/submodules/settings
@@ -0,0 +1 @@
+Subproject commit c256656f377d3c15a8c7537c65f45dc802904df7

From 3e5aa00b7c745639237349dbb85f975a98d470f8 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Mon, 24 Jan 2022 13:06:08 +0100
Subject: [PATCH 12/54] added phony update target to update the submodule(s)

---
 Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 57b4429..59df311 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY : help check all clean veryclean build package run
+.PHONY : help check all clean veryclean build package run update
 
 version:=$(shell cat ./version)
 release:=$(shell cat ./release)
@@ -29,8 +29,8 @@ help : README.md
 	@echo ""
 
 
-check : README.md
-	@python3 scripts/update-version.py
+check : update README.md
+	python3 scripts/update-version.py
 	@echo "Current release:" $$(cat ./release)
 
 
@@ -73,3 +73,6 @@ README.md : README.md.in ./version ./release
 	@sed "s/__RELEASE__/$(release)/g" < tmp > $@
 	@rm -f tmp
 
+
+update : README.md
+	git submodule update --recursive --remote

From 93c78778f61a6cb64f198ba66700c957b72464ad Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Mon, 24 Jan 2022 13:09:36 +0100
Subject: [PATCH 13/54] minor fix

---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 59df311..0b21cdf 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,6 @@ clean :
 
 veryclean : clean
 	$(MAKE) clean_upstream_file
-	rm -rf librewolf-$(version)
 
 librewolf-$(version)-$(release).source$(ext) : $(upstream_filename) ./version ./release scripts/librewolf-patches.py assets/mozconfig assets/patches.txt README.md
 	$(MAKE) clean_upstream_dir

From 28c5aedb1a4d9d7af6f4365fd7d6985c90b0992b Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Mon, 24 Jan 2022 13:18:33 +0100
Subject: [PATCH 14/54] now using recursive git submodule strategy

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c37579..00516b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,8 @@ stages:
 
 Build:
   stage: build
+  variables:
+     GIT_SUBMODULE_STRATEGY: recursive
   script:
     - make all
     - echo VERSION=$(cat version) >> variables.env

From f6f183795672f92186b02865bb3dd5922547682d Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Mon, 24 Jan 2022 13:21:14 +0100
Subject: [PATCH 15/54] using https on this (readonly) Settings submodule

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index bc0e837..f48d85d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "submodules/settings"]
 	path = submodules/settings
-	url = git@gitlab.com:librewolf-community/settings.git
+	url = https://gitlab.com/librewolf-community/settings.git

From 05c8f530e4083be07cdf938dedb0cd116af8412c Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 25 Jan 2022 00:44:26 +0100
Subject: [PATCH 16/54] fixes

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0b21cdf..c380c84 100644
--- a/Makefile
+++ b/Makefile
@@ -61,10 +61,10 @@ librewolf-$(version) : librewolf-$(version)-$(release).source$(ext)
 build : librewolf-$(version)
 	(cd librewolf-$(version) && ./mach build)
 
-package : librewolf-$(version)
+package : build
 	(cd librewolf-$(version) && ./mach package)
 
-run : librewolf-$(version)
+run : build
 	(cd librewolf-$(version) && ./mach run)
 
 README.md : README.md.in ./version ./release

From 47d927612ba6acc2498b3b5d039180944685343f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Wed, 26 Jan 2022 10:30:39 +0000
Subject: [PATCH 17/54] Custom uBO `assets.json` patch

---
 assets/patches.txt                            |  1 +
 assets/uBOAssets.json                         |  1 +
 ...custom-ubo-assets-bootstrap-location.patch | 17 +++++++
 scripts/update-ubo-assets.sh                  | 44 +++++++++++++++++++
 4 files changed, 63 insertions(+)
 create mode 100644 assets/uBOAssets.json
 create mode 100644 patches/custom-ubo-assets-bootstrap-location.patch
 create mode 100755 scripts/update-ubo-assets.sh

diff --git a/assets/patches.txt b/assets/patches.txt
index fcc0f83..9012edc 100644
--- a/assets/patches.txt
+++ b/assets/patches.txt
@@ -1,5 +1,6 @@
 patches/allow-ubo-private-mode.patch
 patches/context-menu.patch
+patches/custom-ubo-assets-bootstrap-location.patch
 patches/disable-data-reporting-at-compile-time.patch
 patches/librewolf-pref-pane.patch
 patches/mozilla-vpn-ad.patch
diff --git a/assets/uBOAssets.json b/assets/uBOAssets.json
new file mode 100644
index 0000000..cb51e1e
--- /dev/null
+++ b/assets/uBOAssets.json
@@ -0,0 +1 @@
+{"assets.json":{"content":"internal","updateAfter":7,"contentURL":"https://gitlab.com/librewolf-community/browser/source/-/raw/main/assets/uBOAssets.json"},"public_suffix_list.dat":{"content":"internal","updateAfter":19,"contentURL":["https://publicsuffix.org/list/public_suffix_list.dat","https://gitcdn.xyz/repo/publicsuffix/list/master/public_suffix_list.dat","assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat"]},"ublock-badlists":{"content":"internal","updateAfter":13,"contentURL":["https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badlists.txt","assets/ublock/badlists.txt"],"cdnURLs":["https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/badlists.txt","https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/badlists.txt","https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/badlists.txt","https://combinatronics.io/uBlockOrigin/uAssets/master/filters/badlists.txt"]},"ublock-filters":{"content":"filters","group":"default","title":"uBlock filters","contentURL":["https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt","assets/ublock/filters.txt"],"cdnURLs":["https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/filters.txt","https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/filters.txt","https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/filters.txt","https://combinatronics.io/uBlockOrigin/uAssets/master/filters/filters.txt","https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt"],"supportURL":"https://github.com/uBlockOrigin/uAssets/issues"},"ublock-badware":{"content":"filters","group":"default","title":"uBlock filters – Badware risks","contentURL":["https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt","assets/ublock/badware.txt"],"cdnURLs":["https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/badware.txt","https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/badware.txt","https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/badware.txt","https://combinatronics.io/uBlockOrigin/uAssets/master/filters/badware.txt"],"supportURL":"https://github.com/gorhill/uBlock/wiki/Badware-risks","instructionURL":"https://github.com/gorhill/uBlock/wiki/Badware-risks"},"ublock-privacy":{"content":"filters","group":"default","title":"uBlock filters – Privacy","contentURL":["https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/privacy.txt","assets/ublock/privacy.txt"],"cdnURLs":["https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/privacy.txt","https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/privacy.txt","https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/privacy.txt","https://combinatronics.io/uBlockOrigin/uAssets/master/filters/privacy.txt"]},"ublock-abuse":{"content":"filters","group":"default","title":"uBlock filters – Resource abuse","contentURL":["https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt","assets/ublock/resource-abuse.txt"],"cdnURLs":["https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/resource-abuse.txt","https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/resource-abuse.txt","https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/resource-abuse.txt","https://combinatronics.io/uBlockOrigin/uAssets/master/filters/resource-abuse.txt"]},"ublock-unbreak":{"content":"filters","group":"default","title":"uBlock filters – Unbreak","contentURL":["https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/unbreak.txt","assets/ublock/unbreak.txt"],"cdnURLs":["https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/unbreak.txt","https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/unbreak.txt","https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/unbreak.txt","https://combinatronics.io/uBlockOrigin/uAssets/master/filters/unbreak.txt"]},"adguard-generic":{"content":"filters","group":"ads","off":true,"title":"AdGuard Base","contentURL":"https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt","supportURL":"https://github.com/AdguardTeam/AdguardFilters#adguard-filters","instructionURL":"https://kb.adguard.com/en/general/adguard-ad-filters"},"adguard-mobile":{"content":"filters","group":"ads","off":true,"title":"AdGuard Mobile Ads","ua":"mobile","contentURL":"https://filters.adtidy.org/extension/ublock/filters/11.txt","supportURL":"https://github.com/AdguardTeam/AdguardFilters#adguard-filters","instructionURL":"https://kb.adguard.com/en/general/adguard-ad-filters"},"easylist":{"content":"filters","group":"ads","title":"EasyList","contentURL":["https://easylist.to/easylist/easylist.txt","https://secure.fanboy.co.nz/easylist.txt","https://easylist-downloads.adblockplus.org/easylist.txt","assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt"],"supportURL":"https://easylist.to/"},"adguard-spyware":{"content":"filters","group":"privacy","off":true,"title":"AdGuard Tracking Protection","contentURL":"https://filters.adtidy.org/extension/ublock/filters/3.txt","supportURL":"https://github.com/AdguardTeam/AdguardFilters#adguard-filters","instructionURL":"https://kb.adguard.com/en/general/adguard-ad-filters"},"adguard-spyware-url":{"content":"filters","group":"privacy","title":"AdGuard URL Tracking Protection","contentURL":"https://filters.adtidy.org/extension/ublock/filters/17.txt","supportURL":"https://github.com/AdguardTeam/AdguardFilters#adguard-filters","instructionURL":"https://kb.adguard.com/en/general/adguard-ad-filters"},"block-lan":{"content":"filters","group":"privacy","off":true,"title":"Block Outsider Intrusion into LAN","contentURL":"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/lan-block.txt","cdnURLs":["https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/lan-block.txt","https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/lan-block.txt","https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/lan-block.txt","https://combinatronics.io/uBlockOrigin/uAssets/master/filters/lan-block.txt"],"supportURL":"https://github.com/uBlockOrigin/uAssets/issues"},"easyprivacy":{"content":"filters","group":"privacy","title":"EasyPrivacy","contentURL":["https://easylist.to/easylist/easyprivacy.txt","https://secure.fanboy.co.nz/easyprivacy.txt","https://easylist-downloads.adblockplus.org/easyprivacy.txt","assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt"],"supportURL":"https://easylist.to/"},"urlhaus-1":{"content":"filters","group":"malware","title":"Online Malicious URL Blocklist","contentURL":["https://curben.gitlab.io/malware-filter/urlhaus-filter-online.txt","assets/thirdparties/urlhaus-filter/urlhaus-filter-online.txt"],"cdnURLs":["https://curbengh.github.io/malware-filter/urlhaus-filter-online.txt","https://curben.gitlab.io/urlhaus-filter/urlhaus-filter-online.txt","https://malware-filter.pages.dev/urlhaus-filter-online.txt","https://malware-filter.netlify.app/urlhaus-filter-online.txt"],"supportURL":"https://gitlab.com/curben/urlhaus-filter#malicious-url-blocklist"},"curben-phishing":{"content":"filters","group":"malware","title":"Phishing URL Blocklist","contentURL":"https://curben.gitlab.io/malware-filter/phishing-filter.txt","cdnURLs":["https://curbengh.github.io/phishing-filter/phishing-filter.txt","https://curben.gitlab.io/phishing-filter/phishing-filter.txt","https://phishing-filter.pages.dev/phishing-filter.txt","https://phishing-filter.netlify.app/phishing-filter.txt"],"supportURL":"https://gitlab.com/curben/phishing-filter#phishing-url-blocklist"},"curben-pup":{"content":"filters","group":"malware","off":true,"title":"PUP Domains Blocklist","contentURL":"https://curben.gitlab.io/malware-filter/pup-filter.txt","cdnURLs":["https://curbengh.github.io/pup-filter/pup-filter.txt","https://curben.gitlab.io/pup-filter/pup-filter.txt","https://pup-filter.pages.dev/pup-filter.txt","https://pup-filter.netlify.app/pup-filter.txt"],"supportURL":"https://gitlab.com/curben/pup-filter#pup-domains-blocklist"},"adguard-annoyance":{"content":"filters","group":"social","off":true,"title":"AdGuard Annoyances","contentURL":"https://filters.adtidy.org/extension/ublock/filters/14.txt","supportURL":"https://github.com/AdguardTeam/AdguardFilters#adguard-filters","instructionURL":"https://kb.adguard.com/en/general/adguard-ad-filters"},"adguard-social":{"content":"filters","group":"social","off":true,"title":"AdGuard Social Media","contentURL":"https://filters.adtidy.org/extension/ublock/filters/4.txt","supportURL":"https://github.com/AdguardTeam/AdguardFilters#adguard-filters","instructionURL":"https://kb.adguard.com/en/general/adguard-ad-filters"},"fanboy-thirdparty_social":{"content":"filters","group":"social","off":true,"title":"Anti-Facebook","contentURL":"https://secure.fanboy.co.nz/fanboy-antifacebook.txt","supportURL":"https://github.com/ryanbr/fanboy-adblock/issues"},"fanboy-annoyance":{"content":"filters","group":"social","off":true,"title":"Fanboy’s Annoyance","contentURL":"https://secure.fanboy.co.nz/fanboy-annoyance.txt","supportURL":"https://easylist.to/"},"fanboy-cookiemonster":{"content":"filters","group":"social","off":true,"title":"EasyList Cookie","contentURL":"https://secure.fanboy.co.nz/fanboy-cookiemonster.txt","supportURL":"https://github.com/easylist/easylist/issues"},"fanboy-social":{"content":"filters","group":"social","off":true,"title":"Fanboy’s Social","contentURL":["https://easylist.to/easylist/fanboy-social.txt","https://secure.fanboy.co.nz/fanboy-social.txt"],"supportURL":"https://easylist.to/"},"ublock-annoyances":{"content":"filters","group":"social","title":"uBlock filters – Annoyances","off":true,"contentURL":"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/annoyances.txt","cdnURLs":["https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/annoyances.txt","https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/annoyances.txt","https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/annoyances.txt"]},"dpollock-0":{"content":"filters","group":"multipurpose","updateAfter":11,"off":true,"title":"Dan Pollock’s hosts file","contentURL":"https://someonewhocares.org/hosts/hosts","supportURL":"https://someonewhocares.org/hosts/"},"mvps-0":{"content":"filters","group":"multipurpose","updateAfter":11,"off":true,"title":"MVPS HOSTS","contentURL":"https://winhelp2002.mvps.org/hosts.txt","supportURL":"https://winhelp2002.mvps.org/"},"plowe-0":{"content":"filters","group":"multipurpose","updateAfter":13,"title":"Peter Lowe’s Ad and tracking server list","contentURL":["https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext","assets/thirdparties/pgl.yoyo.org/as/serverlist.txt","assets/thirdparties/pgl.yoyo.org/as/serverlist"],"supportURL":"https://pgl.yoyo.org/adservers/"},"ALB-0":{"content":"filters","group":"regions","off":true,"title":"ALB: Adblock List for Albania","lang":"sq","contentURL":"https://raw.githubusercontent.com/AnXh3L0/blocklist/master/albanian-easylist-addition/Albania.txt","supportURL":"https://github.com/AnXh3L0/blocklist"},"ara-0":{"content":"filters","group":"regions","off":true,"title":"ara: Liste AR","lang":"ar","contentURL":"https://easylist-downloads.adblockplus.org/Liste_AR.txt","supportURL":"https://forums.lanik.us/viewforum.php?f=98"},"BGR-0":{"content":"filters","group":"regions","off":true,"title":"BGR: Bulgarian Adblock list","lang":"bg mk","contentURL":"https://stanev.org/abp/adblock_bg.txt","supportURL":"https://stanev.org/abp/"},"CHN-0":{"content":"filters","group":"regions","off":true,"title":"CHN: AdGuard Chinese (中文)","lang":"ug zh","contentURL":"https://filters.adtidy.org/extension/ublock/filters/224.txt","supportURL":"https://github.com/AdguardTeam/AdguardFilters#adguard-filters"},"CZE-0":{"content":"filters","group":"regions","off":true,"title":"CZE, SVK: EasyList Czech and Slovak","lang":"cs sk","contentURL":"https://raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt","supportURL":"https://github.com/tomasko126/easylistczechandslovak"},"DEU-0":{"content":"filters","group":"regions","off":true,"title":"DEU: EasyList Germany","lang":"de dsb hsb lb rm","contentURL":["https://easylist.to/easylistgermany/easylistgermany.txt","https://easylist-downloads.adblockplus.org/easylistgermany.txt"],"supportURL":"https://forums.lanik.us/viewforum.php?f=90"},"EST-0":{"content":"filters","group":"regions","off":true,"title":"EST: Eesti saitidele kohandatud filter","lang":"et","contentURL":"https://adblock.ee/list.php","supportURL":"https://adblock.ee/"},"FIN-0":{"content":"filters","group":"regions","off":true,"title":"FIN: Adblock List for Finland","lang":"fi","contentURL":"https://raw.githubusercontent.com/finnish-easylist-addition/finnish-easylist-addition/master/Finland_adb.txt","supportURL":"https://github.com/finnish-easylist-addition/finnish-easylist-addition"},"FRA-0":{"content":"filters","group":"regions","off":true,"title":"FRA: AdGuard Français","lang":"ar br ff fr lb oc son","contentURL":"https://filters.adtidy.org/extension/ublock/filters/16.txt","supportURL":"https://github.com/AdguardTeam/AdguardFilters#adguard-filters"},"GRC-0":{"content":"filters","group":"regions","off":true,"title":"GRC: Greek AdBlock Filter","lang":"el","contentURL":"https://www.void.gr/kargig/void-gr-filters.txt","supportURL":"https://github.com/kargig/greek-adblockplus-filter"},"HUN-0":{"content":"filters","group":"regions","off":true,"title":"HUN: hufilter","lang":"hu","contentURL":"https://raw.githubusercontent.com/hufilter/hufilter/master/hufilter-ublock.txt","supportURL":"https://github.com/hufilter/hufilter"},"IDN-0":{"content":"filters","group":"regions","off":true,"title":"IDN, MYS: ABPindo","lang":"id ms","contentURL":"https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt","supportURL":"https://github.com/ABPindo/indonesianadblockrules"},"IRN-0":{"content":"filters","group":"regions","off":true,"title":"IRN: Adblock-Iran","lang":"fa","contentURL":["https://gitcdn.xyz/repo/farrokhi/adblock-iran/master/filter.txt","https://combinatronics.io/farrokhi/adblock-iran/master/filter.txt","https://cdn.statically.io/gh/farrokhi/adblock-iran/master/filter.txt"],"supportURL":"https://github.com/farrokhi/adblock-iran"},"ISL-0":{"content":"filters","group":"regions","off":true,"title":"ISL: Icelandic ABP List","lang":"is","contentURL":"https://adblock.gardar.net/is.abp.txt","supportURL":"https://adblock.gardar.net/"},"ISR-0":{"content":"filters","group":"regions","off":true,"title":"ISR: EasyList Hebrew","lang":"he","contentURL":"https://raw.githubusercontent.com/easylist/EasyListHebrew/master/EasyListHebrew.txt","supportURL":"https://github.com/easylist/EasyListHebrew"},"ITA-0":{"content":"filters","group":"regions","off":true,"title":"ITA: EasyList Italy","lang":"it lij","contentURL":"https://easylist-downloads.adblockplus.org/easylistitaly.txt","supportURL":"https://forums.lanik.us/viewforum.php?f=96"},"JPN-1":{"content":"filters","group":"regions","off":true,"title":"JPN: AdGuard Japanese","lang":"ja","contentURL":"https://filters.adtidy.org/extension/ublock/filters/7.txt","supportURL":"https://github.com/AdguardTeam/AdguardFilters#adguard-filters","instructionURL":"https://kb.adguard.com/en/general/adguard-ad-filters"},"KOR-1":{"content":"filters","group":"regions","off":true,"title":"KOR: YousList","lang":"ko","contentURL":"https://raw.githubusercontent.com/yous/YousList/master/youslist.txt","supportURL":"https://github.com/yous/YousList"},"LTU-0":{"content":"filters","group":"regions","off":true,"title":"LTU: EasyList Lithuania","lang":"lt","contentURL":"https://raw.githubusercontent.com/EasyList-Lithuania/easylist_lithuania/master/easylistlithuania.txt","cdnURLs":["https://gitcdn.xyz/repo/EasyList-Lithuania/easylist_lithuania/master/easylistlithuania.txt","https://cdn.jsdelivr.net/gh/EasyList-Lithuania/easylist_lithuania@master/easylistlithuania.txt","https://cdn.statically.io/gl/DandelionSprout/easylist_lithuania/raw/master/easylistlithuania.txt"],"supportURL":"https://github.com/EasyList-Lithuania/easylist_lithuania"},"LVA-0":{"content":"filters","group":"regions","off":true,"title":"LVA: Latvian List","lang":"lv","contentURL":"https://notabug.org/latvian-list/adblock-latvian/raw/master/lists/latvian-list.txt","supportURL":"https://notabug.org/latvian-list/adblock-latvian"},"NLD-0":{"content":"filters","group":"regions","off":true,"title":"NLD: EasyDutch","lang":"af fy nl","contentURL":"https://raw.githubusercontent.com/EasyDutch-uBO/EasyDutch/main/EasyDutch.txt","supportURL":"https://github.com/EasyDutch-uBO/EasyDutch/"},"NOR-0":{"content":"filters","group":"regions","off":true,"title":"NOR, DNK, ISL: Dandelion Sprouts nordiske filtre","lang":"nb nn no da is","contentURL":["https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianList.txt"],"cdnURLs":["https://gitcdn.xyz/repo/DandelionSprout/adfilt/master/NorwegianList.txt","https://cdn.jsdelivr.net/gh/DandelionSprout/adfilt@master/NorwegianList.txt","https://cdn.statically.io/gl/DandelionSprout/adfilt/master/NorwegianList.txt"],"supportURL":"https://github.com/DandelionSprout/adfilt"},"POL-0":{"content":"filters","group":"regions","off":true,"title":"POL: Oficjalne Polskie Filtry do AdBlocka, uBlocka Origin i AdGuarda","lang":"szl pl","contentURL":"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock.txt","supportURL":"https://github.com/MajkiIT/polish-ads-filter/issues","instructionURL":"https://github.com/MajkiIT/polish-ads-filter#polish-filters-for-adblock-ublock-origin--adguard"},"POL-2":{"content":"filters","group":"regions","off":true,"title":"POL: Oficjalne polskie filtry przeciwko alertom o Adblocku","lang":"szl pl","contentURL":"https://raw.githubusercontent.com/olegwukr/polish-privacy-filters/master/anti-adblock.txt","supportURL":"https://github.com/olegwukr/polish-privacy-filters/issues"},"ROU-1":{"content":"filters","group":"regions","off":true,"title":"ROU: Romanian Ad (ROad) Block List Light","lang":"ro","contentURL":["https://road.adblock.ro/lista.txt","https://raw.githubusercontent.com/tcptomato/ROad-Block/master/road-block-filters-light.txt"],"supportURL":"https://github.com/tcptomato/ROad-Block"},"RUS-0":{"content":"filters","group":"regions","off":true,"title":"RUS: RU AdList","lang":"be kk tt ru uk uz","contentURL":"https://easylist-downloads.adblockplus.org/advblock+cssfixes.txt","supportURL":"https://forums.lanik.us/viewforum.php?f=102","instructionURL":"https://forums.lanik.us/viewtopic.php?f=102&t=22512"},"spa-0":{"content":"filters","group":"regions","off":true,"title":"spa: EasyList Spanish","lang":"an ast ca cak es eu gn gl trs quz","contentURL":"https://easylist-downloads.adblockplus.org/easylistspanish.txt","supportURL":"https://forums.lanik.us/viewforum.php?f=103"},"spa-1":{"content":"filters","group":"regions","off":true,"title":"spa, por: AdGuard Spanish/Portuguese","lang":"an ast ca cak es eu gl gn trs pt quz","contentURL":"https://filters.adtidy.org/extension/ublock/filters/9.txt","supportURL":"https://github.com/AdguardTeam/AdguardFilters#adguard-filters","instructionURL":"https://kb.adguard.com/en/general/adguard-ad-filters"},"SVN-0":{"content":"filters","group":"regions","off":true,"title":"SVN: Slovenian List","lang":"sl","contentURL":"https://raw.githubusercontent.com/betterwebleon/slovenian-list/master/filters.txt","supportURL":"https://github.com/betterwebleon/slovenian-list"},"SWE-1":{"content":"filters","group":"regions","off":true,"title":"SWE: Frellwit's Swedish Filter","lang":"sv","contentURL":"https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/master/Frellwits-Swedish-Filter.txt","supportURL":"https://github.com/lassekongo83/Frellwits-filter-lists"},"THA-0":{"content":"filters","group":"regions","off":true,"title":"THA: EasyList Thailand","lang":"th","contentURL":"https://raw.githubusercontent.com/easylist-thailand/easylist-thailand/master/subscription/easylist-thailand.txt","supportURL":"https://github.com/easylist-thailand/easylist-thailand"},"TUR-0":{"content":"filters","group":"regions","off":true,"title":"TUR: AdGuard Turkish","lang":"tr","contentURL":"https://filters.adtidy.org/extension/ublock/filters/13.txt","supportURL":"https://github.com/AdguardTeam/AdguardFilters#adguard-filters","instructionURL":"https://kb.adguard.com/en/general/adguard-ad-filters"},"VIE-1":{"content":"filters","group":"regions","off":true,"title":"VIE: ABPVN List","lang":"vi","contentURL":"https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn_ublock.txt","supportURL":"https://abpvn.com/"},"LegitimateURLShortener":{"content":"filters","group":"privacy","title":"➗ Actually Legitimate URL Shortener Tool","contentURL":"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/LegitimateURLShortener.txt","supportURL":"https://github.com/DandelionSprout/adfilt/discussions/163"}}
diff --git a/patches/custom-ubo-assets-bootstrap-location.patch b/patches/custom-ubo-assets-bootstrap-location.patch
new file mode 100644
index 0000000..9678c4b
--- /dev/null
+++ b/patches/custom-ubo-assets-bootstrap-location.patch
@@ -0,0 +1,17 @@
+--- a/toolkit/components/extensions/parent/ext-storage.js
++++ b/toolkit/components/extensions/parent/ext-storage.js
+@@ -177,6 +177,14 @@ this.storage = class extends ExtensionAPI {
+ 
+             let data = await lookup;
+             if (!data) {
++              const assetsBootstrapLocation = Services.prefs.getBoolPref("librewolf.uBO.assetsBootstrapLocation", undefined);
++              if (extension.id == "uBlock0@raymondhill.net" && assetsBootstrapLocation) {
++                return {
++                  adminSettings: {
++                    assetsBootstrapLocation
++                  }
++                }
++              }
+               return Promise.reject({
+                 message: "Managed storage manifest not found",
+               });
diff --git a/scripts/update-ubo-assets.sh b/scripts/update-ubo-assets.sh
new file mode 100755
index 0000000..7a5d9b8
--- /dev/null
+++ b/scripts/update-ubo-assets.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+set -e
+echo "update-ubo-assets.sh"
+echo
+
+# Download the original assets.json from GitHub
+echo "-> Downloading original assets.json"
+assets=$(curl https://raw.githubusercontent.com/gorhill/uBlock/master/assets/assets.json)
+
+# Overwrite the contentURL of assets.json so that uBO will always use the LW provided version
+echo "-> Overwriting assets.json update location"
+assets=$(echo "$assets" | jq '
+  del(.["assets.json"].cdnURLs) | 
+  .["assets.json"].contentURL = "https://gitlab.com/librewolf-community/browser/source/-/raw/main/assets/uBOAssets.json"
+')
+
+# Enable some filter lists that are disabled by default
+function enable_filter_list {
+  echo "-> Enabling filter list \"$1\""
+  assets=$(echo "$assets" | jq "del(.[\"$1\"].off)")
+}
+enable_filter_list "curben-phishing"
+enable_filter_list "adguard-spyware-url"
+
+# Add some custom filter lists
+function add_filter_list {
+  echo "-> Adding custom filter list \"$1\""
+  assets=$(echo "$assets" | jq ".[\"$1\"] = $2")
+}
+add_filter_list "LegitimateURLShortener" '{
+  "content": "filters",
+  "group": "privacy",
+  "title": "➗ Actually Legitimate URL Shortener Tool",
+  "contentURL": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/LegitimateURLShortener.txt",
+  "supportURL": "https://github.com/DandelionSprout/adfilt/discussions/163"
+}'
+
+# Write the resulting json into line 4 of the patchfile
+echo "-> Writing to assets/uBOAssets.json"
+echo $assets | jq -c >./assets/uBOAssets.json
+
+echo
+echo "Done!"

From 47060e112a49069fce42aa093ab97eda6298bef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Wed, 26 Jan 2022 11:40:27 +0100
Subject: [PATCH 18/54] fix error in ubo patch

---
 patches/custom-ubo-assets-bootstrap-location.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/custom-ubo-assets-bootstrap-location.patch b/patches/custom-ubo-assets-bootstrap-location.patch
index 9678c4b..81a703f 100644
--- a/patches/custom-ubo-assets-bootstrap-location.patch
+++ b/patches/custom-ubo-assets-bootstrap-location.patch
@@ -4,7 +4,7 @@
  
              let data = await lookup;
              if (!data) {
-+              const assetsBootstrapLocation = Services.prefs.getBoolPref("librewolf.uBO.assetsBootstrapLocation", undefined);
++              const assetsBootstrapLocation = Services.prefs.getStringPref("librewolf.uBO.assetsBootstrapLocation", undefined);
 +              if (extension.id == "uBlock0@raymondhill.net" && assetsBootstrapLocation) {
 +                return {
 +                  adminSettings: {

From f108db5ece25e269316abc827da31685a03482fd Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Wed, 26 Jan 2022 11:52:13 +0100
Subject: [PATCH 19/54] fixes

---
 Makefile            | 1 +
 README.md           | 1 -
 README.md.in        | 1 -
 submodules/settings | 2 +-
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index c380c84..a2ce3df 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ help : README.md
 	@echo ""
 	@echo "  all         - Make LibreWolf source archive ${version}-${release}."
 	@echo "  check       - Check if there is a new version of Firefox."
+	@echo "  update      - Update the Settings submodule."
 	@echo ""
 	@echo "  clean       - Clean everything except the upstream firefox tarball."
 	@echo "  veryclean   - Clean everything and the firefox tarball."
diff --git a/README.md b/README.md
index 79f0af7..49361a1 100644
--- a/README.md
+++ b/README.md
@@ -121,7 +121,6 @@ make librewolf
 ```
 This extracts the source, and then tries to `./mach build && ./mach package`.
 
-
 ## FAQ: Common issues when setting up the Mozilla build environment
 
 1. it doesnt find a suitable python.
diff --git a/README.md.in b/README.md.in
index 13657dc..a318be6 100644
--- a/README.md.in
+++ b/README.md.in
@@ -121,7 +121,6 @@ make librewolf
 ```
 This extracts the source, and then tries to `./mach build && ./mach package`.
 
-
 ## FAQ: Common issues when setting up the Mozilla build environment
 
 1. it doesnt find a suitable python.
diff --git a/submodules/settings b/submodules/settings
index c256656..886b0f9 160000
--- a/submodules/settings
+++ b/submodules/settings
@@ -1 +1 @@
-Subproject commit c256656f377d3c15a8c7537c65f45dc802904df7
+Subproject commit 886b0f9652945de1849b06295fe2ba48cc2bda27

From 93f23649a4bb3b74664c4050466963c07a7dc645 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Wed, 26 Jan 2022 11:53:38 +0100
Subject: [PATCH 20/54] v96.0.2-2

---
 release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release b/release
index d00491f..0cfbf08 100644
--- a/release
+++ b/release
@@ -1 +1 @@
-1
+2

From 991bf8eb1f9d714d658e2f1109a1f69001f374ba Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Wed, 26 Jan 2022 12:03:43 +0100
Subject: [PATCH 21/54] Updated README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 49361a1..2d14bd8 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 ## Building LibreWolf from source:
 
-First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-1.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
+First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-2.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
 
 To download the latest from a script, use wget/curl like this:
 ```
-wget -O librewolf-96.0.2-1.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-1.source.tar.gz?job=Build
-curl -L -o librewolf-96.0.2-1.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-1.source.tar.gz?job=Build
+wget -O librewolf-96.0.2-2.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-2.source.tar.gz?job=Build
+curl -L -o librewolf-96.0.2-2.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-2.source.tar.gz?job=Build
 ```
 
 Next, we create ourselves a build folder and extract the tarball.
@@ -13,7 +13,7 @@ Next, we create ourselves a build folder and extract the tarball.
 ```
 mkdir build
 cd build
-tar xf ../librewolf-96.0.2-1.source.tar.gz
+tar xf ../librewolf-96.0.2-2.source.tar.gz
 ```
 
 ### build environment

From af6c1a2647bb9fa97dd680335faf306b6c4c7e3d Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 27 Jan 2022 20:51:39 +0100
Subject: [PATCH 22/54] v96.0.3-1

---
 README.md | 16 ++++++++--------
 release   |  2 +-
 version   |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 2d14bd8..cda6171 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 ## Building LibreWolf from source:
 
-First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-2.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
+First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
 
 To download the latest from a script, use wget/curl like this:
 ```
-wget -O librewolf-96.0.2-2.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-2.source.tar.gz?job=Build
-curl -L -o librewolf-96.0.2-2.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.2-2.source.tar.gz?job=Build
+wget -O librewolf-96.0.3-1.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build
+curl -L -o librewolf-96.0.3-1.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build
 ```
 
 Next, we create ourselves a build folder and extract the tarball.
@@ -13,14 +13,14 @@ Next, we create ourselves a build folder and extract the tarball.
 ```
 mkdir build
 cd build
-tar xf ../librewolf-96.0.2-2.source.tar.gz
+tar xf ../librewolf-96.0.3-1.source.tar.gz
 ```
 
 ### build environment
 
 Next step, if you have not done so already, you must _create the build environment_:
 ```
-./librewolf-96.0.2/lw/mozfetch.sh
+./librewolf-96.0.3/lw/mozfetch.sh
 ```
 This would create a _mozilla-unified_ folder in our 'build' folder, or basically anywhere that is your current working directory. It takes about an hour for me to complete, but it needs to be done only once. This step might fail and cause problems. Hack a bit, and if that fails you can ask on our [Gitter](https://gitter.im/librewolf-community/librewolf)/[Matrix](https://matrix.to/#/#librewolf:matrix.org) channels. There is no need to actually build _mozilla-unified_ (Mozilla Nightly) itself, nor is the folder needed to build LibreWolf. So you can remove it: `rm -rf mozilla-unfied` if you don't plan on using/exploring it.
 
@@ -33,12 +33,12 @@ A few resources:
 * [Compiling C to WebAssembly using clang/LLVM and WASI](https://00f.net/2019/04/07/compiling-to-webassembly-with-llvm-and-clang/).
 * [Firefox 95 on POWER](https://www.talospace.com/2021/12/firefox-95-on-power.html).
 
-To setup the wasi sdk _headers_, you can use _librewolf-96.0.2/lw/setup-wasi-linux.sh_. Please note that this script is a bit experimental and not all kinks have been worked out, but it should work.
+To setup the wasi sdk _headers_, you can use _librewolf-96.0.3/lw/setup-wasi-linux.sh_. Please note that this script is a bit experimental and not all kinks have been worked out, but it should work.
 This might not be enough on all systems. Some systems have the wasi-libc library already installed, and some don't. It depends on the installed version of Clang/LLVM it seems, which should be v8 or above. On debian-based systems: `sudo apt install wasi-libc`, on Arch: `https://archlinux.org/packages/community/any/wasi-libc/` (`pacman -Syu wasi-libc`). Instructions for macos/windows and perhaps other Linux distro's will be added here soon.
 
 Or, the other option is to not use these sandbox libraries: In this case we can't use our standard _mozconfig_ symlink from _mozconfig.new_ into _mozconfig.new.without-wasi_. In that case you have to type something along the lines of:
 ```
-cd librewolf-96.0.2
+cd librewolf-96.0.3
 cp lw/mozconfig.new.without-wasi mozconfig
 cd ..
 ```
@@ -46,7 +46,7 @@ cd ..
 
 Now we're ready to actually build LibreWolf:
 ```
-cd librewolf-96.0.2
+cd librewolf-96.0.3
 ./mach build
 ```
 Also takes me an hour. Then, we can run it:
diff --git a/release b/release
index 0cfbf08..d00491f 100644
--- a/release
+++ b/release
@@ -1 +1 @@
-2
+1
diff --git a/version b/version
index 00a2ccf..9d8e80a 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-96.0.2
\ No newline at end of file
+96.0.3
\ No newline at end of file

From 600db64ee7e523ea0286112a702b5d3d2ce5c3e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Tue, 1 Feb 2022 16:54:05 +0100
Subject: [PATCH 23/54] check the version in about menu

---
 themes/browser/base/content/aboutDialog.css   | 28 +++++-
 themes/browser/base/content/aboutDialog.js    | 86 ++++++++++++-------
 themes/browser/base/content/aboutDialog.xhtml |  4 +-
 3 files changed, 85 insertions(+), 33 deletions(-)

diff --git a/themes/browser/base/content/aboutDialog.css b/themes/browser/base/content/aboutDialog.css
index 486f6f7..d1138cd 100644
--- a/themes/browser/base/content/aboutDialog.css
+++ b/themes/browser/base/content/aboutDialog.css
@@ -43,13 +43,39 @@
 }
 
 #version {
-  font-weight: bold;
+  display: flex;
+  align-items: center;
   margin-bottom: 4px;
+}
+
+#versionNumber {
+  font-weight: bold;
   user-select: text;
   -moz-user-focus: normal;
   cursor: text;
+  margin-right: 4px;
 }
 
 #aboutText {
   margin-top: 4px;
 }
+
+.loader {
+  width: 0.9em;
+  height: 0.9em;
+  border: 1.5px solid #fff;
+  border-bottom-color: transparent;
+  border-radius: 50%;
+  display: inline-block;
+  box-sizing: border-box;
+  animation: rotate 0.6s linear infinite;
+}
+
+@keyframes rotate {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
diff --git a/themes/browser/base/content/aboutDialog.js b/themes/browser/base/content/aboutDialog.js
index 61ddb4e..9b59bfc 100644
--- a/themes/browser/base/content/aboutDialog.js
+++ b/themes/browser/base/content/aboutDialog.js
@@ -4,19 +4,11 @@
 
 "use strict";
 
-/* import-globals-from aboutDialog-appUpdater.js */
-
 // Services = object with smart getters for common XPCOM services
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
-if (AppConstants.MOZ_UPDATER) {
-  Services.scriptloader.loadSubScript(
-    "chrome://browser/content/aboutDialog-appUpdater.js",
-    this
-  );
-}
 
 async function init(aEvent) {
   if (aEvent.target != document) {
@@ -49,33 +41,64 @@ async function init(aEvent) {
     }
   }
 
-  // Include the build ID and display warning if this is an "a#" (nightly or aurora) build
-  let versionId = "aboutDialog-version";
-  let versionAttributes = {
-    version: AppConstants.MOZ_APP_VERSION_DISPLAY,
-    bits: Services.appinfo.is64Bit ? 64 : 32,
-  };
+  // Display current version number
+  let versionField = document.getElementById("versionNumber");
+  versionField.innerHTML = AppConstants.MOZ_APP_VERSION_DISPLAY;
 
-  let version = Services.appinfo.version;
-  if (/a\d+$/.test(version)) {
-    versionId = "aboutDialog-version-nightly";
-    let buildID = Services.appinfo.appBuildID;
-    let year = buildID.slice(0, 4);
-    let month = buildID.slice(4, 6);
-    let day = buildID.slice(6, 8);
-    versionAttributes.isodate = `${year}-${month}-${day}`;
+  // If pref "librewolf.aboutMenu.checkVersion" is set to true,
+  // check for new version with the link given in "librewolf.aboutMenu.versionCheckGitlabUrl"
+  if (Services.prefs.getBoolPref("librewolf.aboutMenu.checkVersion", false)) {
+    let versionDiv = document.getElementById("version");
+    const loader = document.createElement("div");
+    loader.classList.add("loader");
+    versionDiv.appendChild(loader);
 
-    document.getElementById("experimental").hidden = false;
-    document.getElementById("communityDesc").hidden = true;
+    function isNewerVersion(newVersionString, oldVersionString) {
+      let [oldVersion, oldRelease] = oldVersionString.replace(/^v/, "").split("-");
+      let [newVersion, newRelease] = newVersionString.replace(/^v/, "").split("-");
+      console.log(oldVersionString, newVersionString)
+      if (oldVersion && newVersion) {
+        if (!oldRelease) oldRelease = "0";
+        if (!newRelease) newRelease = "0";
+
+        // Check version
+        for (let i = 0; i < newVersion.split(".").length; i++) {
+          if (Number(newVersion.split(".")[i]) > Number(oldVersion?.split(".")[i] || "0")) return true;
+        }
+
+        // Check release
+        if (Number(newRelease) > Number(oldRelease)) return true;
+      }
+      return false;
+    }
+
+    fetch(
+      Services.prefs.getStringPref(
+        "librewolf.aboutMenu.versionCheckGitlabUrl",
+        "https://gitlab.com/api/v4/projects/32320088/releases"
+      )
+    )
+      .then(response => response.json())
+      .then(data => {
+        if (data.length > 0) {
+          const latestVersion = data[0].tag_name;
+          if (isNewerVersion(latestVersion, AppConstants.MOZ_APP_VERSION_DISPLAY)) {
+            const updateNotice = document.createElement("a");
+            updateNotice.classList.add("text-link");
+            updateNotice.href = data[0]._links.self;
+            updateNotice.onclick = () => window.openWebLinkIn(data[0]._links.self, "tab")
+            updateNotice.innerText = "(Update available)";
+            versionDiv.appendChild(updateNotice);
+          } else {
+            const upToDateNotice = document.createElement("div")
+            upToDateNotice.innerText = "(Up to date)";
+            versionDiv.appendChild(upToDateNotice);
+          }
+        }
+        loader.remove();
+      })
   }
 
-  // Use Fluent arguments for append version and the architecture of the build
-  let versionField = document.getElementById("version");
-
-  document.l10n.setAttributes(versionField, versionId, versionAttributes);
-
-  await document.l10n.translateElements([versionField]);
-
   window.sizeToContent();
 
   if (AppConstants.platform == "macosx") {
@@ -85,3 +108,4 @@ async function init(aEvent) {
     );
   }
 }
+ 
\ No newline at end of file
diff --git a/themes/browser/base/content/aboutDialog.xhtml b/themes/browser/base/content/aboutDialog.xhtml
index 849a041..3c448c9 100644
--- a/themes/browser/base/content/aboutDialog.xhtml
+++ b/themes/browser/base/content/aboutDialog.xhtml
@@ -37,7 +37,9 @@
     <div id="left" />
     <div id="right">
       <label id="wordmark">LibreWolf</label>
-      <label id="version" />
+      <div id="version">
+        <label id="versionNumber" />
+      </div >
       <label id="distribution" />
       <label id="distributionId" />
       <label id="aboutText">

From 3ff2ab69b15e0f663af4f8b40fb9de04ee761270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Wed, 2 Feb 2022 21:09:37 +0100
Subject: [PATCH 24/54] add `bootstrap-without-vsc.patch`

---
 assets/patches.txt                  |  1 +
 patches/bootstrap-without-vcs.patch | 56 +++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 patches/bootstrap-without-vcs.patch

diff --git a/assets/patches.txt b/assets/patches.txt
index 9012edc..247f25c 100644
--- a/assets/patches.txt
+++ b/assets/patches.txt
@@ -1,4 +1,5 @@
 patches/allow-ubo-private-mode.patch
+patches/bootstrap-without-vcs.patch
 patches/context-menu.patch
 patches/custom-ubo-assets-bootstrap-location.patch
 patches/disable-data-reporting-at-compile-time.patch
diff --git a/patches/bootstrap-without-vcs.patch b/patches/bootstrap-without-vcs.patch
new file mode 100644
index 0000000..e1ad51d
--- /dev/null
+++ b/patches/bootstrap-without-vcs.patch
@@ -0,0 +1,56 @@
+--- a/python/mozboot/mozboot/bootstrap.py
++++ b/python/mozboot/mozboot/bootstrap.py
+@@ -542,10 +542,7 @@ def current_firefox_checkout(env, hg=None):
+         if child == "":
+             break
+ 
+-    raise UserError(
+-        "Could not identify the root directory of your checkout! "
+-        "Are you running `mach bootstrap` in an hg or git clone?"
+-    )
++    return ("local", os.getcwd())
+ 
+ 
+ def update_git_tools(git, root_state_dir):
+--- a/python/mozversioncontrol/mozversioncontrol/__init__.py
++++ b/python/mozversioncontrol/mozversioncontrol/__init__.py
+@@ -672,6 +672,21 @@ class GitRepository(Repository):
+         self._run("config", name, value)
+ 
+ 
++class LocalRepository(Repository):
++
++    def __init__(self, path):
++        super(LocalRepository, self).__init__(path, tool="true")
++
++    @property
++    def head_ref(self):
++        return ""
++
++    def get_tracked_files_finder(self):
++        files = [os.path.relpath(os.path.join(dp, f), self.path) for dp, dn, fn in os.walk(self.path) for f in fn]
++        files.sort()
++        return FileListFinder(files)
++
++
+ def get_repository_object(path, hg="hg", git="git"):
+     """Get a repository object for the repository at `path`.
+     If `path` is not a known VCS repository, raise an exception.
+@@ -681,7 +696,7 @@ def get_repository_object(path, hg="hg", git="git"):
+     elif os.path.exists(os.path.join(path, ".git")):
+         return GitRepository(path, git=git)
+     else:
+-        raise InvalidRepoPath("Unknown VCS, or not a source checkout: %s" % path)
++        return LocalRepository(path)
+ 
+ 
+ def get_repository_from_build_config(config):
+@@ -705,6 +720,8 @@ def get_repository_from_build_config(config):
+         return HgRepository(config.topsrcdir, hg=config.substs["HG"])
+     elif flavor == "git":
+         return GitRepository(config.topsrcdir, git=config.substs["GIT"])
++    elif flavor == "local":
++        return LocalRepository(config.topsrcdir)
+     else:
+         raise MissingVCSInfo("unknown VCS_CHECKOUT_TYPE value: %s" % flavor)
+ 

From 74db43c2f85d78bc37a3222c91c86f6e1ed261ab Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Wed, 2 Feb 2022 22:06:44 +0100
Subject: [PATCH 25/54] added librewolf-pref-pane submodule

---
 .gitmodules                    | 3 +++
 submodules/librewolf-pref-pane | 1 +
 submodules/settings            | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 160000 submodules/librewolf-pref-pane

diff --git a/.gitmodules b/.gitmodules
index f48d85d..bb1f2ba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "submodules/settings"]
 	path = submodules/settings
 	url = https://gitlab.com/librewolf-community/settings.git
+[submodule "submodules/librewolf-pref-pane"]
+	path = submodules/librewolf-pref-pane
+	url = https://gitlab.com/librewolf-community/browser/librewolf-pref-pane.git
diff --git a/submodules/librewolf-pref-pane b/submodules/librewolf-pref-pane
new file mode 160000
index 0000000..bacfae8
--- /dev/null
+++ b/submodules/librewolf-pref-pane
@@ -0,0 +1 @@
+Subproject commit bacfae8d6b5b0906ca1c10f2c92634553030a489
diff --git a/submodules/settings b/submodules/settings
index 886b0f9..3a37e08 160000
--- a/submodules/settings
+++ b/submodules/settings
@@ -1 +1 @@
-Subproject commit 886b0f9652945de1849b06295fe2ba48cc2bda27
+Subproject commit 3a37e084e99e48e4bef59e5a6d5da57739554b58

From af55ed870c210ca9c96390754ea3b692a8b726d7 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 09:27:17 +0100
Subject: [PATCH 26/54] removed upstream choices, where not used.

---
 Makefile                     | 67 +++++++++++++++++++++---------------
 assets/upstream.bootstrap.mk | 14 --------
 assets/upstream.nighly.mk    | 14 --------
 assets/upstream.std.mk       | 14 --------
 upstream.mk                  |  1 -
 5 files changed, 40 insertions(+), 70 deletions(-)
 delete mode 100644 assets/upstream.bootstrap.mk
 delete mode 100644 assets/upstream.nighly.mk
 delete mode 100644 assets/upstream.std.mk
 delete mode 120000 upstream.mk

diff --git a/Makefile b/Makefile
index a2ce3df..0516288 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY : help check all clean veryclean build package run update
+.PHONY : help check all clean veryclean bootstrap build package run update
 
 version:=$(shell cat ./version)
 release:=$(shell cat ./release)
@@ -9,48 +9,66 @@ release:=$(shell cat ./release)
 #ext=.tar.xz
 archive_create=tar cfz
 ext=.tar.gz
-#archive_create=zip -r9
-#ext=.zip
+
+upstream_filename=firefox-$(version).source.tar.xz
+upstream_dirname=firefox-$(version)
 
 
-help : README.md
+help :
 
 	@echo "use: $(MAKE) [all] [check] [clean] [veryclean] [build] [package] [run]"
 	@echo ""
 	@echo "  all         - Make LibreWolf source archive ${version}-${release}."
 	@echo "  check       - Check if there is a new version of Firefox."
-	@echo "  update      - Update the Settings submodule."
+	@echo "  update      - Update the git submodules and README.md."
 	@echo ""
 	@echo "  clean       - Clean everything except the upstream firefox tarball."
-	@echo "  veryclean   - Clean everything and the firefox tarball."
+	@echo "  veryclean   - Clean everything including the firefox tarball."
 	@echo ""
-	@echo "  build       - Make LibreWolf source archive and then build it."
-	@echo "  package     - Make LibreWolf source archive, then build and package it."
-	@echo "  run         - Make LibreWolf source archive, then build and run it."
+	@echo "  bootstrap   - Make librewolf source archive, and bootstrap the build system."
+	@echo ""
+	@echo "  build       - After a bootstrap, build it."
+	@echo "  package     - After a build, package it."
+	@echo "  run         - After a build, run it."
 	@echo ""
 
 
-check : update README.md
+check :
 	python3 scripts/update-version.py
 	@echo "Current release:" $$(cat ./release)
 
 
-include upstream.mk
+update : README.md
+	git submodule update --recursive --remote
+
+README.md : README.md.in ./version ./release
+	@sed "s/__VERSION__/$(version)/g" < $< > tmp
+	@sed "s/__RELEASE__/$(release)/g" < tmp > $@
+	@rm -f tmp
 
 
-all : librewolf-$(version)-$(release).source$(ext) README.md
+all : librewolf-$(version)-$(release).source$(ext)
 
 
 clean :
 	rm -rf *~ firefox-$(version) librewolf-$(version) librewolf-$(version)-$(release).source$(ext)
 
 veryclean : clean
-	$(MAKE) clean_upstream_file
+	rm -f $(upstream_filename)
 
-librewolf-$(version)-$(release).source$(ext) : $(upstream_filename) ./version ./release scripts/librewolf-patches.py assets/mozconfig assets/patches.txt README.md
-	$(MAKE) clean_upstream_dir
+#
+# The actual build stuff
+#
+
+
+$(upstream_filename) :
+	wget -q "https://archive.mozilla.org/pub/firefox/releases/$(version)/source/firefox-$(version).source.tar.xz"
+
+librewolf-$(version)-$(release).source$(ext) : $(upstream_filename) ./version ./release scripts/librewolf-patches.py assets/mozconfig assets/patches.txt
+	rm -rf $(upstream_dirname)
 	rm -rf librewolf-$(version)
-	$(MAKE) create_lw_from_upstream_dir
+	tar xf $(upstream_filename)
+	mv  $(upstream_dirname) librewolf-$(version)
 	python3 scripts/librewolf-patches.py $(version) $(release)
 	rm -f librewolf-$(version)-$(release).source$(ext)
 	$(archive_create) librewolf-$(version)-$(release).source$(ext) librewolf-$(version)
@@ -59,20 +77,15 @@ librewolf-$(version)-$(release).source$(ext) : $(upstream_filename) ./version ./
 librewolf-$(version) : librewolf-$(version)-$(release).source$(ext)
 	tar xf librewolf-$(version)-$(release).source$(ext)
 
-build : librewolf-$(version)
+bootstrap : librewolf-$(version)
+	(cd librewolf-$(version) && ./mach --no-interactive bootstrap --application-choice=browser)
+
+build :
 	(cd librewolf-$(version) && ./mach build)
 
-package : build
+package :
 	(cd librewolf-$(version) && ./mach package)
 
-run : build
+run :
 	(cd librewolf-$(version) && ./mach run)
 
-README.md : README.md.in ./version ./release
-	@sed "s/__VERSION__/$(version)/g" < $< > tmp
-	@sed "s/__RELEASE__/$(release)/g" < tmp > $@
-	@rm -f tmp
-
-
-update : README.md
-	git submodule update --recursive --remote
diff --git a/assets/upstream.bootstrap.mk b/assets/upstream.bootstrap.mk
deleted file mode 100644
index d455f96..0000000
--- a/assets/upstream.bootstrap.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-## handle different upstreams, like developer,nightly, or distro specific upstream cases
-upstream_filename=bootstrap.py
-upstream_dirname=mozilla-unified
-$(upstream_filename) :
-	wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py
-##
-clean_upstream_file :
-	rm -f $(upstream_filename)
-clean_upstream_dir :
-	rm -rf $(upstream_dirname)
-create_lw_from_upstream_dir :
-	python3 bootstrap.py --no-interactive --application-choice=browser
-	mv $(upstream_dirname) librewolf-$(version)
-
diff --git a/assets/upstream.nighly.mk b/assets/upstream.nighly.mk
deleted file mode 100644
index 1f44d45..0000000
--- a/assets/upstream.nighly.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-## handle different upstreams, like developer,nightly, or distro specific upstream cases
-upstream_filename=mozilla-unified
-upstream_dirname=mozilla-unified
-$(upstream_filename) :
-	hg clone https://hg.mozilla.org/mozilla-unified
-	(cd mozilla-unified && hg update)
-##
-clean_upstream_file :
-clean_upstream_dir :
-create_lw_from_upstream_dir :
-	(cd mozilla-unified && hg pull)
-	(cd mozilla-unified && hg update)
-	cp -r $(upstream_dirname) librewolf-$(version)
-
diff --git a/assets/upstream.std.mk b/assets/upstream.std.mk
deleted file mode 100644
index cb37428..0000000
--- a/assets/upstream.std.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-## handle different upstreams, like developer,nightly, or distro specific upstream cases
-upstream_filename=firefox-$(version).source.tar.xz
-upstream_dirname=firefox-$(version)
-$(upstream_filename) :
-	wget -q https://archive.mozilla.org/pub/firefox/releases/$(version)/source/firefox-$(version).source.tar.xz
-##
-clean_upstream_file :
-	rm -f $(upstream_filename)
-clean_upstream_dir :
-	rm -rf $(upstream_dirname)
-create_lw_from_upstream_dir :
-	tar xf $(upstream_filename)
-	mv  $(upstream_dirname) librewolf-$(version)
-
diff --git a/upstream.mk b/upstream.mk
deleted file mode 120000
index 18b97f8..0000000
--- a/upstream.mk
+++ /dev/null
@@ -1 +0,0 @@
-assets/upstream.std.mk
\ No newline at end of file

From 01520c683cba6a64b081fc2f1404170302627157 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 09:31:13 +0100
Subject: [PATCH 27/54] bugfixes

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0516288..9c9a495 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ librewolf-$(version) : librewolf-$(version)-$(release).source$(ext)
 	tar xf librewolf-$(version)-$(release).source$(ext)
 
 bootstrap : librewolf-$(version)
-	(cd librewolf-$(version) && ./mach --no-interactive bootstrap --application-choice=browser)
+	(cd librewolf-$(version) && MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser)
 
 build :
 	(cd librewolf-$(version) && ./mach build)

From 8422e02ff67265de41961b451ab141c01470cfa4 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 09:32:20 +0100
Subject: [PATCH 28/54] bugfixes

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9c9a495..24f4de2 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ librewolf-$(version) : librewolf-$(version)-$(release).source$(ext)
 	tar xf librewolf-$(version)-$(release).source$(ext)
 
 bootstrap : librewolf-$(version)
-	(cd librewolf-$(version) && MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser)
+	(cd librewolf-$(version) && MOZBUILD_STATE_PATH=$$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser)
 
 build :
 	(cd librewolf-$(version) && ./mach build)

From 3db4d7e2a3b6c56d5d9b579fb9631fe41a34f5c1 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 10:17:35 +0100
Subject: [PATCH 29/54] removed pref-pane submodule

---
 .gitmodules                    |  3 ---
 README.md                      | 25 +++++++++++++++++++++++++
 README.md.in                   | 25 +++++++++++++++++++++++++
 submodules/librewolf-pref-pane |  1 -
 4 files changed, 50 insertions(+), 4 deletions(-)
 delete mode 160000 submodules/librewolf-pref-pane

diff --git a/.gitmodules b/.gitmodules
index bb1f2ba..f48d85d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "submodules/settings"]
 	path = submodules/settings
 	url = https://gitlab.com/librewolf-community/settings.git
-[submodule "submodules/librewolf-pref-pane"]
-	path = submodules/librewolf-pref-pane
-	url = https://gitlab.com/librewolf-community/browser/librewolf-pref-pane.git
diff --git a/README.md b/README.md
index cda6171..d174a73 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,28 @@
+## LibreWolf build howto
+
+1. Clone the git repository via https:
+```
+git clone --recursive https://gitlab.com/librewolf-community/browser/source.git
+```
+or Git:
+```
+git clone --recursive git@gitlab.com:librewolf-community/browser/source.git
+```
+cd into it, build the LibreWolf tarball, bootstrap the buld environment, and finally, perform the build:
+```
+cd source
+make all
+make bootstrap
+make build
+```
+
+
+
+
+
+
+
+
 ## Building LibreWolf from source:
 
 First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
diff --git a/README.md.in b/README.md.in
index a318be6..baec553 100644
--- a/README.md.in
+++ b/README.md.in
@@ -1,3 +1,28 @@
+## LibreWolf build howto
+
+1. Clone the git repository via https:
+```
+git clone --recursive https://gitlab.com/librewolf-community/browser/source.git
+```
+or Git:
+```
+git clone --recursive git@gitlab.com:librewolf-community/browser/source.git
+```
+cd into it, build the LibreWolf tarball, bootstrap the buld environment, and finally, perform the build:
+```
+cd source
+make all
+make bootstrap
+make build
+```
+
+
+
+
+
+
+
+
 ## Building LibreWolf from source:
 
 First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
diff --git a/submodules/librewolf-pref-pane b/submodules/librewolf-pref-pane
deleted file mode 160000
index bacfae8..0000000
--- a/submodules/librewolf-pref-pane
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bacfae8d6b5b0906ca1c10f2c92634553030a489

From 25214d7039c8c8712291a7ef2ee08d6770d85383 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 10:26:16 +0100
Subject: [PATCH 30/54] update readme

---
 README.md.in | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/README.md.in b/README.md.in
index baec553..1c98c77 100644
--- a/README.md.in
+++ b/README.md.in
@@ -15,12 +15,22 @@ make all
 make bootstrap
 make build
 ```
+After that, you can either build a tarball from it, or run it:
+```
+make package
+make run
+```
+The easiest way to make patches is to go to the LibreWolf source folder:
+```
+cd librewolf-$(cat version)
+git init
+git add <path_to_file_you_changed>
+git commit -am initial-commit
+git diff > ../mypatch.patch
+```
+We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
 
-
-
-
-
-
+----
 
 
 ## Building LibreWolf from source:

From bc35780751f8fa1fef33968ee499f3a2dc461784 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 10:27:29 +0100
Subject: [PATCH 31/54] update readme

---
 README.md    | 20 +++++++++++++++-----
 README.md.in |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d174a73..3c0df14 100644
--- a/README.md
+++ b/README.md
@@ -15,12 +15,22 @@ make all
 make bootstrap
 make build
 ```
+After that, you can either build a tarball from it, or run it:
+```
+make package
+make run
+```
+The easiest way to make patches is to go to the LibreWolf source folder:
+```
+cd librewolf-$(cat version)
+git init
+git add <path_to_file_you_changed>
+git commit -am initial-commit
+git diff > ../mypatch.patch
+```
+We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
 
-
-
-
-
-
+---
 
 
 ## Building LibreWolf from source:
diff --git a/README.md.in b/README.md.in
index 1c98c77..c04682b 100644
--- a/README.md.in
+++ b/README.md.in
@@ -30,7 +30,7 @@ git diff > ../mypatch.patch
 ```
 We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
 
-----
+---
 
 
 ## Building LibreWolf from source:

From 4edcd66d7154793a85ec5b2659f4ac9a424e6f5c Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 10:31:58 +0100
Subject: [PATCH 32/54] readme

---
 README.md    | 6 +++---
 README.md.in | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 3c0df14..0b6ed45 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## LibreWolf build howto
+## The LibreWolf build instructions
 
 1. Clone the git repository via https:
 ```
@@ -30,10 +30,10 @@ git diff > ../mypatch.patch
 ```
 We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
 
----
+That should be it for this readme, the stuff below is for more internal backward compatibility. So you can safely ignore it.
 
 
-## Building LibreWolf from source:
+## Building LibreWolf with a tarball instead of git:
 
 First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
 
diff --git a/README.md.in b/README.md.in
index c04682b..8767053 100644
--- a/README.md.in
+++ b/README.md.in
@@ -1,4 +1,4 @@
-## LibreWolf build howto
+## The LibreWolf build instructions
 
 1. Clone the git repository via https:
 ```
@@ -30,10 +30,10 @@ git diff > ../mypatch.patch
 ```
 We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
 
----
+That should be it for this readme, the stuff below is for more internal backward compatibility. So you can safely ignore it.
 
 
-## Building LibreWolf from source:
+## Building LibreWolf with a tarball instead of git:
 
 First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
 

From 94207dcb38cd662abb21eea108dc8a9e6796f6bf Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 10:36:29 +0100
Subject: [PATCH 33/54] readme

---
 README.md.in | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/README.md.in b/README.md.in
index 8767053..73f8ec9 100644
--- a/README.md.in
+++ b/README.md.in
@@ -30,12 +30,31 @@ git diff > ../mypatch.patch
 ```
 We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
 
+# Building LibreWolf with a tarball instead of git:
+
+First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
+```
+tar xf <tarball>
+cd <folder>
+make bootstrap build package
+```
+
 That should be it for this readme, the stuff below is for more internal backward compatibility. So you can safely ignore it.
 
 
-## Building LibreWolf with a tarball instead of git:
 
-First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
+
+
+
+# CI and Docker
+
+
+
+
+
+
+
+
 
 To download the latest from a script, use wget/curl like this:
 ```

From d22449b58d6884c0cd9c26e3261a069aa5af3d80 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 10:37:03 +0100
Subject: [PATCH 34/54] readme

---
 README.md | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0b6ed45..0525eb5 100644
--- a/README.md
+++ b/README.md
@@ -30,12 +30,31 @@ git diff > ../mypatch.patch
 ```
 We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
 
+# Building LibreWolf with a tarball instead of git:
+
+First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
+```
+tar xf <tarball>
+cd <folder>
+make bootstrap build package
+```
+
 That should be it for this readme, the stuff below is for more internal backward compatibility. So you can safely ignore it.
 
 
-## Building LibreWolf with a tarball instead of git:
 
-First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
+
+
+
+# CI and Docker
+
+
+
+
+
+
+
+
 
 To download the latest from a script, use wget/curl like this:
 ```

From 4f0d4b79a2a6b2a9510e51bc0ffaab06123a34df Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 10:38:58 +0100
Subject: [PATCH 35/54] readme

---
 README.md    | 4 ++--
 README.md.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0525eb5..45275a7 100644
--- a/README.md
+++ b/README.md
@@ -30,13 +30,13 @@ git diff > ../mypatch.patch
 ```
 We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
 
-# Building LibreWolf with a tarball instead of git:
+### Building LibreWolf with a tarball instead of git:
 
 First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
 ```
 tar xf <tarball>
 cd <folder>
-make bootstrap build package
+make bootstrap build package run
 ```
 
 That should be it for this readme, the stuff below is for more internal backward compatibility. So you can safely ignore it.
diff --git a/README.md.in b/README.md.in
index 73f8ec9..717014c 100644
--- a/README.md.in
+++ b/README.md.in
@@ -30,13 +30,13 @@ git diff > ../mypatch.patch
 ```
 We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
 
-# Building LibreWolf with a tarball instead of git:
+### Building LibreWolf with a tarball instead of git:
 
 First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
 ```
 tar xf <tarball>
 cd <folder>
-make bootstrap build package
+make bootstrap build package run
 ```
 
 That should be it for this readme, the stuff below is for more internal backward compatibility. So you can safely ignore it.

From ecb36f63d268aa7a793ccbd4ba751cd471dd721c Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 10:40:03 +0100
Subject: [PATCH 36/54] readme

---
 README.md    | 7 +------
 README.md.in | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 45275a7..7d26a40 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,7 @@ That should be it for this readme, the stuff below is for more internal backward
 
 
 
-# CI and Docker
-
-
-
-
-
+# CI documentation, wasi, and Docker
 
 
 
diff --git a/README.md.in b/README.md.in
index 717014c..ddfd201 100644
--- a/README.md.in
+++ b/README.md.in
@@ -46,12 +46,7 @@ That should be it for this readme, the stuff below is for more internal backward
 
 
 
-# CI and Docker
-
-
-
-
-
+# CI documentation, wasi, and Docker
 
 
 

From 9e9b9237514b1a1e45d5329c8103ff4696a54ff4 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 10:44:04 +0100
Subject: [PATCH 37/54] readme

---
 README.md          | 144 ---------------------------------------------
 README.md.in       | 144 ---------------------------------------------
 assets/old-docs.md | 144 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 144 insertions(+), 288 deletions(-)
 create mode 100644 assets/old-docs.md

diff --git a/README.md b/README.md
index 7d26a40..c405a35 100644
--- a/README.md
+++ b/README.md
@@ -38,147 +38,3 @@ tar xf <tarball>
 cd <folder>
 make bootstrap build package run
 ```
-
-That should be it for this readme, the stuff below is for more internal backward compatibility. So you can safely ignore it.
-
-
-
-
-
-
-# CI documentation, wasi, and Docker
-
-
-
-
-To download the latest from a script, use wget/curl like this:
-```
-wget -O librewolf-96.0.3-1.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build
-curl -L -o librewolf-96.0.3-1.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build
-```
-
-Next, we create ourselves a build folder and extract the tarball.
-
-```
-mkdir build
-cd build
-tar xf ../librewolf-96.0.3-1.source.tar.gz
-```
-
-### build environment
-
-Next step, if you have not done so already, you must _create the build environment_:
-```
-./librewolf-96.0.3/lw/mozfetch.sh
-```
-This would create a _mozilla-unified_ folder in our 'build' folder, or basically anywhere that is your current working directory. It takes about an hour for me to complete, but it needs to be done only once. This step might fail and cause problems. Hack a bit, and if that fails you can ask on our [Gitter](https://gitter.im/librewolf-community/librewolf)/[Matrix](https://matrix.to/#/#librewolf:matrix.org) channels. There is no need to actually build _mozilla-unified_ (Mozilla Nightly) itself, nor is the folder needed to build LibreWolf. So you can remove it: `rm -rf mozilla-unfied` if you don't plan on using/exploring it.
-
-#### wasi sdk
-
-Since Firefox 95.0, we need to install an additional library, the **'wasi sdk'**. This library sandboxes wasm libraries, which is what we want, but it's still experimental for us to include properly.
-
-A few resources: 
-* mozilla.org: [WebAssembly and Back Again: Fine-Grained Sandboxing in Firefox 95](https://hacks.mozilla.org/2021/12/webassembly-and-back-again-fine-grained-sandboxing-in-firefox-95/).
-* [Compiling C to WebAssembly using clang/LLVM and WASI](https://00f.net/2019/04/07/compiling-to-webassembly-with-llvm-and-clang/).
-* [Firefox 95 on POWER](https://www.talospace.com/2021/12/firefox-95-on-power.html).
-
-To setup the wasi sdk _headers_, you can use _librewolf-96.0.3/lw/setup-wasi-linux.sh_. Please note that this script is a bit experimental and not all kinks have been worked out, but it should work.
-This might not be enough on all systems. Some systems have the wasi-libc library already installed, and some don't. It depends on the installed version of Clang/LLVM it seems, which should be v8 or above. On debian-based systems: `sudo apt install wasi-libc`, on Arch: `https://archlinux.org/packages/community/any/wasi-libc/` (`pacman -Syu wasi-libc`). Instructions for macos/windows and perhaps other Linux distro's will be added here soon.
-
-Or, the other option is to not use these sandbox libraries: In this case we can't use our standard _mozconfig_ symlink from _mozconfig.new_ into _mozconfig.new.without-wasi_. In that case you have to type something along the lines of:
-```
-cd librewolf-96.0.3
-cp lw/mozconfig.new.without-wasi mozconfig
-cd ..
-```
-### building librewolf
-
-Now we're ready to actually build LibreWolf:
-```
-cd librewolf-96.0.3
-./mach build
-```
-Also takes me an hour. Then, we can run it:
-```
-./mach run
-```
-Or make a package:
-```
-./mach package
-```
-
-### I want to keep up to date with the latest, but compile myself
-
-1. To first clone the repo:
-```
-git clone https://gitlab.com/librewolf-community/browser/source.git
-cd source
-make librewolf
-```
-2. To keep up-to-date:
-```
-git pull
-make librewolf
-```
-
-## [dev info] How to use this repo instead of [Common](https://gitlab.com/librewolf-community/browser/common):
-
-Since the dawn of time, we have used **Common** to get _patches_, _source_files_, including _source_files/{branding}_
-
-This source repo supports all that, because it uses these same things to produce the tarball. As far as I can tell, the mapping from Common to Source would be:
-
-* _[patches](https://gitlab.com/librewolf-community/browser/common/-/tree/master/patches)_ -> _[patches](https://gitlab.com/librewolf-community/browser/source/-/tree/main/patches)_
-* _[source\_files](https://gitlab.com/librewolf-community/browser/common/-/tree/master/source_files)/search-config.json_ -> _[assets](https://gitlab.com/librewolf-community/browser/source/-/tree/main/assets)/search-config.json_
-* _source\_files/browser/[branding](https://gitlab.com/librewolf-community/browser/common/-/tree/master/source_files/browser/branding)/librewolf_ -> _themes/browser/[branding](https://gitlab.com/librewolf-community/browser/source/-/tree/main/themes/browser/branding)/librewolf_
-
-
-With this mapping, I hope that other builders that can't use our tarball (afterMozilla project, weird distro's), still use the same source/patches as the builders that do use it.
-
-### Another feature
-
-The file [assets/patches.txt](https://gitlab.com/librewolf-community/browser/source/-/blob/main/assets/patches.txt) defines what patches go in. These are not the only patches a builder will use, weird distro's etc, will use additional patches. those patches can live in the repo of that distro, or in a subfolder here. I hope this gives everybody the freedom to build anyway they please, like in Common, but with the added benefit that we produce a source tarball.
-
-### Implementing a build script the new way:
-
-The repository has a short [example shell script](https://gitlab.com/librewolf-community/browser/source/-/blob/main/scripts/fetch-build.sh) on how to use the new-style tarball approach instead of the older patching-it-yourself approach.
-
-## [dev info] Building the LibreWolf source tarball:
-
-Luckly, you don't need the build environment for this. If you don't have write access, just:
-```
-git clone https://gitlab.com/librewolf-community/browser/source.git
-cd source
-make all
-```
-If you **do** have write access, we're first gonna check for a newer version of Firefox:
-```
-git clone git@gitlab.com:librewolf-community/browser/source.git
-cd source
-make check
-```
-If there is a new version, it's a good time to git commit and trigger a CI build job.
-```
-git commit -am v$(cat version)-$(cat release) && git push
-```
-To build the source archive:
-```
-make all
-```
-If you have a working build environment, you can build librewolf with:
-```
-make librewolf
-```
-This extracts the source, and then tries to `./mach build && ./mach package`.
-
-## FAQ: Common issues when setting up the Mozilla build environment
-
-1. it doesnt find a suitable python.
-```
-export MACH_USE_SYSTEM_PYTHON=1
-make librewolf
-```
-2. <python-package-1> requires <python-package-2, which is not installed.
-```
-pip3 install <python-package-2>
-```
-And retry.
diff --git a/README.md.in b/README.md.in
index ddfd201..1121ae0 100644
--- a/README.md.in
+++ b/README.md.in
@@ -38,147 +38,3 @@ tar xf <tarball>
 cd <folder>
 make bootstrap build package run
 ```
-
-That should be it for this readme, the stuff below is for more internal backward compatibility. So you can safely ignore it.
-
-
-
-
-
-
-# CI documentation, wasi, and Docker
-
-
-
-
-To download the latest from a script, use wget/curl like this:
-```
-wget -O librewolf-__VERSION__-__RELEASE__.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build
-curl -L -o librewolf-__VERSION__-__RELEASE__.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build
-```
-
-Next, we create ourselves a build folder and extract the tarball.
-
-```
-mkdir build
-cd build
-tar xf ../librewolf-__VERSION__-__RELEASE__.source.tar.gz
-```
-
-### build environment
-
-Next step, if you have not done so already, you must _create the build environment_:
-```
-./librewolf-__VERSION__/lw/mozfetch.sh
-```
-This would create a _mozilla-unified_ folder in our 'build' folder, or basically anywhere that is your current working directory. It takes about an hour for me to complete, but it needs to be done only once. This step might fail and cause problems. Hack a bit, and if that fails you can ask on our [Gitter](https://gitter.im/librewolf-community/librewolf)/[Matrix](https://matrix.to/#/#librewolf:matrix.org) channels. There is no need to actually build _mozilla-unified_ (Mozilla Nightly) itself, nor is the folder needed to build LibreWolf. So you can remove it: `rm -rf mozilla-unfied` if you don't plan on using/exploring it.
-
-#### wasi sdk
-
-Since Firefox 95.0, we need to install an additional library, the **'wasi sdk'**. This library sandboxes wasm libraries, which is what we want, but it's still experimental for us to include properly.
-
-A few resources: 
-* mozilla.org: [WebAssembly and Back Again: Fine-Grained Sandboxing in Firefox 95](https://hacks.mozilla.org/2021/12/webassembly-and-back-again-fine-grained-sandboxing-in-firefox-95/).
-* [Compiling C to WebAssembly using clang/LLVM and WASI](https://00f.net/2019/04/07/compiling-to-webassembly-with-llvm-and-clang/).
-* [Firefox 95 on POWER](https://www.talospace.com/2021/12/firefox-95-on-power.html).
-
-To setup the wasi sdk _headers_, you can use _librewolf-__VERSION__/lw/setup-wasi-linux.sh_. Please note that this script is a bit experimental and not all kinks have been worked out, but it should work.
-This might not be enough on all systems. Some systems have the wasi-libc library already installed, and some don't. It depends on the installed version of Clang/LLVM it seems, which should be v8 or above. On debian-based systems: `sudo apt install wasi-libc`, on Arch: `https://archlinux.org/packages/community/any/wasi-libc/` (`pacman -Syu wasi-libc`). Instructions for macos/windows and perhaps other Linux distro's will be added here soon.
-
-Or, the other option is to not use these sandbox libraries: In this case we can't use our standard _mozconfig_ symlink from _mozconfig.new_ into _mozconfig.new.without-wasi_. In that case you have to type something along the lines of:
-```
-cd librewolf-__VERSION__
-cp lw/mozconfig.new.without-wasi mozconfig
-cd ..
-```
-### building librewolf
-
-Now we're ready to actually build LibreWolf:
-```
-cd librewolf-__VERSION__
-./mach build
-```
-Also takes me an hour. Then, we can run it:
-```
-./mach run
-```
-Or make a package:
-```
-./mach package
-```
-
-### I want to keep up to date with the latest, but compile myself
-
-1. To first clone the repo:
-```
-git clone https://gitlab.com/librewolf-community/browser/source.git
-cd source
-make librewolf
-```
-2. To keep up-to-date:
-```
-git pull
-make librewolf
-```
-
-## [dev info] How to use this repo instead of [Common](https://gitlab.com/librewolf-community/browser/common):
-
-Since the dawn of time, we have used **Common** to get _patches_, _source_files_, including _source_files/{branding}_
-
-This source repo supports all that, because it uses these same things to produce the tarball. As far as I can tell, the mapping from Common to Source would be:
-
-* _[patches](https://gitlab.com/librewolf-community/browser/common/-/tree/master/patches)_ -> _[patches](https://gitlab.com/librewolf-community/browser/source/-/tree/main/patches)_
-* _[source\_files](https://gitlab.com/librewolf-community/browser/common/-/tree/master/source_files)/search-config.json_ -> _[assets](https://gitlab.com/librewolf-community/browser/source/-/tree/main/assets)/search-config.json_
-* _source\_files/browser/[branding](https://gitlab.com/librewolf-community/browser/common/-/tree/master/source_files/browser/branding)/librewolf_ -> _themes/browser/[branding](https://gitlab.com/librewolf-community/browser/source/-/tree/main/themes/browser/branding)/librewolf_
-
-
-With this mapping, I hope that other builders that can't use our tarball (afterMozilla project, weird distro's), still use the same source/patches as the builders that do use it.
-
-### Another feature
-
-The file [assets/patches.txt](https://gitlab.com/librewolf-community/browser/source/-/blob/main/assets/patches.txt) defines what patches go in. These are not the only patches a builder will use, weird distro's etc, will use additional patches. those patches can live in the repo of that distro, or in a subfolder here. I hope this gives everybody the freedom to build anyway they please, like in Common, but with the added benefit that we produce a source tarball.
-
-### Implementing a build script the new way:
-
-The repository has a short [example shell script](https://gitlab.com/librewolf-community/browser/source/-/blob/main/scripts/fetch-build.sh) on how to use the new-style tarball approach instead of the older patching-it-yourself approach.
-
-## [dev info] Building the LibreWolf source tarball:
-
-Luckly, you don't need the build environment for this. If you don't have write access, just:
-```
-git clone https://gitlab.com/librewolf-community/browser/source.git
-cd source
-make all
-```
-If you **do** have write access, we're first gonna check for a newer version of Firefox:
-```
-git clone git@gitlab.com:librewolf-community/browser/source.git
-cd source
-make check
-```
-If there is a new version, it's a good time to git commit and trigger a CI build job.
-```
-git commit -am v$(cat version)-$(cat release) && git push
-```
-To build the source archive:
-```
-make all
-```
-If you have a working build environment, you can build librewolf with:
-```
-make librewolf
-```
-This extracts the source, and then tries to `./mach build && ./mach package`.
-
-## FAQ: Common issues when setting up the Mozilla build environment
-
-1. it doesnt find a suitable python.
-```
-export MACH_USE_SYSTEM_PYTHON=1
-make librewolf
-```
-2. <python-package-1> requires <python-package-2, which is not installed.
-```
-pip3 install <python-package-2>
-```
-And retry.
diff --git a/assets/old-docs.md b/assets/old-docs.md
new file mode 100644
index 0000000..0d30340
--- /dev/null
+++ b/assets/old-docs.md
@@ -0,0 +1,144 @@
+
+That should be it for this readme, the stuff below is for more internal backward compatibility. So you can safely ignore it.
+
+
+
+
+
+
+# CI documentation, wasi, and Docker
+
+
+
+
+To download the latest from a script, use wget/curl like this:
+```
+wget -O librewolf-__VERSION__-__RELEASE__.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build
+curl -L -o librewolf-__VERSION__-__RELEASE__.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build
+```
+
+Next, we create ourselves a build folder and extract the tarball.
+
+```
+mkdir build
+cd build
+tar xf ../librewolf-__VERSION__-__RELEASE__.source.tar.gz
+```
+
+### build environment
+
+Next step, if you have not done so already, you must _create the build environment_:
+```
+./librewolf-__VERSION__/lw/mozfetch.sh
+```
+This would create a _mozilla-unified_ folder in our 'build' folder, or basically anywhere that is your current working directory. It takes about an hour for me to complete, but it needs to be done only once. This step might fail and cause problems. Hack a bit, and if that fails you can ask on our [Gitter](https://gitter.im/librewolf-community/librewolf)/[Matrix](https://matrix.to/#/#librewolf:matrix.org) channels. There is no need to actually build _mozilla-unified_ (Mozilla Nightly) itself, nor is the folder needed to build LibreWolf. So you can remove it: `rm -rf mozilla-unfied` if you don't plan on using/exploring it.
+
+#### wasi sdk
+
+Since Firefox 95.0, we need to install an additional library, the **'wasi sdk'**. This library sandboxes wasm libraries, which is what we want, but it's still experimental for us to include properly.
+
+A few resources: 
+* mozilla.org: [WebAssembly and Back Again: Fine-Grained Sandboxing in Firefox 95](https://hacks.mozilla.org/2021/12/webassembly-and-back-again-fine-grained-sandboxing-in-firefox-95/).
+* [Compiling C to WebAssembly using clang/LLVM and WASI](https://00f.net/2019/04/07/compiling-to-webassembly-with-llvm-and-clang/).
+* [Firefox 95 on POWER](https://www.talospace.com/2021/12/firefox-95-on-power.html).
+
+To setup the wasi sdk _headers_, you can use _librewolf-__VERSION__/lw/setup-wasi-linux.sh_. Please note that this script is a bit experimental and not all kinks have been worked out, but it should work.
+This might not be enough on all systems. Some systems have the wasi-libc library already installed, and some don't. It depends on the installed version of Clang/LLVM it seems, which should be v8 or above. On debian-based systems: `sudo apt install wasi-libc`, on Arch: `https://archlinux.org/packages/community/any/wasi-libc/` (`pacman -Syu wasi-libc`). Instructions for macos/windows and perhaps other Linux distro's will be added here soon.
+
+Or, the other option is to not use these sandbox libraries: In this case we can't use our standard _mozconfig_ symlink from _mozconfig.new_ into _mozconfig.new.without-wasi_. In that case you have to type something along the lines of:
+```
+cd librewolf-__VERSION__
+cp lw/mozconfig.new.without-wasi mozconfig
+cd ..
+```
+### building librewolf
+
+Now we're ready to actually build LibreWolf:
+```
+cd librewolf-__VERSION__
+./mach build
+```
+Also takes me an hour. Then, we can run it:
+```
+./mach run
+```
+Or make a package:
+```
+./mach package
+```
+
+### I want to keep up to date with the latest, but compile myself
+
+1. To first clone the repo:
+```
+git clone https://gitlab.com/librewolf-community/browser/source.git
+cd source
+make librewolf
+```
+2. To keep up-to-date:
+```
+git pull
+make librewolf
+```
+
+## [dev info] How to use this repo instead of [Common](https://gitlab.com/librewolf-community/browser/common):
+
+Since the dawn of time, we have used **Common** to get _patches_, _source_files_, including _source_files/{branding}_
+
+This source repo supports all that, because it uses these same things to produce the tarball. As far as I can tell, the mapping from Common to Source would be:
+
+* _[patches](https://gitlab.com/librewolf-community/browser/common/-/tree/master/patches)_ -> _[patches](https://gitlab.com/librewolf-community/browser/source/-/tree/main/patches)_
+* _[source\_files](https://gitlab.com/librewolf-community/browser/common/-/tree/master/source_files)/search-config.json_ -> _[assets](https://gitlab.com/librewolf-community/browser/source/-/tree/main/assets)/search-config.json_
+* _source\_files/browser/[branding](https://gitlab.com/librewolf-community/browser/common/-/tree/master/source_files/browser/branding)/librewolf_ -> _themes/browser/[branding](https://gitlab.com/librewolf-community/browser/source/-/tree/main/themes/browser/branding)/librewolf_
+
+
+With this mapping, I hope that other builders that can't use our tarball (afterMozilla project, weird distro's), still use the same source/patches as the builders that do use it.
+
+### Another feature
+
+The file [assets/patches.txt](https://gitlab.com/librewolf-community/browser/source/-/blob/main/assets/patches.txt) defines what patches go in. These are not the only patches a builder will use, weird distro's etc, will use additional patches. those patches can live in the repo of that distro, or in a subfolder here. I hope this gives everybody the freedom to build anyway they please, like in Common, but with the added benefit that we produce a source tarball.
+
+### Implementing a build script the new way:
+
+The repository has a short [example shell script](https://gitlab.com/librewolf-community/browser/source/-/blob/main/scripts/fetch-build.sh) on how to use the new-style tarball approach instead of the older patching-it-yourself approach.
+
+## [dev info] Building the LibreWolf source tarball:
+
+Luckly, you don't need the build environment for this. If you don't have write access, just:
+```
+git clone https://gitlab.com/librewolf-community/browser/source.git
+cd source
+make all
+```
+If you **do** have write access, we're first gonna check for a newer version of Firefox:
+```
+git clone git@gitlab.com:librewolf-community/browser/source.git
+cd source
+make check
+```
+If there is a new version, it's a good time to git commit and trigger a CI build job.
+```
+git commit -am v$(cat version)-$(cat release) && git push
+```
+To build the source archive:
+```
+make all
+```
+If you have a working build environment, you can build librewolf with:
+```
+make librewolf
+```
+This extracts the source, and then tries to `./mach build && ./mach package`.
+
+## FAQ: Common issues when setting up the Mozilla build environment
+
+1. it doesnt find a suitable python.
+```
+export MACH_USE_SYSTEM_PYTHON=1
+make librewolf
+```
+2. <python-package-1> requires <python-package-2, which is not installed.
+```
+pip3 install <python-package-2>
+```
+And retry.

From bea85b73a76211535980248a7d0cac26711b5a03 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 10:47:05 +0100
Subject: [PATCH 38/54] readme

---
 README.md    | 4 +++-
 README.md.in | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c405a35..5b5a49e 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,8 @@ After that, you can either build a tarball from it, or run it:
 make package
 make run
 ```
+#### How to make a patch
+
 The easiest way to make patches is to go to the LibreWolf source folder:
 ```
 cd librewolf-$(cat version)
@@ -30,7 +32,7 @@ git diff > ../mypatch.patch
 ```
 We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
 
-### Building LibreWolf with a tarball instead of git:
+#### Building LibreWolf with a tarball instead of git:
 
 First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
 ```
diff --git a/README.md.in b/README.md.in
index 1121ae0..af70ef5 100644
--- a/README.md.in
+++ b/README.md.in
@@ -20,6 +20,8 @@ After that, you can either build a tarball from it, or run it:
 make package
 make run
 ```
+#### How to make a patch
+
 The easiest way to make patches is to go to the LibreWolf source folder:
 ```
 cd librewolf-$(cat version)
@@ -30,7 +32,7 @@ git diff > ../mypatch.patch
 ```
 We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
 
-### Building LibreWolf with a tarball instead of git:
+#### Building LibreWolf with a tarball instead of git:
 
 First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
 ```

From da6f0b645ab67f5b201ef5f5da8aa5388736b3d8 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 10:48:30 +0100
Subject: [PATCH 39/54] readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5b5a49e..c0b563c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## The LibreWolf build instructions
+## LibreWolf build instructions
 
 1. Clone the git repository via https:
 ```

From aeae0bcf2c6fb493f4a0aeb667392aab0277e5db Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 10:57:05 +0100
Subject: [PATCH 40/54] readme.md

---
 README.md    | 42 +++++++++++++++++++++---------------------
 README.md.in | 40 ++++++++++++++++++++--------------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/README.md b/README.md
index c0b563c..eee6836 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,24 @@
-## LibreWolf build instructions
+## The LibreWolf build instructions
+
+First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
+```
+tar xf <tarball>
+cd <folder>
+make bootstrap build package run
+```
+#### How to make a patch
+
+The easiest way to make patches is to go to the LibreWolf source folder:
+```
+cd librewolf-$(cat version)
+git init
+git add <path_to_file_you_changed>
+git commit -am initial-commit
+git diff > ../mypatch.patch
+```
+We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
+
+#### Building LibreWolf with git:
 
 1. Clone the git repository via https:
 ```
@@ -20,23 +40,3 @@ After that, you can either build a tarball from it, or run it:
 make package
 make run
 ```
-#### How to make a patch
-
-The easiest way to make patches is to go to the LibreWolf source folder:
-```
-cd librewolf-$(cat version)
-git init
-git add <path_to_file_you_changed>
-git commit -am initial-commit
-git diff > ../mypatch.patch
-```
-We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
-
-#### Building LibreWolf with a tarball instead of git:
-
-First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
-```
-tar xf <tarball>
-cd <folder>
-make bootstrap build package run
-```
diff --git a/README.md.in b/README.md.in
index af70ef5..6d90f3e 100644
--- a/README.md.in
+++ b/README.md.in
@@ -1,5 +1,25 @@
 ## The LibreWolf build instructions
 
+First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
+```
+tar xf <tarball>
+cd <folder>
+make bootstrap build package run
+```
+#### How to make a patch
+
+The easiest way to make patches is to go to the LibreWolf source folder:
+```
+cd librewolf-$(cat version)
+git init
+git add <path_to_file_you_changed>
+git commit -am initial-commit
+git diff > ../mypatch.patch
+```
+We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
+
+#### Building LibreWolf with git:
+
 1. Clone the git repository via https:
 ```
 git clone --recursive https://gitlab.com/librewolf-community/browser/source.git
@@ -20,23 +40,3 @@ After that, you can either build a tarball from it, or run it:
 make package
 make run
 ```
-#### How to make a patch
-
-The easiest way to make patches is to go to the LibreWolf source folder:
-```
-cd librewolf-$(cat version)
-git init
-git add <path_to_file_you_changed>
-git commit -am initial-commit
-git diff > ../mypatch.patch
-```
-We have Gitter / Matrix rooms, and on the website we have links to the various issue trackers.
-
-#### Building LibreWolf with a tarball instead of git:
-
-First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
-```
-tar xf <tarball>
-cd <folder>
-make bootstrap build package run
-```

From f3d64c9c657b52e28adb623389ce44dbea6990e2 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 10:58:11 +0100
Subject: [PATCH 41/54] readme.md

---
 README.md    | 4 ++--
 README.md.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index eee6836..0396e16 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## The LibreWolf build instructions
+## LibreWolf build instructions
 
 First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
 ```
@@ -6,7 +6,7 @@ tar xf <tarball>
 cd <folder>
 make bootstrap build package run
 ```
-#### How to make a patch
+#### How to make a patch:
 
 The easiest way to make patches is to go to the LibreWolf source folder:
 ```
diff --git a/README.md.in b/README.md.in
index 6d90f3e..536e8de 100644
--- a/README.md.in
+++ b/README.md.in
@@ -1,4 +1,4 @@
-## The LibreWolf build instructions
+## LibreWolf build instructions
 
 First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-__VERSION__-__RELEASE__.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
 ```
@@ -6,7 +6,7 @@ tar xf <tarball>
 cd <folder>
 make bootstrap build package run
 ```
-#### How to make a patch
+#### How to make a patch:
 
 The easiest way to make patches is to go to the LibreWolf source folder:
 ```

From caf88a72370656a48a5573a6160e5f5185deaf50 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 11:20:10 +0100
Subject: [PATCH 42/54] readme.md

---
 Makefile     |  4 ++++
 README.md    | 26 ++++++++++++++++++++++++++
 README.md.in | 26 ++++++++++++++++++++++++++
 3 files changed, 56 insertions(+)

diff --git a/Makefile b/Makefile
index 24f4de2..fb6b58b 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,11 @@ librewolf-$(version)-$(release).source$(ext) : $(upstream_filename) ./version ./
 librewolf-$(version) : librewolf-$(version)-$(release).source$(ext)
 	tar xf librewolf-$(version)-$(release).source$(ext)
 
+debs=python3 python3-dev python3-pip
+rpms=python3 python3-devel
 bootstrap : librewolf-$(version)
+	(sudo apt -y install $(debs); true)
+	(sudo rpm -y install $(rpms); true)
 	(cd librewolf-$(version) && MOZBUILD_STATE_PATH=$$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser)
 
 build :
diff --git a/README.md b/README.md
index 0396e16..b81dd2e 100644
--- a/README.md
+++ b/README.md
@@ -40,3 +40,29 @@ After that, you can either build a tarball from it, or run it:
 make package
 make run
 ```
+#### How to create a patch for problems in mozilla's [bugzilla](https://bugzilla.mozilla.org/).
+
+Well, first of all:
+
+* [Create an account](https://bugzilla.mozilla.org/createaccount.cgi).
+* Handy link: [Bugs Filed Today](https://bugzilla.mozilla.org/buglist.cgi?cmdtype=dorem&remaction=run&namedcmd=Bugs%20Filed%20Today&sharer_id=1&list_id=15939480).
+* The essential: [Firefox Source Tree Documentation](https://firefox-source-docs.mozilla.org/).
+
+Now that you have a patch, that's not enough to upload to Mozilla. See, Mozilla only accepts patches against Nightly. So here is how to get that:
+```
+hg clone https://hg.mozilla.org/mozilla-unified
+cd mozilla-unified
+hg update
+MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser
+./mach build
+./mach run
+```
+Now you can apply your patch to Nightly:
+```
+patch -p1 -i ../mypatch.patch
+```
+Now you let Mercurial create the patch:
+```
+hg diff > ../my-nightly-patch.patch
+```
+And it can be uploaded to BugZilla.
diff --git a/README.md.in b/README.md.in
index 536e8de..353be4b 100644
--- a/README.md.in
+++ b/README.md.in
@@ -40,3 +40,29 @@ After that, you can either build a tarball from it, or run it:
 make package
 make run
 ```
+#### How to create a patch for problems in mozilla's [bugzilla](https://bugzilla.mozilla.org/).
+
+Well, first of all:
+
+* [Create an account](https://bugzilla.mozilla.org/createaccount.cgi).
+* Handy link: [Bugs Filed Today](https://bugzilla.mozilla.org/buglist.cgi?cmdtype=dorem&remaction=run&namedcmd=Bugs%20Filed%20Today&sharer_id=1&list_id=15939480).
+* The essential: [Firefox Source Tree Documentation](https://firefox-source-docs.mozilla.org/).
+
+Now that you have a patch, that's not enough to upload to Mozilla. See, Mozilla only accepts patches against Nightly. So here is how to get that:
+```
+hg clone https://hg.mozilla.org/mozilla-unified
+cd mozilla-unified
+hg update
+MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser
+./mach build
+./mach run
+```
+Now you can apply your patch to Nightly:
+```
+patch -p1 -i ../mypatch.patch
+```
+Now you let Mercurial create the patch:
+```
+hg diff > ../my-nightly-patch.patch
+```
+And it can be uploaded to BugZilla.

From fc3edeb10255236c88c20b8e796607c6db8e125b Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 10:25:38 +0000
Subject: [PATCH 43/54] readme

---
 README.md.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md.in b/README.md.in
index 353be4b..ee838cd 100644
--- a/README.md.in
+++ b/README.md.in
@@ -66,3 +66,7 @@ Now you let Mercurial create the patch:
 hg diff > ../my-nightly-patch.patch
 ```
 And it can be uploaded to BugZilla.
+
+##### (copy of mozilla readme) Now the fun starts
+
+Time to start hacking! You should join us on [Matrix](https://chat.mozilla.org/), say hello in the [Introduction channel](https://chat.mozilla.org/#/room/#introduction:mozilla.org), and [find a bug to start working on](https://codetribute.mozilla.org/). See the [Firefox Contributors’ Quick Reference](https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html#firefox-contributors-quick-reference) to learn how to test your changes, send patches to Mozilla, update your source code locally, and more.

From ea76d87dada0b47b2516582bbcef7eaf3abffc45 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 11:25:54 +0100
Subject: [PATCH 44/54] readme.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index b81dd2e..ba2f518 100644
--- a/README.md
+++ b/README.md
@@ -66,3 +66,7 @@ Now you let Mercurial create the patch:
 hg diff > ../my-nightly-patch.patch
 ```
 And it can be uploaded to BugZilla.
+
+##### (copy of mozilla readme) Now the fun starts
+
+Time to start hacking! You should join us on [Matrix](https://chat.mozilla.org/), say hello in the [Introduction channel](https://chat.mozilla.org/#/room/#introduction:mozilla.org), and [find a bug to start working on](https://codetribute.mozilla.org/). See the [Firefox Contributors’ Quick Reference](https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html#firefox-contributors-quick-reference) to learn how to test your changes, send patches to Mozilla, update your source code locally, and more.

From b475b9bcbdf78a10c76836d242142030580346c4 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 11:32:28 +0100
Subject: [PATCH 45/54] readme.md

---
 README.md    | 2 +-
 README.md.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ba2f518..6ceba42 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,6 @@ hg diff > ../my-nightly-patch.patch
 ```
 And it can be uploaded to BugZilla.
 
-##### (copy of mozilla readme) Now the fun starts
+##### *(copy of Mozilla readme)* Now the fun starts
 
 Time to start hacking! You should join us on [Matrix](https://chat.mozilla.org/), say hello in the [Introduction channel](https://chat.mozilla.org/#/room/#introduction:mozilla.org), and [find a bug to start working on](https://codetribute.mozilla.org/). See the [Firefox Contributors’ Quick Reference](https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html#firefox-contributors-quick-reference) to learn how to test your changes, send patches to Mozilla, update your source code locally, and more.
diff --git a/README.md.in b/README.md.in
index ee838cd..948c8af 100644
--- a/README.md.in
+++ b/README.md.in
@@ -67,6 +67,6 @@ hg diff > ../my-nightly-patch.patch
 ```
 And it can be uploaded to BugZilla.
 
-##### (copy of mozilla readme) Now the fun starts
+##### *(copy of Mozilla readme)* Now the fun starts
 
 Time to start hacking! You should join us on [Matrix](https://chat.mozilla.org/), say hello in the [Introduction channel](https://chat.mozilla.org/#/room/#introduction:mozilla.org), and [find a bug to start working on](https://codetribute.mozilla.org/). See the [Firefox Contributors’ Quick Reference](https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html#firefox-contributors-quick-reference) to learn how to test your changes, send patches to Mozilla, update your source code locally, and more.

From 03ce0e6bf7acf7aa2e745aeebbf2af7667ff0165 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 11:35:51 +0100
Subject: [PATCH 46/54] v96.0.3-2

---
 release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release b/release
index d00491f..0cfbf08 100644
--- a/release
+++ b/release
@@ -1 +1 @@
-1
+2

From a6b8711dec18a8a4c8447f2452820979449ca0d6 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 11:54:09 +0100
Subject: [PATCH 47/54] readme.md

---
 README.md    | 8 ++++----
 README.md.in | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 6ceba42..182813b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## LibreWolf build instructions
 
-First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-1.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
+First, let's **[download the latest tarball](https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-2.source.tar.gz?job=Build)**. This tarball is the latest produced by the [CI](https://gitlab.com/librewolf-community/browser/source/-/jobs).
 ```
 tar xf <tarball>
 cd <folder>
@@ -40,7 +40,7 @@ After that, you can either build a tarball from it, or run it:
 make package
 make run
 ```
-#### How to create a patch for problems in mozilla's [bugzilla](https://bugzilla.mozilla.org/).
+#### How to create a patch for problems in Mozilla's [Bugzilla](https://bugzilla.mozilla.org/).
 
 Well, first of all:
 
@@ -48,7 +48,7 @@ Well, first of all:
 * Handy link: [Bugs Filed Today](https://bugzilla.mozilla.org/buglist.cgi?cmdtype=dorem&remaction=run&namedcmd=Bugs%20Filed%20Today&sharer_id=1&list_id=15939480).
 * The essential: [Firefox Source Tree Documentation](https://firefox-source-docs.mozilla.org/).
 
-Now that you have a patch, that's not enough to upload to Mozilla. See, Mozilla only accepts patches against Nightly. So here is how to get that:
+Now that you have a patch in LibreWolf, that's not enough to upload to Mozilla. See, Mozilla only accepts patches against Nightly. So here is how to do that:
 ```
 hg clone https://hg.mozilla.org/mozilla-unified
 cd mozilla-unified
@@ -65,7 +65,7 @@ Now you let Mercurial create the patch:
 ```
 hg diff > ../my-nightly-patch.patch
 ```
-And it can be uploaded to BugZilla.
+And it can be uploaded to Bugzilla.
 
 ##### *(copy of Mozilla readme)* Now the fun starts
 
diff --git a/README.md.in b/README.md.in
index 948c8af..e2a7551 100644
--- a/README.md.in
+++ b/README.md.in
@@ -40,7 +40,7 @@ After that, you can either build a tarball from it, or run it:
 make package
 make run
 ```
-#### How to create a patch for problems in mozilla's [bugzilla](https://bugzilla.mozilla.org/).
+#### How to create a patch for problems in Mozilla's [Bugzilla](https://bugzilla.mozilla.org/).
 
 Well, first of all:
 
@@ -48,7 +48,7 @@ Well, first of all:
 * Handy link: [Bugs Filed Today](https://bugzilla.mozilla.org/buglist.cgi?cmdtype=dorem&remaction=run&namedcmd=Bugs%20Filed%20Today&sharer_id=1&list_id=15939480).
 * The essential: [Firefox Source Tree Documentation](https://firefox-source-docs.mozilla.org/).
 
-Now that you have a patch, that's not enough to upload to Mozilla. See, Mozilla only accepts patches against Nightly. So here is how to get that:
+Now that you have a patch in LibreWolf, that's not enough to upload to Mozilla. See, Mozilla only accepts patches against Nightly. So here is how to do that:
 ```
 hg clone https://hg.mozilla.org/mozilla-unified
 cd mozilla-unified
@@ -65,7 +65,7 @@ Now you let Mercurial create the patch:
 ```
 hg diff > ../my-nightly-patch.patch
 ```
-And it can be uploaded to BugZilla.
+And it can be uploaded to Bugzilla.
 
 ##### *(copy of Mozilla readme)* Now the fun starts
 

From 3526aab03b15cf49668c4fd34f9d698a1438b363 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 12:34:45 +0100
Subject: [PATCH 48/54] readme.md

---
 README.md    | 3 +++
 README.md.in | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 182813b..b6f8b43 100644
--- a/README.md
+++ b/README.md
@@ -70,3 +70,6 @@ And it can be uploaded to Bugzilla.
 ##### *(copy of Mozilla readme)* Now the fun starts
 
 Time to start hacking! You should join us on [Matrix](https://chat.mozilla.org/), say hello in the [Introduction channel](https://chat.mozilla.org/#/room/#introduction:mozilla.org), and [find a bug to start working on](https://codetribute.mozilla.org/). See the [Firefox Contributors’ Quick Reference](https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html#firefox-contributors-quick-reference) to learn how to test your changes, send patches to Mozilla, update your source code locally, and more.
+
+#### Hey, I'm using a Mac or Windows :(
+We understand, life isn't always fair. The same steps as above do apply, you'll just have to walk through the beginning part of the guides for [MacOS](https://firefox-source-docs.mozilla.org/setup/macos_build.html), [Windows](https://firefox-source-docs.mozilla.org/setup/windows_build.html).
diff --git a/README.md.in b/README.md.in
index e2a7551..60283fa 100644
--- a/README.md.in
+++ b/README.md.in
@@ -70,3 +70,6 @@ And it can be uploaded to Bugzilla.
 ##### *(copy of Mozilla readme)* Now the fun starts
 
 Time to start hacking! You should join us on [Matrix](https://chat.mozilla.org/), say hello in the [Introduction channel](https://chat.mozilla.org/#/room/#introduction:mozilla.org), and [find a bug to start working on](https://codetribute.mozilla.org/). See the [Firefox Contributors’ Quick Reference](https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html#firefox-contributors-quick-reference) to learn how to test your changes, send patches to Mozilla, update your source code locally, and more.
+
+#### Hey, I'm using a Mac or Windows :(
+We understand, life isn't always fair. The same steps as above do apply, you'll just have to walk through the beginning part of the guides for [MacOS](https://firefox-source-docs.mozilla.org/setup/macos_build.html), [Windows](https://firefox-source-docs.mozilla.org/setup/windows_build.html).

From 824fbe2aaccf815a4d8df3f3a5221a68f3ccdd92 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Feb 2022 12:47:16 +0100
Subject: [PATCH 49/54] readme.md

---
 README.md    | 2 +-
 README.md.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b6f8b43..ed38407 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ or Git:
 ```
 git clone --recursive git@gitlab.com:librewolf-community/browser/source.git
 ```
-cd into it, build the LibreWolf tarball, bootstrap the buld environment, and finally, perform the build:
+cd into it, build the LibreWolf tarball, bootstrap the build environment, and finally, perform the build:
 ```
 cd source
 make all
diff --git a/README.md.in b/README.md.in
index 60283fa..6d311ec 100644
--- a/README.md.in
+++ b/README.md.in
@@ -28,7 +28,7 @@ or Git:
 ```
 git clone --recursive git@gitlab.com:librewolf-community/browser/source.git
 ```
-cd into it, build the LibreWolf tarball, bootstrap the buld environment, and finally, perform the build:
+cd into it, build the LibreWolf tarball, bootstrap the build environment, and finally, perform the build:
 ```
 cd source
 make all

From d67055e3d7639e72cc5fc9de1b865aa0f2ed9239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Thu, 3 Feb 2022 16:28:16 +0100
Subject: [PATCH 50/54] add MOZ_APP_DISPLAYNAME

---
 themes/browser/branding/librewolf/configure.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/browser/branding/librewolf/configure.sh b/themes/browser/branding/librewolf/configure.sh
index d3aa609..ecfd5cf 100644
--- a/themes/browser/branding/librewolf/configure.sh
+++ b/themes/browser/branding/librewolf/configure.sh
@@ -9,4 +9,4 @@ MOZ_APP_NAME=librewolf
 MOZ_APP_BASENAME="LibreWolf"
 MOZ_APP_PROFILE=librewolf
 MOZ_APP_VENDOR=LibreWolf
-
+MOZ_APP_DISPLAYNAME=LibreWolf

From 03b530f6f7ba383aac05e8705276288f68eee470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Thu, 3 Feb 2022 16:50:02 +0100
Subject: [PATCH 51/54] update .gitlab-ci.yml

---
 .gitlab-ci.yml      | 4 +---
 submodules/settings | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00516b8..1e4c9b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 Build:
   stage: build
   variables:
-     GIT_SUBMODULE_STRATEGY: recursive
+    GIT_SUBMODULE_STRATEGY: recursive
   script:
     - make all
     - echo VERSION=$(cat version) >> variables.env
@@ -29,8 +29,6 @@ Release:
   except:
     - merge_requests
   before_script:
-    - apt-get update
-    - apt-get install -y curl
     - curl -L --output /usr/local/bin/release-cli "https://release-cli-downloads.s3.amazonaws.com/latest/release-cli-linux-amd64"
     - chmod +x /usr/local/bin/release-cli
   script:
diff --git a/submodules/settings b/submodules/settings
index 3a37e08..886b0f9 160000
--- a/submodules/settings
+++ b/submodules/settings
@@ -1 +1 @@
-Subproject commit 3a37e084e99e48e4bef59e5a6d5da57739554b58
+Subproject commit 886b0f9652945de1849b06295fe2ba48cc2bda27

From 19f8f30cbe84980dc31d0a7fb8e90f09d2a23ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Thu, 3 Feb 2022 16:59:05 +0100
Subject: [PATCH 52/54] Revert "update .gitlab-ci.yml"

This reverts commit 03b530f6f7ba383aac05e8705276288f68eee470.
---
 .gitlab-ci.yml      | 4 +++-
 submodules/settings | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e4c9b0..00516b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 Build:
   stage: build
   variables:
-    GIT_SUBMODULE_STRATEGY: recursive
+     GIT_SUBMODULE_STRATEGY: recursive
   script:
     - make all
     - echo VERSION=$(cat version) >> variables.env
@@ -29,6 +29,8 @@ Release:
   except:
     - merge_requests
   before_script:
+    - apt-get update
+    - apt-get install -y curl
     - curl -L --output /usr/local/bin/release-cli "https://release-cli-downloads.s3.amazonaws.com/latest/release-cli-linux-amd64"
     - chmod +x /usr/local/bin/release-cli
   script:
diff --git a/submodules/settings b/submodules/settings
index 886b0f9..3a37e08 160000
--- a/submodules/settings
+++ b/submodules/settings
@@ -1 +1 @@
-Subproject commit 886b0f9652945de1849b06295fe2ba48cc2bda27
+Subproject commit 3a37e084e99e48e4bef59e5a6d5da57739554b58

From df1483de6389404aa1cf64c0158d4263f0d112d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Thu, 3 Feb 2022 17:41:18 +0100
Subject: [PATCH 53/54] v93.0.3-3

---
 release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release b/release
index 0cfbf08..00750ed 100644
--- a/release
+++ b/release
@@ -1 +1 @@
-2
+3

From 7bc0b83da5f9920a1020e0f77a5ef794a2a83d0d Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Fri, 4 Feb 2022 09:27:00 +0100
Subject: [PATCH 54/54] Updated readme

---
 README.md    | 2 +-
 README.md.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ed38407..67d91b5 100644
--- a/README.md
+++ b/README.md
@@ -72,4 +72,4 @@ And it can be uploaded to Bugzilla.
 Time to start hacking! You should join us on [Matrix](https://chat.mozilla.org/), say hello in the [Introduction channel](https://chat.mozilla.org/#/room/#introduction:mozilla.org), and [find a bug to start working on](https://codetribute.mozilla.org/). See the [Firefox Contributors’ Quick Reference](https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html#firefox-contributors-quick-reference) to learn how to test your changes, send patches to Mozilla, update your source code locally, and more.
 
 #### Hey, I'm using a Mac or Windows :(
-We understand, life isn't always fair. The same steps as above do apply, you'll just have to walk through the beginning part of the guides for [MacOS](https://firefox-source-docs.mozilla.org/setup/macos_build.html), [Windows](https://firefox-source-docs.mozilla.org/setup/windows_build.html).
+We understand, life isn't always fair 😺. The same steps as above do apply, you'll just have to walk through the beginning part of the guides for [MacOS](https://firefox-source-docs.mozilla.org/setup/macos_build.html), [Windows](https://firefox-source-docs.mozilla.org/setup/windows_build.html).
diff --git a/README.md.in b/README.md.in
index 6d311ec..a818052 100644
--- a/README.md.in
+++ b/README.md.in
@@ -72,4 +72,4 @@ And it can be uploaded to Bugzilla.
 Time to start hacking! You should join us on [Matrix](https://chat.mozilla.org/), say hello in the [Introduction channel](https://chat.mozilla.org/#/room/#introduction:mozilla.org), and [find a bug to start working on](https://codetribute.mozilla.org/). See the [Firefox Contributors’ Quick Reference](https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html#firefox-contributors-quick-reference) to learn how to test your changes, send patches to Mozilla, update your source code locally, and more.
 
 #### Hey, I'm using a Mac or Windows :(
-We understand, life isn't always fair. The same steps as above do apply, you'll just have to walk through the beginning part of the guides for [MacOS](https://firefox-source-docs.mozilla.org/setup/macos_build.html), [Windows](https://firefox-source-docs.mozilla.org/setup/windows_build.html).
+We understand, life isn't always fair 😺. The same steps as above do apply, you'll just have to walk through the beginning part of the guides for [MacOS](https://firefox-source-docs.mozilla.org/setup/macos_build.html), [Windows](https://firefox-source-docs.mozilla.org/setup/windows_build.html).