diff --git a/.workspace b/.workspace
index 1578e70f8b..a4ed478d5c 100644
--- a/.workspace
+++ b/.workspace
@@ -1,7 +1,7 @@
{
"addons": {
- "ghostery": "https://github.com/ghostery/ghostery-extension/releases/download/v8.11.1/ghostery-dawn-v8.11.1.zip",
- "ghostery-search": "https://github.com/ghostery/ghostery-search-extension/releases/download/v1.1.0/ghostery_private_search-1.1.0.zip",
+ "ghostery": "https://github.com/ghostery/ghostery-extension/releases/download/v10.1.4.4/ghostery-firefox-10.1.4.zip",
+ "ghostery-search": "https://github.com/ghostery/ghostery-search-extension/releases/download/v1.1.1/ghostery_private_search-1.1.1.zip",
"ghostery-newtab": "https://github.com/ghostery/ghostery-newtab-extension/releases/download/v0.5.3/ghostery_new_tab-0.5.3.zip"
},
"firefoxAddons": [
@@ -10,11 +10,11 @@
"pictureinpicture",
"report-site-issue"
],
- "firefox": "114.0.2",
- "app": "2023.6",
+ "firefox": "117.0.1",
+ "app": "2023.9",
"s3bucket": "ghostery-user-agent-cache-public",
"locales": {
- "de": "d79045d879cadb4abd0a7ebabf7b28ebce6ede28",
- "fr": "25e05bf2e556f9af7cf6461aa33afe47bccec284"
+ "de": "4512014206c5f5a774e47c4cae2592694bfd031f",
+ "fr": "e9d5c5bc1764f84d7499905d3a8a644095ec2eec"
}
}
diff --git a/README.md b/README.md
index e37422bed5..b710f6b06e 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ we provide dockerised builds. These can be run using the `fern.js build` command
Windows and Mac builds depend on platform frameworks being included. These should be placed in the
`build` directory:
- * Mac: `MacOSX13.0.sdk.tar.bz2`. This can be found inside an XCode install.
+ * Mac: `MacOSX13.3.sdk.tar.bz2`. This can be found inside an XCode install.
* Windows: `vs.tar.zstd` and `Makecab.exe`. See the end of this document to where to find these.
## Development workflow
@@ -140,10 +140,12 @@ Alternatively, the `build-*` scripts in this repo will prepare docker images wit
### VS Redist
This can be built on windows after setting up a build environment as per [these instructions](https://firefox-source-docs.mozilla.org/setup/windows_build.html#building-firefox-on-windows).
-You will need to install the Windows 10 SDK at version `10.0.19041.0`. Then run the following to create `vs.tar.zstd`:
+You will need to install the Windows 10 SDK at version `14.29.30133`. Then run the following to create `vs2019_14.29.30133.tar.bz2`:
```bash
-./mach python --virtualenv build ./build/vs/pack_vs.py -o vs.tar.zstd ./build/vs/vs2017.yaml
+OUTPUT_DIR=PATH_TO_TEMP_FOLDER
+./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py ./build/vs/vs2019.yaml $OUTPUT_DIR
+tar --zstd -cvjSf vs2019_14.29.30133.bz2 -C $OUTPUT_DIR .
```
### Makecab.exe
diff --git a/brands/ghostery/branding/pref/Better-Fox.js b/brands/ghostery/branding/pref/Better-Fox.js
index 4c7e093e2b..f0963339f1 100644
--- a/brands/ghostery/branding/pref/Better-Fox.js
+++ b/brands/ghostery/branding/pref/Better-Fox.js
@@ -3,30 +3,57 @@
/****************************************************************************
* Betterfox for Ghostery *
* "Non ducor duco" *
- * version: 115 *
+ * version: 116 *
* url: https://github.com/yokoffing/Betterfox *
****************************************************************************/
/****************************************************************************
* SECTION: FASTFOX *
****************************************************************************/
+pref("nglayout.initialpaint.delay", 0);
+pref("nglayout.initialpaint.delay_in_oopif", 0);
+pref("content.notify.interval", 100000);
+
/** EXPERIMENTAL ***/
pref("layout.css.grid-template-masonry-value.enabled", true); // CSS Masonry Layout
pref("dom.enable_web_task_scheduling", true); // Prioritized Task Scheduling API
+pref("layout.css.has-selector.enabled", true); // CSS has selector
/** GFX ***/
-pref("gfx.canvas.accelerated", true); // GPU-accelerated Canvas2D is enabled by default on macOS and Linux [FF110]
-// decrease video buffering on videos below 1080p
-pref("media.cache_readahead_limit", 9000); // stop reading ahead when our buffered data is this many seconds ahead of the current playback
-pref("media.cache_resume_threshold", 6000); // when a network connection is suspended, don't resume it until the amount of buffered data falls below this threshold (in seconds)
+//pref("gfx.canvas.accelerated", true); // GPU-accelerated Canvas2D is enabled by default on macOS and Linux [FF110]
+pref("gfx.canvas.accelerated.cache-items", 4096);
+pref("gfx.canvas.accelerated.cache-size", 512);
+pref("gfx.content.skia-font-cache-size", 20);
+
+/** BROWSER CACHE ***/
+pref("browser.cache.disk.enable", false);
+
+/** MEDIA CACHE ***/
+pref("media.memory_cache_max_size", 65536);
+pref("media.cache_readahead_limit", 7200);
+pref("media.cache_resume_threshold", 3600);
+
+/** IMAGE CACHE ***/
+pref("image.mem.decode_bytes_at_a_time", 32768);
/** NETWORK ***/
pref("network.buffer.cache.size", 262144); // 256 kb; default=32768 (32 kb); reduce CPU usage by requiring fewer application-to-driver data transfers
pref("network.buffer.cache.count", 128); // default=24; reduce CPU usage by requiring fewer application-to-driver data transfers
-pref("network.dnsCacheEntries", 20000); // increase DNS cache
-pref("network.dnsCacheExpiration", 3600); // keep entries for 1 hour; pref will be ignored by DNS resolver if using DoH/TRR
-pref("network.dnsCacheExpirationGracePeriod", 300); // cache DNS entries for 5 minutes after they expire; pref will be ignored by DNS resolver if using DoH/TRR
-pref("network.ssl_tokens_cache_capacity", 32768); // increase TLS token caching (fast reconnects)
+pref("network.http.max-connections", 1800);
+pref("network.http.max-persistent-connections-per-server", 10);
+pref("network.http.max-urgent-start-excessive-connections-per-host", 5);
+pref("network.dnsCacheEntries", 1000); // increase DNS cache
+pref("network.dnsCacheExpiration", 86400); // keep entries for 1 hour; pref will be ignored by DNS resolver if using DoH/TRR
+pref("network.ssl_tokens_cache_capacity", 10240); // increase TLS token caching (fast reconnects)
+
+/** SPECULATIVE CONNECTIONS ***/
+pref("network.http.speculative-parallel-limit", 0);
+pref("network.dns.disablePrefetch", true);
+pref("browser.urlbar.speculativeConnect.enabled", false);
+pref("browser.places.speculativeConnect.enabled", false);
+pref("network.prefetch-next", false);
+pref("network.predictor.enabled", false);
+pref("network.predictor.enable-prefetch", false);
/****************************************************************************
* SECTION: SECUREFOX *
@@ -34,8 +61,9 @@ pref("network.ssl_tokens_cache_capacity", 32768); // increase TLS token caching
/** TRACKING PROTECTION ***/
pref("network.http.referer.disallowCrossSiteRelaxingDefault.top_navigation", true); // enabled with ETP "Strict"; Referer: ignore ‘unsafe-url’, ‘no-referrer-when-downgrade’ and ‘origin-when-cross-origin’ for cross-site requests
pref("privacy.query_stripping.enabled", true); // Query Stripping; Ghostery doesn't do this natively at this time
-pref("privacy.query_stripping.strip_list", "__hsfp __hssc __hstc __s _hsenc _openstat dclid fbclid gbraid gclid hsCtaTracking igshid mc_eid ml_subscriber ml_subscriber_hash msclkid oft_c oft_ck oft_d oft_id oft_ids oft_k oft_lk oft_sk oly_anon_id oly_enc_id rb_clickid s_cid twclid vero_conv vero_id wbraid wickedid yclid");
+pref("privacy.query_stripping.enabled.pbmode", true);
pref("privacy.partition.network_state.ocsp_cache", true); // enabled with ETP "Strict"; network partitioning OSCP cache
+pref("privacy.partition.bloburl_per_partition_key", true);
pref("extensions.webcompat.enable_shims", true); // enabled with ETP "Strict"; Smart Block shimming
pref("browser.uitour.enabled", false); // disable UITour backend so there is no chance that a remote page can use it
pref("privacy.globalprivacycontrol.enabled", true); // Global Privacy Control
@@ -53,26 +81,16 @@ pref("browser.xul.error_pages.expert_bad_cert", true);
pref("security.tls.enable_0rtt_data", false);
/** DISK AVOIDANCE ***/
-pref("browser.cache.disk.enable", false); // disable disk cache completely
pref("browser.privatebrowsing.forceMediaMemoryCache", true); // disable media cache from writing to disk in Private Browsing (Ghost Mode)
-pref("browser.sessionstore.privacy_level", 2); // disable storing extra session data
/** SHUTDOWN & SANITIZING ***/
pref("privacy.history.custom", true);
-/** SPECULATIVE CONNECTIONS ***/
-user_pref("network.http.speculative-parallel-limit", 0);
-user_pref("network.dns.disablePrefetch", true);
-user_pref("browser.urlbar.speculativeConnect.enabled", false);
-user_pref("browser.places.speculativeConnect.enabled", false);
-user_pref("network.prefetch-next", false);
-user_pref("network.predictor.enabled", false);
-user_pref("network.predictor.enable-prefetch", false);
-
/** SEARCH / URL BAR ***/
pref("browser.search.separatePrivateDefault.ui.enabled", true); // Enable a seperate search engine for Private Windows
pref("browser.urlbar.update2.engineAliasRefresh", true); // enable "Add" button under search engine menu
pref("browser.search.suggest.enabled", false); // Live search engine suggestions (Google, Bing, etc.)
+pref("browser.formfill.enable", false); // disable Search and Form history
pref("network.IDN_show_punycode", true); // Enforce Punycode for Internationalized Domain Names to eliminate possible spoofing
/** HTTPS-ONLY MODE ***/
@@ -88,18 +106,12 @@ pref("network.gio.supported-protocols", "");
pref("network.trr.mode", 0); // DNS-over-HTTPS (DOH) disabled by default
/** PASSWORDS AND AUTOFILL ***/
-pref("signon.formlessCapture.enabled", false); // disable formless login capture
-pref("signon.privateBrowsingCapture.enabled", false); // disable capturing credentials in private browsing
-pref("signon.autofillForms.http", false); // autofilling saved passwords on HTTP pages
pref("signon.rememberSignons", false); // disable saving passwords
pref("editor.truncate_user_pastes", false);
-pref("layout.forms.reveal-password-context-menu.enabled", true); // reveal password option on right-click
/** ADDRESS + CREDIT CARD MANAGER ***/
pref("extensions.formautofill.addresses.enabled", false);
pref("extensions.formautofill.creditCards.enabled", false);
-pref("extensions.formautofill.heuristics.enabled", false);
-pref("browser.formfill.enable", false);
/** MIXED CONTENT + CROSS-SITE ***/
pref("network.auth.subresource-http-auth-allow", 1); // don't allow cross-origin sub-resources to open HTTP authentication credentials dialogs
@@ -135,7 +147,7 @@ pref("permissions.default.desktop-notification", 2); // block desktop notificati
* SECTION: PESKYFOX *
****************************************************************************/
/** UI ***/
-pref("findbar.highlightAll", true); // Show all matches in Findbar
+pref("browser.translations.enable", true); // local translation services; data doesn't leave device
/** FULLSCREEN ***/
pref("full-screen-api.transition-duration.enter", "0 0"); // transition time (instant)
@@ -171,8 +183,8 @@ pref("browser.download.open_pdf_attachments_inline", true);
/** TAB BEHAVIOR ***/
pref("browser.tabs.loadBookmarksInTabs", true); // load bookmarks in tabs
-pref("editor.truncate_user_pastes", false); // Prevent password truncation when submitting form data
-pref("layout.css.has-selector.enabled", true);
+pref("browser.menu.showViewImageInfo", true);
+pref("findbar.highlightAll", true); // Show all matches in Findbar
/****************************************************************************
* END: BETTERFOX *
diff --git a/brands/ghostery/branding/pref/firefox-branding.js b/brands/ghostery/branding/pref/firefox-branding.js
index ded3514f96..c098bb5de5 100644
--- a/brands/ghostery/branding/pref/firefox-branding.js
+++ b/brands/ghostery/branding/pref/firefox-branding.js
@@ -151,8 +151,11 @@ pref("extensions.pocket.enabled", false); // Pocket Account
pref("extensions.pocket.api"," ");
pref("extensions.pocket.oAuthConsumerKey", " ");
pref("extensions.pocket.site", " ");
-pref("identity.fxaccounts.enabled", false); // Firefox Accounts & Sync
+// Firefox Accounts & Sync
+pref("identity.fxaccounts.enabled", false);
+pref("identity.fxaccounts.autoconfig.uri", "https://get.ghosterybrowser.com/health");
pref("extensions.fxmonitor.enabled", false); // Firefox Monitor
+pref("signon.firefoxRelay.feature", ""); // Firefox Relay
pref("signon.management.page.breach-alerts.enabled", false); // Firefox Lockwise
pref("signon.management.page.breachAlertUrl", "");
pref("browser.contentblocking.report.lockwise.enabled", false);
diff --git a/build/Linux.dockerfile b/build/Linux.dockerfile
index 3dd76eecb6..a0b14c57e6 100644
--- a/build/Linux.dockerfile
+++ b/build/Linux.dockerfile
@@ -1,59 +1,59 @@
FROM ua-build-base
-ENV MOZ_AUTOMATION_PACKAGE_TESTS=1 \
- MOZ_ENABLE_FULL_SYMBOLS=1
+ENV MOZ_AUTOMATION_PACKAGE_TESTS="1" \
+ MOZ_ENABLE_FULL_SYMBOLS="1"
-RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-clang-16/clang.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-binutils/binutils.tar.zst && \
+ cd /builds/worker/fetches/ && \
+ tar -xf binutils.tar.zst && \
+ rm binutils.tar.zst
+
+RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-clang-16/clang.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf clang.tar.zst && \
rm clang.tar.zst
-RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-rust-1.69/rustc.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-rust-1.71/rustc.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rustc.tar.zst && \
rm rustc.tar.zst
-RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-rust-size/rust-size.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-rust-size/rust-size.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rust-size.tar.zst && \
rm rust-size.tar.zst
-RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-cbindgen/cbindgen.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-cbindgen/cbindgen.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf cbindgen.tar.zst && \
rm cbindgen.tar.zst
-RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-dump_syms/dump_syms.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-dump_syms/dump_syms.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf dump_syms.tar.zst && \
rm dump_syms.tar.zst
-RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-sccache/sccache.tar.zst && \
- cd /builds/worker/fetches/ && \
- tar -xf sccache.tar.zst && \
- rm sccache.tar.zst
-
-RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-nasm/nasm.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-nasm/nasm.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf nasm.tar.zst && \
rm nasm.tar.zst
-RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-node-16/node.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-node-16/node.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf node.tar.zst && \
rm node.tar.zst
-RUN wget -nv -O /builds/worker/fetches/pkgconf.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-pkgconf/pkgconf.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/pkgconf.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-pkgconf/pkgconf.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf pkgconf.tar.zst && \
rm pkgconf.tar.zst
-RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-x86_64-linux-gnu.tar.zst && \
rm sysroot-x86_64-linux-gnu.tar.zst
-RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/sysroot-wasm32-wasi-clang-16/sysroot-wasm32-wasi.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/sysroot-wasm32-wasi-clang-16/sysroot-wasm32-wasi.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-wasm32-wasi.tar.zst && \
rm sysroot-wasm32-wasi.tar.zst
diff --git a/build/MacOSARM.dockerfile b/build/MacOSARM.dockerfile
index 99ca10f3e7..54ee556418 100644
--- a/build/MacOSARM.dockerfile
+++ b/build/MacOSARM.dockerfile
@@ -1,73 +1,73 @@
FROM ua-build-base
-ENV MOZ_AUTOMATION_PACKAGE_TESTS=1 \
- PERFHERDER_EXTRA_OPTIONS=aarch64
+ENV MOZ_AUTOMATION_PACKAGE_TESTS="1" \
+ PERFHERDER_EXTRA_OPTIONS="aarch64"
-RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-cctools-port/cctools.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-cctools-port/cctools.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf cctools.tar.zst && \
rm cctools.tar.zst
-RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-clang-16/clang.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-clang-16/clang.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf clang.tar.zst && \
rm clang.tar.zst
-RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/sysroot-wasm32-wasi-clang-16/sysroot-wasm32-wasi.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/sysroot-wasm32-wasi-clang-16/sysroot-wasm32-wasi.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-wasm32-wasi.tar.zst && \
rm sysroot-wasm32-wasi.tar.zst
-RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-dump_syms/dump_syms.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-dump_syms/dump_syms.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf dump_syms.tar.zst && \
rm dump_syms.tar.zst
-RUN wget -nv -O /builds/worker/fetches/hfsplus.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-hfsplus/hfsplus.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/hfsplus.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-hfsplus/hfsplus.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf hfsplus.tar.zst && \
rm hfsplus.tar.zst
-RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-libdmg/dmg.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-libdmg/dmg.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf dmg.tar.zst && \
rm dmg.tar.zst
-RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-rust-macos-1.69/rustc.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-rust-macos-1.71/rustc.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rustc.tar.zst && \
rm rustc.tar.zst
-RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-rust-size/rust-size.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-rust-size/rust-size.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rust-size.tar.zst && \
rm rust-size.tar.zst
-RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-cbindgen/cbindgen.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-cbindgen/cbindgen.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf cbindgen.tar.zst && \
rm cbindgen.tar.zst
-RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-nasm/nasm.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-nasm/nasm.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf nasm.tar.zst && \
rm nasm.tar.zst
-RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-node-16/node.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-node-16/node.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf node.tar.zst && \
rm node.tar.zst
-RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-x86_64-linux-gnu.tar.zst && \
rm sysroot-x86_64-linux-gnu.tar.zst
-COPY MacOSX13.0.sdk.tar.bz2 /builds/worker/fetches/
+COPY MacOSX13.3.sdk.tar.bz2 /builds/worker/fetches/
RUN cd /builds/worker/fetches/ && \
- tar -xf MacOSX13.0.sdk.tar.bz2 && \
- rm MacOSX13.0.sdk.tar.bz2
+ tar -xf MacOSX13.3.sdk.tar.bz2 && \
+ rm MacOSX13.3.sdk.tar.bz2
ENV MOZ_FETCHES_DIR=/builds/worker/fetches/ \
GECKO_PATH=/builds/worker/workspace \
diff --git a/build/MacOSX.dockerfile b/build/MacOSX.dockerfile
index de26674ff8..3c61753d00 100644
--- a/build/MacOSX.dockerfile
+++ b/build/MacOSX.dockerfile
@@ -1,77 +1,72 @@
FROM ua-build-base
-ENV MOZ_AUTOMATION_PACKAGE_TESTS=1
+ENV MOZ_AUTOMATION_PACKAGE_TESTS="1"
-RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-cctools-port/cctools.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-cctools-port/cctools.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf cctools.tar.zst && \
rm cctools.tar.zst
-RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-clang-16/clang.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-clang-16/clang.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf clang.tar.zst && \
rm clang.tar.zst
-RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-sccache/sccache.tar.zst && \
- cd /builds/worker/fetches/ && \
- tar -xf sccache.tar.zst && \
- rm sccache.tar.zst
-
-RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/sysroot-wasm32-wasi-clang-16/sysroot-wasm32-wasi.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/sysroot-wasm32-wasi-clang-16/sysroot-wasm32-wasi.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-wasm32-wasi.tar.zst && \
rm sysroot-wasm32-wasi.tar.zst
-RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-dump_syms/dump_syms.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-dump_syms/dump_syms.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf dump_syms.tar.zst && \
rm dump_syms.tar.zst
-RUN wget -nv -O /builds/worker/fetches/hfsplus.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-hfsplus/hfsplus.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/hfsplus.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-hfsplus/hfsplus.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf hfsplus.tar.zst && \
rm hfsplus.tar.zst
-RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-libdmg/dmg.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-libdmg/dmg.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf dmg.tar.zst && \
rm dmg.tar.zst
-RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-rust-macos-1.69/rustc.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-rust-macos-1.71/rustc.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rustc.tar.zst && \
rm rustc.tar.zst
-RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-rust-size/rust-size.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-rust-size/rust-size.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rust-size.tar.zst && \
rm rust-size.tar.zst
-RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-cbindgen/cbindgen.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-cbindgen/cbindgen.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf cbindgen.tar.zst && \
rm cbindgen.tar.zst
-RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-nasm/nasm.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-nasm/nasm.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf nasm.tar.zst && \
rm nasm.tar.zst
-RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-node-16/node.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-node-16/node.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf node.tar.zst && \
rm node.tar.zst
-RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-x86_64-linux-gnu.tar.zst && \
rm sysroot-x86_64-linux-gnu.tar.zst
-COPY MacOSX13.0.sdk.tar.bz2 /builds/worker/fetches/
+COPY MacOSX13.3.sdk.tar.bz2 /builds/worker/fetches/
RUN cd /builds/worker/fetches/ && \
- tar -xf MacOSX13.0.sdk.tar.bz2 && \
- rm MacOSX13.0.sdk.tar.bz2
+ tar -xf MacOSX13.3.sdk.tar.bz2 && \
+ rm MacOSX13.3.sdk.tar.bz2
ENV MOZ_FETCHES_DIR=/builds/worker/fetches/ \
GECKO_PATH=/builds/worker/workspace \
diff --git a/build/Windows.dockerfile b/build/Windows.dockerfile
index f92e884d7d..f41c007d17 100644
--- a/build/Windows.dockerfile
+++ b/build/Windows.dockerfile
@@ -1,6 +1,6 @@
FROM ua-build-base
-ENV MOZ_AUTOMATION_PACKAGE_TESTS=1
+ENV MOZ_AUTOMATION_PACKAGE_TESTS="1"
RUN /builds/worker/bin/fetch-content static-url \
--sha256 5c076f87ba64d82f11513f4af0ceb07246a3540aa3c72ca3ffc2d53971fa56e3 \
@@ -11,67 +11,62 @@ RUN /builds/worker/bin/fetch-content static-url \
unzip upx-3.95-win64.zip && \
rm upx-3.95-win64.zip
-RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-clang-16/clang.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-clang-16/clang.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf clang.tar.zst && \
rm clang.tar.zst
-RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-rust-cross-1.69/rustc.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-rust-cross-1.71/rustc.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rustc.tar.zst && \
rm rustc.tar.zst
-RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-rust-size/rust-size.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-rust-size/rust-size.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rust-size.tar.zst && \
rm rust-size.tar.zst
-RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-nasm/nasm.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-nasm/nasm.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf nasm.tar.zst && \
rm nasm.tar.zst
-RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-node-16/node.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-node-16/node.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf node.tar.zst && \
rm node.tar.zst
-RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-cbindgen/cbindgen.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-cbindgen/cbindgen.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf cbindgen.tar.zst && \
rm cbindgen.tar.zst
-RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-sccache/sccache.tar.zst && \
- cd /builds/worker/fetches/ && \
- tar -xf sccache.tar.zst && \
- rm sccache.tar.zst
-
-RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-dump_syms/dump_syms.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-dump_syms/dump_syms.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf dump_syms.tar.zst && \
rm dump_syms.tar.zst
-RUN wget -nv -O /builds/worker/fetches/wine.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-wine/wine.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/wine.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-wine/wine.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf wine.tar.zst && \
rm wine.tar.zst
-RUN wget -nv -O /builds/worker/fetches/winchecksec.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-winchecksec/winchecksec.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/winchecksec.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-winchecksec/winchecksec.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf winchecksec.tar.zst && \
rm winchecksec.tar.zst
-RUN wget -nv -O /builds/worker/fetches/nsis.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/nsis/nsis.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/nsis.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/nsis/nsis.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf nsis.tar.zst && \
rm nsis.tar.zst
-RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-x86_64-linux-gnu.tar.zst && \
rm sysroot-x86_64-linux-gnu.tar.zst
-RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/sysroot-wasm32-wasi-clang-16/sysroot-wasm32-wasi.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/sysroot-wasm32-wasi-clang-16/sysroot-wasm32-wasi.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-wasm32-wasi.tar.zst && \
rm sysroot-wasm32-wasi.tar.zst
diff --git a/build/WindowsARM.dockerfile b/build/WindowsARM.dockerfile
index 322cc1ed5b..724337c5e9 100644
--- a/build/WindowsARM.dockerfile
+++ b/build/WindowsARM.dockerfile
@@ -1,7 +1,7 @@
FROM ua-build-base
-ENV PERFHERDER_EXTRA_OPTIONS=aarch64 \
- MOZ_AUTOMATION_PACKAGE_TESTS=1
+ENV PERFHERDER_EXTRA_OPTIONS="aarch64-no-eme" \
+ MOZ_AUTOMATION_PACKAGE_TESTS="1"
RUN /builds/worker/bin/fetch-content static-url \
--sha256 5c076f87ba64d82f11513f4af0ceb07246a3540aa3c72ca3ffc2d53971fa56e3 \
@@ -12,67 +12,62 @@ RUN /builds/worker/bin/fetch-content static-url \
unzip upx-3.95-win64.zip && \
rm upx-3.95-win64.zip
-RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-clang-16/clang.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-clang-16/clang.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf clang.tar.zst && \
rm clang.tar.zst
-RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-rust-cross-1.69/rustc.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-rust-cross-1.71/rustc.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rustc.tar.zst && \
rm rustc.tar.zst
-RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-rust-size/rust-size.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-rust-size/rust-size.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rust-size.tar.zst && \
rm rust-size.tar.zst
-RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-nasm/nasm.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-nasm/nasm.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf nasm.tar.zst && \
rm nasm.tar.zst
-RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-node-16/node.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-node-16/node.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf node.tar.zst && \
rm node.tar.zst
-RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-cbindgen/cbindgen.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-cbindgen/cbindgen.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf cbindgen.tar.zst && \
rm cbindgen.tar.zst
-RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-sccache/sccache.tar.zst && \
- cd /builds/worker/fetches/ && \
- tar -xf sccache.tar.zst && \
- rm sccache.tar.zst
-
-RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-dump_syms/dump_syms.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-dump_syms/dump_syms.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf dump_syms.tar.zst && \
rm dump_syms.tar.zst
-RUN wget -nv -O /builds/worker/fetches/wine.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-wine/wine.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/wine.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-wine/wine.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf wine.tar.zst && \
rm wine.tar.zst
-RUN wget -nv -O /builds/worker/fetches/winchecksec.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/linux64-winchecksec/winchecksec.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/winchecksec.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/linux64-winchecksec/winchecksec.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf winchecksec.tar.zst && \
rm winchecksec.tar.zst
-RUN wget -nv -O /builds/worker/fetches/nsis.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/nsis/nsis.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/nsis.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/nsis/nsis.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf nsis.tar.zst && \
rm nsis.tar.zst
-RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-x86_64-linux-gnu.tar.zst && \
rm sysroot-x86_64-linux-gnu.tar.zst
-RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/114.0.2/sysroot-wasm32-wasi-clang-16/sysroot-wasm32-wasi.tar.zst && \
+RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/117.0/sysroot-wasm32-wasi-clang-16/sysroot-wasm32-wasi.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-wasm32-wasi.tar.zst && \
rm sysroot-wasm32-wasi.tar.zst
diff --git a/build/configs/macosx-aarch64.mozconfig b/build/configs/macosx-aarch64.mozconfig
index 5ced2b9e26..a41946e526 100644
--- a/build/configs/macosx-aarch64.mozconfig
+++ b/build/configs/macosx-aarch64.mozconfig
@@ -16,7 +16,7 @@ mk_add_options "export PATH=$MOZ_FETCHES_DIR/cctools/bin:$MOZ_FETCHES_DIR/binuti
# dsymutil needs a libstdc++ more recent than what's on the system.
mk_add_options "export LD_LIBRARY_PATH=$MOZ_FETCHES_DIR/clang/lib"
-CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX13.0.sdk
+CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX13.3.sdk
export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
export CXX="$MOZ_FETCHES_DIR/clang/bin/clang++"
@@ -33,7 +33,7 @@ export HOST_CXXFLAGS="-g"
export HOST_LDFLAGS="-g"
ac_add_options --target=aarch64-apple-darwin
-export MACOS_SDK_DIR=$MOZ_FETCHES_DIR/MacOSX13.0.sdk
+export MACOS_SDK_DIR=$MOZ_FETCHES_DIR/MacOSX13.3.sdk
if [ "x$MOZ_PKG_SPECIAL" != "xasan" -a -z "$MOZ_AUTOMATION_ARTIFACT_BUILDS" ]; then
# Enable static analysis checks by default on OSX cross builds.
diff --git a/build/configs/macosx.mozconfig b/build/configs/macosx.mozconfig
index 57b09a5daa..51508ca49d 100644
--- a/build/configs/macosx.mozconfig
+++ b/build/configs/macosx.mozconfig
@@ -19,11 +19,11 @@ mk_add_options "export LD_LIBRARY_PATH=$MOZ_FETCHES_DIR/clang/lib"
# This SDK was copied from a local XCode install and uploaded to tooltool.
# Generate the tarball by running this command with the proper SDK version:
-# sdk_path=$(xcrun --sdk macosx13.0 --show-sdk-path)
+# sdk_path=$(xcrun --sdk macosx13.3 --show-sdk-path)
# tar -C $(dirname ${sdk_path}) -cHjf /tmp/$(basename ${sdk_path}).tar.bz2 $(basename ${sdk_path})
# Upload the resulting tarball from /tmp to tooltool, and change the entry in
# `browser/config/tooltool-manifests/macosx64/cross-releng.manifest`.
-CROSS_SYSROOT=$topsrcdir/MacOSX13.0.sdk
+CROSS_SYSROOT=$topsrcdir/MacOSX13.3.sdk
CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks
export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
diff --git a/ci.multibranch.Jenkinsfile b/ci.multibranch.Jenkinsfile
index 49956f694a..4004597b99 100644
--- a/ci.multibranch.Jenkinsfile
+++ b/ci.multibranch.Jenkinsfile
@@ -23,7 +23,7 @@ stage('Prepare') {
}
download('makecab.exe')
- download('MacOSX13.0.sdk.tar.bz2')
+ download('MacOSX13.3.sdk.tar.bz2')
def image = docker.build('ua-build-base', '-f build/Base.dockerfile ./build/ --build-arg user=`whoami` --build-arg UID=`id -u` --build-arg GID=`id -g`')
@@ -702,7 +702,7 @@ def buildAndPackage(platform) {
)
withMach(platform) {
- sh 'rm -f `pwd`/MacOSX13.0.sdk; ln -s /builds/worker/fetches/MacOSX13.0.sdk `pwd`/MacOSX13.0.sdk'
+ sh 'rm -f `pwd`/MacOSX13.3.sdk; ln -s /builds/worker/fetches/MacOSX13.3.sdk `pwd`/MacOSX13.3.sdk'
sh './mach build'
@@ -745,7 +745,6 @@ def withMach(platform, task) {
'-v /mnt/vfat/vs/:/builds/worker/fetches/vs'
) {
withEnv([
- "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system",
"MOZCONFIG=${env.WORKSPACE}/mozconfig",
"MOZ_BUILD_DATE=${buildId}",
"MOZ_AUTOMATION=1",
diff --git a/ci/build-helpers.groovy b/ci/build-helpers.groovy
index 7dc27c99fd..4d3be8a6b4 100644
--- a/ci/build-helpers.groovy
+++ b/ci/build-helpers.groovy
@@ -9,7 +9,7 @@ def build(opts, Closure postpackage={}, Closure archiving={}) {
stage('prepare') {
download('makecab.exe')
- download('MacOSX13.0.sdk.tar.bz2')
+ download('MacOSX13.3.sdk.tar.bz2')
}
def image = stage('docker build base') {
@@ -37,7 +37,7 @@ def build(opts, Closure postpackage={}, Closure archiving={}) {
}
dir('mozilla-release') {
- sh 'rm -f `pwd`/MacOSX13.0.sdk; ln -s /builds/worker/fetches/MacOSX13.0.sdk `pwd`/MacOSX13.0.sdk'
+ sh 'rm -f `pwd`/MacOSX13.3.sdk; ln -s /builds/worker/fetches/MacOSX13.3.sdk `pwd`/MacOSX13.3.sdk'
if (opts.PGO) {
stage("${opts.name}: fetch profiles") {
diff --git a/fern/commands/build.js b/fern/commands/build.js
index 97b60e747d..9fc2e5618b 100644
--- a/fern/commands/build.js
+++ b/fern/commands/build.js
@@ -14,7 +14,7 @@ async function buildDocker({ docker, cwd, dockerfile, name, out }) {
const stream = await docker.buildImage(
{
context: cwd,
- src: [dockerfile, "configs", "fetch-content", "MacOSX13.0.sdk.tar.bz2"],
+ src: [dockerfile, "configs", "fetch-content", "MacOSX13.3.sdk.tar.bz2"],
},
{
t: name,
@@ -233,20 +233,20 @@ module.exports = (program) => {
}),
},
{
- title: "Check MacOSX13.0.sdk.tar.bz2 exists",
+ title: "Check MacOSX13.3.sdk.tar.bz2 exists",
task: async () => {
- const sdk = "MacOSX13.0.sdk.tar.bz2";
+ const sdk = "MacOSX13.3.sdk.tar.bz2";
if ((await fileExists(path.join(buildFolder, sdk))) === false) {
throw new Error(`${sdk} must be available at build/${sdk}`);
}
},
},
{
- title: "Extract MacOSX13.0.sdk.tar.bz2",
- skip: () => folderExists(path.join(buildFolder, "MacOSX13.0.sdk")),
+ title: "Extract MacOSX13.3.sdk.tar.bz2",
+ skip: () => folderExists(path.join(buildFolder, "MacOSX13.3.sdk")),
task: async () => {
await withCwd(buildFolder, () =>
- execa("tar", ["-xjvf", "MacOSX13.0.sdk.tar.bz2"])
+ execa("tar", ["-xjvf", "MacOSX13.3.sdk.tar.bz2"])
);
},
},
@@ -263,8 +263,8 @@ module.exports = (program) => {
Binds: [
`${path.join(
buildFolder,
- "MacOSX13.0.sdk"
- )}:/builds/worker/workspace/MacOSX13.0.sdk`,
+ "MacOSX13.3.sdk"
+ )}:/builds/worker/workspace/MacOSX13.3.sdk`,
],
}),
}
diff --git a/fern/core/docker.js b/fern/core/docker.js
index 482954cf8b..d33229d9a0 100644
--- a/fern/core/docker.js
+++ b/fern/core/docker.js
@@ -12,6 +12,7 @@ const fetch = require("node-fetch-commonjs");
const MOZ_FETCHES_DIR = "/builds/worker/fetches/";
const SKIP_TOOLCHAINS = new Set([
+ "vs",
"win64-pdbstr",
"win64-vs2017",
"macosx64-sdk",
@@ -104,7 +105,7 @@ function generateFetch(fetches, key) {
async function generateDockerFile({ key, fetches, job, name, toolchains }) {
const statements = ["FROM ua-build-base"];
const env = Object.entries(job.worker.env || {})
- .map(([k, v]) => `${k}=${v}`)
+ .map(([k, v]) => `${k}="${v}"`)
.join(" \\\n ");
statements.push(`ENV ${env}`);
@@ -129,12 +130,12 @@ async function generateDockerFile({ key, fetches, job, name, toolchains }) {
);
}
if (key.startsWith("macosx64")) {
- statements.push("COPY MacOSX13.0.sdk.tar.bz2 /builds/worker/fetches/");
+ statements.push("COPY MacOSX13.3.sdk.tar.bz2 /builds/worker/fetches/");
statements.push(
[
"RUN cd /builds/worker/fetches/ &&",
- "tar -xf MacOSX13.0.sdk.tar.bz2 &&",
- "rm MacOSX13.0.sdk.tar.bz2",
+ "tar -xf MacOSX13.3.sdk.tar.bz2 &&",
+ "rm MacOSX13.3.sdk.tar.bz2",
].join(" \\\n ")
);
}
@@ -162,7 +163,7 @@ async function generate(artifactBaseDir) {
const buildConfigs = [
{
name: "Linux",
- key: "linux64/opt",
+ key: "linux64-shippable/opt",
buildPath: path.join(
root,
"mozilla-release",
@@ -174,7 +175,7 @@ async function generate(artifactBaseDir) {
},
{
name: "Windows",
- key: "win64/opt",
+ key: "win64-shippable/opt",
buildPath: path.join(
root,
"mozilla-release",
@@ -185,28 +186,28 @@ async function generate(artifactBaseDir) {
),
},
{
- name: "MacOSX",
- key: "macosx64/opt",
+ name: "WindowsARM",
+ key: "win64-aarch64-shippable-no-eme/opt",
+ arch: "arm64",
buildPath: path.join(
root,
"mozilla-release",
"taskcluster",
"ci",
"build",
- "macosx.yml"
+ "windows.yml"
),
},
{
- name: "WindowsARM",
- key: "win64-aarch64/opt",
- arch: "arm64",
+ name: "MacOSX",
+ key: "macosx64-x64-shippable/opt",
buildPath: path.join(
root,
"mozilla-release",
"taskcluster",
"ci",
"build",
- "windows.yml"
+ "macosx.yml"
),
},
{
@@ -264,22 +265,15 @@ async function generate(artifactBaseDir) {
const release = releases.find(r => r.label === releaseLabel);
const jobTypes = [...new Set(buildInfos.map(job => job.index["job-name"]))];
- const JOB_TYPES = {
- 'linux64-opt': 'linux64-asan-opt',
- 'win64-opt': 'win64-asan-opt',
- 'macosx64-opt': 'macosx64-fuzzing-asan-opt',
- 'win64-aarch64-opt': 'win64-aarch64-opt',
- 'macosx64-aarch64-opt': 'macosx64-aarch64-fuzzing-asan-opt'
- };
-
const releaseFetches = {};
for (const jobType of jobTypes) {
+ const url = `https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.v2.mozilla-release.shippable.revision.${release.hash}.firefox.${jobType}`;
const releaseTaskId = await fetch(
- `https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.v2.mozilla-release.revision.${release.hash}.firefox.${JOB_TYPES[jobType]}`
+ url
).then(async (res) => {
if (!res.ok) {
throw new Error(
- `Failed to find Taskcluster Task for release ${releaseLabel} ${jobType}: ${res.status}: ${res.statusText}`,
+ `Failed to find Taskcluster Task for release ${releaseLabel} ${jobType}: ${url} - ${res.status}: ${res.statusText}`,
);
}
diff --git a/l10n/de.json b/l10n/de.json
index a5804dfd3e..c4e9e2288a 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -114,6 +114,9 @@
}
},
"browser/browser/aboutPrivateBrowsing.ftl": {
+ "about-private-browsing-info-description-private-window": {
+ "string": "Ghost-Modus: { -brand-short-name } leert die eingegebenen Suchbegriffe und besuchten Webseiten, wenn alle privaten Fenster geschlossen wurden. Das macht Sie nicht anonym."
+ },
"about-private-browsing-handoff-no-engine": {
"title": {
"string": "Private Suche mit Ghostery"
diff --git a/l10n/en-US.json b/l10n/en-US.json
index 6aa1fe478e..9ee8803038 100644
--- a/l10n/en-US.json
+++ b/l10n/en-US.json
@@ -114,6 +114,9 @@
}
},
"browser/browser/aboutPrivateBrowsing.ftl": {
+ "about-private-browsing-info-description-private-window": {
+ "string": "Ghost Mode: { -brand-short-name } clears your search and browsing history when you close all private windows. This doesn’t make you anonymous."
+ },
"about-private-browsing-handoff-no-engine": {
"title": {
"string": "Search privately with Ghostery"
diff --git a/l10n/fr.json b/l10n/fr.json
index feb01b52d0..0d2fa56c35 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -114,6 +114,9 @@
}
},
"browser/browser/aboutPrivateBrowsing.ftl": {
+ "about-private-browsing-info-description-private-window": {
+ "string": "Mode Fantôme: { -brand-short-name } efface l’historique de vos recherches et de votre navigation à la fermeture des fenêtres privées. Cela ne vous rend pas anonyme."
+ },
"about-private-browsing-handoff-no-engine": {
"title": {
"string": "Rechercher en mode privé avec Ghostery"
diff --git a/patches/.index b/patches/.index
index f74aa5082b..1d6c317a5b 100644
--- a/patches/.index
+++ b/patches/.index
@@ -33,4 +33,5 @@
0033-Default-top-sites.patch
0034-Disable-package-duplicates-detection.patch
0035-Disable-Onboarding-Messages.patch
-0036-Build-mach-package-use-MOZ_FETCHES-in-automation.patch
\ No newline at end of file
+0036-Build-mach-package-use-MOZ_FETCHES-in-automation.patch
+0037-Disable-help-on-switching-to-a-new-device.patch
\ No newline at end of file
diff --git a/patches/0002-Change-new-tab-page-and-home-page-url.patch b/patches/0002-Change-new-tab-page-and-home-page-url.patch
index 4ccc46d4b5..a8f011cb00 100644
--- a/patches/0002-Change-new-tab-page-and-home-page-url.patch
+++ b/patches/0002-Change-new-tab-page-and-home-page-url.patch
@@ -18,9 +18,9 @@ index 6ef8e69196..a1073fe280 100644
pref("browser.startup.page", 1);
-pref("browser.startup.homepage", "about:home");
+pref("browser.startup.homepage", "https://ghostery.com/");
- #ifdef NIGHTLY_BUILD
pref("browser.startup.homepage.abouthome_cache.enabled", true);
- #else
+ pref("browser.startup.homepage.abouthome_cache.loglevel", "Warn");
+
diff --git a/browser/components/newtab/AboutNewTabService.jsm b/browser/components/newtab/AboutNewTabService.jsm
index 43c0ea1f37..29ee2ea72c 100644
--- a/browser/components/newtab/AboutNewTabService.jsm
@@ -45,21 +45,21 @@ index 43c0ea1f37..29ee2ea72c 100644
- ].join("");
+ return "https://ghostery.com/";
}
-
+
get welcomeURL() {
-diff --git a/browser/modules/HomePage.jsm b/browser/modules/HomePage.jsm
+diff --git a/browser/modules/HomePage.sys.mjs b/browser/modules/HomePage.sys.mjs
index db8af26001..dfca2933e1 100644
---- a/browser/modules/HomePage.jsm
-+++ b/browser/modules/HomePage.jsm
-@@ -25,7 +25,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
+--- a/browser/modules/HomePage.sys.mjs
++++ b/browser/modules/HomePage.sys.mjs
+@@ -14,7 +14,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
});
-
+
const kPrefName = "browser.startup.homepage";
-const kDefaultHomePage = "about:home";
+const kDefaultHomePage = "https://ghostery.com/";
const kExtensionControllerPref =
"browser.startup.homepage_override.extensionControlled";
const kHomePageIgnoreListId = "homepage-urls";
---
+--
2.39.2 (Apple Git-143)
diff --git a/patches/0010-Clean-up-preferences.patch b/patches/0010-Clean-up-preferences.patch
index e00922fbe2..53eae8e763 100644
--- a/patches/0010-Clean-up-preferences.patch
+++ b/patches/0010-Clean-up-preferences.patch
@@ -7,7 +7,7 @@ Subject: Clean up preferences
1 file changed, 5 insertions(+)
diff --git a/browser/themes/shared/preferences/preferences.css b/browser/themes/shared/preferences/preferences.css
-index dc3ab1da46..ec52073f7a 100644
+index c0ecc35c68..0c17185fee 100644
--- a/browser/themes/shared/preferences/preferences.css
+++ b/browser/themes/shared/preferences/preferences.css
@@ -142,11 +142,16 @@ checkbox {
@@ -20,7 +20,7 @@ index dc3ab1da46..ec52073f7a 100644
white-space: nowrap;
}
-+#category-more-from-mozilla, #homeContentsGroup, #category-home {
++#category-more-from-mozilla, #homeContentsGroup, #category-home, #homepageGroup {
+ display: none;
+}
+
diff --git a/patches/0014-Allow-setting-service-url-to-be-overrided-by-prefs.patch b/patches/0014-Allow-setting-service-url-to-be-overrided-by-prefs.patch
index c226439886..da8429fc2e 100644
--- a/patches/0014-Allow-setting-service-url-to-be-overrided-by-prefs.patch
+++ b/patches/0014-Allow-setting-service-url-to-be-overrided-by-prefs.patch
@@ -11,7 +11,7 @@ index 0144fad99c..bd7609f6a1 100644
--- a/services/settings/Utils.sys.mjs
+++ b/services/settings/Utils.sys.mjs
@@ -95,9 +95,7 @@ function _isUndefined(value) {
-
+
export var Utils = {
get SERVER_URL() {
- return lazy.allowServerURLOverride
@@ -19,8 +19,21 @@ index 0144fad99c..bd7609f6a1 100644
- : AppConstants.REMOTE_SETTINGS_SERVER_URL;
+ return lazy.gServerURL;
},
-
+
CHANGES_PATH: "/buckets/monitor/collections/changes/changeset",
---
+diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs
+index b430666f68..97a7e7a27d 100644
+--- a/toolkit/modules/AppConstants.sys.mjs
++++ b/toolkit/modules/AppConstants.sys.mjs
+@@ -418,7 +418,7 @@ export var AppConstants = Object.freeze({
+ #ifdef MOZ_THUNDERBIRD
+ false,
+ #else
+- true,
++ false,
+ #endif
+
+ REMOTE_SETTINGS_DEFAULT_BUCKET:
+--
2.39.2 (Apple Git-143)
diff --git a/patches/0018-Ghostery-Theme.patch b/patches/0018-Ghostery-Theme.patch
index d9c38902a1..286fccb605 100644
--- a/patches/0018-Ghostery-Theme.patch
+++ b/patches/0018-Ghostery-Theme.patch
@@ -7,12 +7,12 @@ Fix theme
X
---
.../modules/LightweightThemeConsumer.sys.mjs | 2 +-
- .../extensions/default-theme/experiment12.css | 272 ++++++++++++++++++
+ .../extensions/default-theme/experiment13.css | 272 ++++++++++++++++++
.../extensions/default-theme/manifest.json | 56 +---
.../extensions/internal/XPIProvider.jsm | 20 +-
toolkit/mozapps/extensions/jar.mn | 1 +
5 files changed, 308 insertions(+), 43 deletions(-)
- create mode 100644 toolkit/mozapps/extensions/default-theme/experiment12.css
+ create mode 100644 toolkit/mozapps/extensions/default-theme/experiment13.css
diff --git a/toolkit/modules/LightweightThemeConsumer.sys.mjs b/toolkit/modules/LightweightThemeConsumer.sys.mjs
index b48d07c658..ffc5401a4a 100644
@@ -21,17 +21,17 @@ index b48d07c658..ffc5401a4a 100644
@@ -25,7 +25,7 @@ XPCOMUtils.defineLazyPreferenceGetter(
false
);
-
+
-const DEFAULT_THEME_ID = "default-theme@mozilla.org";
+const DEFAULT_THEME_ID = "__DOES_NOT_APPLY__"; // in Ghostery Browser default theme is a lightweight theme
-
+
// On Linux, the default theme picks up the right colors from dark GTK themes.
const DEFAULT_THEME_RESPECTS_SYSTEM_COLOR_SCHEME =
-diff --git a/toolkit/mozapps/extensions/default-theme/experiment12.css b/toolkit/mozapps/extensions/default-theme/experiment12.css
+diff --git a/toolkit/mozapps/extensions/default-theme/experiment13.css b/toolkit/mozapps/extensions/default-theme/experiment13.css
new file mode 100644
index 0000000000..a6bd1fdf76
--- /dev/null
-+++ b/toolkit/mozapps/extensions/default-theme/experiment12.css
++++ b/toolkit/mozapps/extensions/default-theme/experiment13.css
@@ -0,0 +1,272 @@
+/* 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
@@ -309,10 +309,10 @@ diff --git a/toolkit/mozapps/extensions/default-theme/manifest.json b/toolkit/mo
index 9166c1bb44..5be116ebd7 100644
--- a/toolkit/mozapps/extensions/default-theme/manifest.json
+++ b/toolkit/mozapps/extensions/default-theme/manifest.json
-@@ -7,35 +7,32 @@
+@@ -7,34 +7,32 @@
}
},
-
+
- "name": "System theme — auto",
- "description": "Follow the operating system setting for buttons, menus, and windows.",
- "author": "Mozilla",
@@ -320,14 +320,14 @@ index 9166c1bb44..5be116ebd7 100644
+ "name": "Ghostery Private Theme",
+ "description": "",
+ "author": "Ghostery",
-+ "version": "1.12",
-
- "icons": {"32": "icon.svg"},
-
- "theme": {
-- },
++ "version": "1.13",
+
+ "icons": { "32": "icon.svg" },
+
+- "theme": {},
-
- "dark_theme": {
++ "theme": {
"colors": {
"tab_background_text": "#fbfbfe",
- "tab_selected": "rgb(66,65,77)",
@@ -358,7 +358,7 @@ index 9166c1bb44..5be116ebd7 100644
"toolbar_text": "rgb(251, 251, 254)",
"ntp_background": "rgb(43, 42, 51)",
"ntp_text": "rgb(251, 251, 254)",
-@@ -55,7 +52,7 @@
+@@ -54,7 +52,7 @@
"autocomplete_popup_separator": "rgb(82,82,94)",
"appmenu_update_icon_color": "#54FFBD",
"appmenu_info_icon_color": "#80EBFF",
@@ -367,9 +367,9 @@ index 9166c1bb44..5be116ebd7 100644
"tab_icon_overlay_fill": "rgb(251,251,254)"
},
"properties": {
-@@ -68,29 +65,6 @@
+@@ -67,29 +65,6 @@
},
-
+
"theme_experiment": {
- "colors": {
- "button": "--button-bgcolor",
@@ -395,7 +395,7 @@ index 9166c1bb44..5be116ebd7 100644
- "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity",
- "zap_gradient": "--panel-separator-zap-gradient"
- }
-+ "stylesheet": "experiment12.css"
++ "stylesheet": "experiment13.css"
}
}
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -407,42 +407,10 @@ index 2b9c386c29..27bab89399 100644
this.maybeInstallBuiltinAddon(
"default-theme@mozilla.org",
- "1.3",
-+ "1.12",
++ "1.13",
"resource://default-theme/"
);
-
-@@ -2737,6 +2737,10 @@ var XPIProvider = {
- logger.error("startup failed", e);
- AddonManagerPrivate.recordException("XPI", "startup failed", e);
- }
-+
-+ this.maybeUninstallBuiltinAddon("firefox-compact-light@mozilla.org");
-+ this.maybeUninstallBuiltinAddon("firefox-compact-dark@mozilla.org");
-+ this.maybeUninstallBuiltinAddon("firefox-alpenglow@mozilla.org");
- },
-
- /**
-@@ -3017,6 +3021,20 @@ var XPIProvider = {
- return installed;
- },
-
-+ async maybeUninstallBuiltinAddon(aID) {
-+ if (enabledScopes & BuiltInLocation.scope) {
-+ let existing = BuiltInLocation.get(aID);
-+ if (existing) {
-+ (async () => {
-+ const addon = await lazy.XPIDatabase.getVisibleAddonForID(aID);
-+ XPIStates.removeAddon(XPIInternal.BuiltInLocation, addon);
-+ XPIStates.save();
-+ lazy.XPIDatabase.removeAddonMetadata(addon);
-+ })();
-+ }
-+ }
-+ },
-+
- getDependentAddons(aAddon) {
- return Array.from(lazy.XPIDatabase.getAddons()).filter(addon =>
- addon.dependencies.includes(aAddon.id)
+
diff --git a/toolkit/mozapps/extensions/jar.mn b/toolkit/mozapps/extensions/jar.mn
index 935416225d..e995da1173 100644
--- a/toolkit/mozapps/extensions/jar.mn
@@ -451,8 +419,21 @@ index 935416225d..e995da1173 100644
% resource default-theme %content/mozapps/extensions/default-theme/
content/mozapps/extensions/default-theme (default-theme/*.svg)
content/mozapps/extensions/default-theme/manifest.json (default-theme/manifest.json)
-+ content/mozapps/extensions/default-theme/experiment12.css (default-theme/experiment12.css)
++ content/mozapps/extensions/default-theme/experiment13.css (default-theme/experiment13.css)
#endif
---
+diff --git a/browser/themes/BuiltInThemeConfig.sys.mjs b/browser/themes/BuiltInThemeConfig.sys.mjs
+index 7cfea4b705..428b24635a 100644
+--- a/browser/themes/BuiltInThemeConfig.sys.mjs
++++ b/browser/themes/BuiltInThemeConfig.sys.mjs
+@@ -18,7 +18,7 @@
+ * @param {string} [collection]
+ * The collection id that the theme is a part of. Optional.
+ */
+-export const BuiltInThemeConfig = new Map([
++export const BuiltInThemeConfig = new Map() || new Map([
+ [
+ "firefox-compact-light@mozilla.org",
+ {
+--
2.39.2 (Apple Git-143)
diff --git a/patches/0019-Move-Ghostery-icon-to-UrlBar.patch b/patches/0019-Move-Ghostery-icon-to-UrlBar.patch
index b967022cef..1fbd5727fb 100644
--- a/patches/0019-Move-Ghostery-icon-to-UrlBar.patch
+++ b/patches/0019-Move-Ghostery-icon-to-UrlBar.patch
@@ -3,14 +3,14 @@ Date: Wed, 30 Sep 2020 12:22:19 +0200
Subject: Move Ghostery icon to UrlBar
---
- .../components/customizableui/CustomizableUI.jsm | 13 ++++++++++++-
+ .../components/customizableui/CustomizableUI.sys.mjs | 13 ++++++++++++-
browser/themes/shared/addons/unified-extensions.css | 4 ++++
2 files changed, 16 insertions(+), 1 deletion(-)
-diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
+diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
index 7dfad17147..06c00310b1 100644
---- a/browser/components/customizableui/CustomizableUI.jsm
-+++ b/browser/components/customizableui/CustomizableUI.jsm
+--- a/browser/components/customizableui/CustomizableUI.sys.mjs
++++ b/browser/components/customizableui/CustomizableUI.sys.mjs
@@ -1169,7 +1169,12 @@ var CustomizableUIInternal = {
if (widget) {
widget.currentArea = aArea;
@@ -28,7 +28,7 @@ index 7dfad17147..06c00310b1 100644
@@ -1601,6 +1606,12 @@ var CustomizableUIInternal = {
this.ensureButtonContextMenu(widgetNode, aAreaNode);
}
-
+
+ if (widgetNode.getAttribute("data-extensionid") === "firefox@ghostery.com") {
+ const container = window.document.getElementById("urlbar-input-container");
+ container.insertAdjacentElement('afterbegin', widgetNode);
@@ -50,6 +50,6 @@ index 21156a9017..992ab5fe39 100644
/* 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/. */
---
+--
2.39.2 (Apple Git-143)
diff --git a/patches/0020-Remove-Lockwise-branding-in-about-logins.patch b/patches/0020-Remove-Lockwise-branding-in-about-logins.patch
index fe74febc09..8baa36ebb9 100644
--- a/patches/0020-Remove-Lockwise-branding-in-about-logins.patch
+++ b/patches/0020-Remove-Lockwise-branding-in-about-logins.patch
@@ -36,7 +36,7 @@ index c7138a909a..606d6da67e 100644
+ -->
-
+
diff --git a/browser/components/aboutlogins/content/components/login-intro.mjs b/browser/components/aboutlogins/content/components/login-intro.mjs
index 682ddb32d8..49fc0a7be1 100644
--- a/browser/components/aboutlogins/content/components/login-intro.mjs
@@ -53,7 +53,7 @@ index 682ddb32d8..49fc0a7be1 100644
.querySelector(".intro-help-link")
.setAttribute("href", supportURL);
+ */
-
+
let importClass = window.AboutLoginsUtils.fileImportEnabled
? ".intro-import-text.file-import"
diff --git a/browser/themes/shared/preferences/privacy.css b/browser/themes/shared/preferences/privacy.css
@@ -61,9 +61,9 @@ index b9e081f12d..7d16dd9eb3 100644
--- a/browser/themes/shared/preferences/privacy.css
+++ b/browser/themes/shared/preferences/privacy.css
@@ -4,6 +4,10 @@
-
+
/* Permissions */
-
+
+#breachAlertsBox {
+ display: none;
+}
@@ -71,6 +71,18 @@ index b9e081f12d..7d16dd9eb3 100644
.highlighting-group {
--section-highlight-background-color: color-mix(in srgb, var(--in-content-accent-color) 20%, transparent);
}
---
+diff --git a/browser/components/aboutlogins/content/components/login-intro.css b/browser/components/aboutlogins/content/components/login-intro.css
+index 3c5ecdc577..45f61e2da9 100644
+--- a/browser/components/aboutlogins/content/components/login-intro.css
++++ b/browser/components/aboutlogins/content/components/login-intro.css
+@@ -11,6 +11,7 @@
+
+ .heading {
+ font-size: 1.5em;
++ display: none;
+ }
+
+ section {
+--
2.39.2 (Apple Git-143)
diff --git a/patches/0021-Custom-brand-styling-on-new-private-window.patch b/patches/0021-Custom-brand-styling-on-new-private-window.patch
index fd6227b35e..1d9ae893b7 100644
--- a/patches/0021-Custom-brand-styling-on-new-private-window.patch
+++ b/patches/0021-Custom-brand-styling-on-new-private-window.patch
@@ -11,27 +11,27 @@ diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.htm
index fd713f2313..c53d5be79e 100644
--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
+++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
-@@ -13,6 +13,7 @@
-
-
-
+@@ -24,6 +24,7 @@
+ href="chrome://browser/skin/privatebrowsing/aboutPrivateBrowsing.css"
+ media="all"
+ />
+
-
-
-
+
+
+
diff --git a/browser/themes/shared/tabs.css b/browser/themes/shared/tabs.css
index e93e790667..064e8e31e3 100644
--- a/browser/themes/shared/tabs.css
+++ b/browser/themes/shared/tabs.css
-@@ -8,7 +8,7 @@
- --tab-min-height: 36px;
- --inline-tab-padding: 8px;
- /* Value for --in-content-page-background in in-content/common.inc.css */
-- --tabpanel-background-color: #f9f9fa;
-+ --tabpanel-background-color: #36393f;
- --tab-border-radius: 4px;
- --tab-shadow-max-size: 6px;
+@@ -12,7 +12,7 @@
--tab-block-margin: 4px;
---
+ /* --tabpanel-background-color matches $in-content-page-background in newtab
+ (browser/components/newtab/content-src/styles/_variables.scss) */
+- --tabpanel-background-color: #F9F9FB;
++ --tabpanel-background-color: #36393f;
+ --tab-attention-icon-color: rgb(42,195,162);
+ }
+
+--
2.39.2 (Apple Git-143)
diff --git a/patches/0025-Update-text-on-about-license.patch b/patches/0025-Update-text-on-about-license.patch
index a7a6c96627..62282d8e9a 100644
--- a/patches/0025-Update-text-on-about-license.patch
+++ b/patches/0025-Update-text-on-about-license.patch
@@ -10,13 +10,14 @@ diff --git a/browser/base/content/overrides/app-license.html b/browser/base/cont
index e7a158c792..7edf9e496c 100644
--- a/browser/base/content/overrides/app-license.html
+++ b/browser/base/content/overrides/app-license.html
-@@ -2,5 +2,5 @@
- - License, v. 2.0. If a copy of the MPL was not distributed with this
+@@ -3,6 +3,6 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
Binaries of this product have been made available to you by the
-- Mozilla Project under the Mozilla
-+ Ghostery under the Mozilla
- Public License 2.0 (MPL). Know your rights.
---
+
+ Binaries of this product have been made available to you by the
+- Mozilla Project under the Mozilla Public
++ Ghostery under the Mozilla Public
+ License 2.0 (MPL). Know your rights.
+
+--
2.39.2 (Apple Git-143)
diff --git a/patches/0027-Disable-ion-pioneer-studies-search-detection.patch b/patches/0027-Disable-ion-pioneer-studies-search-detection.patch
index 50e78731aa..e2c8ec83dc 100644
--- a/patches/0027-Disable-ion-pioneer-studies-search-detection.patch
+++ b/patches/0027-Disable-ion-pioneer-studies-search-detection.patch
@@ -5,14 +5,13 @@ Subject: Disable ion / pioneer studies / search detection
fix #358
---
browser/components/BrowserGlue.sys.mjs | 6 +++---
- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
index d8c789da83..8e54a3d4ed 100644
--- a/browser/components/BrowserGlue.sys.mjs
+++ b/browser/components/BrowserGlue.sys.mjs
-@@ -2287,9 +2287,9 @@ BrowserGlue.prototype = {
+@@ -2359,9 +2359,9 @@ BrowserGlue.prototype = {
this._monitorScreenshotsPref();
this._monitorWebcompatReporterPref();
this._monitorHTTPSOnlyPref();
@@ -22,22 +21,9 @@ index d8c789da83..8e54a3d4ed 100644
+ // this._monitorIonPref();
+ // this._monitorIonStudies();
+ // this._setupSearchDetection();
-
+
this._monitorGPCPref();
- },
-diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
-index ba69073aa4..cfaab4fff1 100644
---- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
-+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
-@@ -3022,7 +3022,7 @@ var XPIProvider = {
- },
-
- async maybeUninstallBuiltinAddon(aID) {
-- if (enabledScopes & BuiltInLocation.scope) {
-+ if (lazy.enabledScopes & BuiltInLocation.scope) {
- let existing = BuiltInLocation.get(aID);
- if (existing) {
- (async () => {
---
+
+--
2.39.2 (Apple Git-143)
diff --git a/patches/0029-OpenURL-on-buildID-changes.patch b/patches/0029-OpenURL-on-buildID-changes.patch
index f9be2b52ef..9a9255ef60 100644
--- a/patches/0029-OpenURL-on-buildID-changes.patch
+++ b/patches/0029-OpenURL-on-buildID-changes.patch
@@ -10,10 +10,11 @@ diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/componen
index a3cef0ddbd..0dfe0e533b 100644
--- a/browser/components/BrowserContentHandler.sys.mjs
+++ b/browser/components/BrowserContentHandler.sys.mjs
-@@ -697,13 +697,13 @@ nsBrowserContentHandler.prototype = {
+@@ -697,14 +697,13 @@ nsBrowserContentHandler.prototype = {
// we may open the startPage in addition to restoring the session.
- willRestoreSession = lazy.SessionStartup.isAutomaticRestoreEnabled();
-
+ willRestoreSession =
+ lazy.SessionStartup.isAutomaticRestoreEnabled();
+-
+ case OVERRIDE_NEW_BUILD_ID:
overridePage = Services.urlFormatter.formatURLPref(
"startup.homepage_override_url"
@@ -26,8 +27,8 @@ index a3cef0ddbd..0dfe0e533b 100644
) {
overridePage = getPostUpdateOverridePage(update, overridePage);
// Send the update ping to signal that the update was successful.
-@@ -712,12 +712,6 @@ nsBrowserContentHandler.prototype = {
-
+@@ -713,12 +712,6 @@ nsBrowserContentHandler.prototype = {
+
overridePage = overridePage.replace("%OLD_VERSION%", old_mstone);
break;
- case OVERRIDE_NEW_BUILD_ID:
@@ -39,6 +40,6 @@ index a3cef0ddbd..0dfe0e533b 100644
}
}
} catch (ex) {}
---
+--
2.39.2 (Apple Git-143)
diff --git a/patches/0033-Default-top-sites.patch b/patches/0033-Default-top-sites.patch
index b9e6835a20..d3a4215497 100644
--- a/patches/0033-Default-top-sites.patch
+++ b/patches/0033-Default-top-sites.patch
@@ -15,7 +15,7 @@ fix #410
.../tippytop/images/privacytools-io@2x.png | Bin 0 -> 1726 bytes
.../tippytop/images/whotracks-me@2x.png | Bin 0 -> 215 bytes
.../data/content/tippytop/top_sites.json | 25 ++++++++++++++++++
- .../components/newtab/lib/DefaultSites.jsm | 3 +++
+ .../components/newtab/lib/DefaultSites.sys.mjs | 3 +++
12 files changed, 28 insertions(+)
create mode 100644 browser/components/newtab/data/content/tippytop/favicons/alternativeto-net.ico
create mode 100644 browser/components/newtab/data/content/tippytop/favicons/firefoxadddons.ico
@@ -446,27 +446,27 @@ index 82764a0527..7d8fd3f75a 100644
+ "favicon_url": "favicons/firefoxaddons.ico"
}
]
-diff --git a/browser/components/newtab/lib/DefaultSites.jsm b/browser/components/newtab/lib/DefaultSites.jsm
+diff --git a/browser/components/newtab/lib/DefaultSites.sys.mjs b/browser/components/newtab/lib/DefaultSites.sys.mjs
index f52cab278d..a0fca2cb14 100644
---- a/browser/components/newtab/lib/DefaultSites.jsm
-+++ b/browser/components/newtab/lib/DefaultSites.jsm
-@@ -4,6 +4,7 @@
-
- "use strict";
-
+--- a/browser/components/newtab/lib/DefaultSites.sys.mjs
++++ b/browser/components/newtab/lib/DefaultSites.sys.mjs
+@@ -2,6 +2,7 @@
+ * 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/. */
+
+/*
const DEFAULT_SITES_MAP = new Map([
// This first item is the global list fallback for any unexpected geos
[
-@@ -43,6 +44,8 @@ const DEFAULT_SITES_MAP = new Map([
+@@ -41,6 +42,8 @@ const DEFAULT_SITES_MAP = new Map([
"https://www.baidu.com/,https://www.zhihu.com/,https://www.ifeng.com/,https://weibo.com/,https://www.ctrip.com/,https://www.iqiyi.com/",
],
]);
+*/
+const DEFAULT_SITES_MAP = new Map([["", "https://www.ghostery.com/,https://whotracks.me/,https://privacytools.io/,https://alternativeto.net/,https://addons.mozilla.org"]]);
-
- const EXPORTED_SYMBOLS = ["DEFAULT_SITES"];
-
---
+
+ // Immutable for export.
+ export const DEFAULT_SITES = Object.freeze(DEFAULT_SITES_MAP);
+--
2.39.2 (Apple Git-143)
diff --git a/patches/0035-Disable-Onboarding-Messages.patch b/patches/0035-Disable-Onboarding-Messages.patch
index adff834572..6cadcc4d14 100644
--- a/patches/0035-Disable-Onboarding-Messages.patch
+++ b/patches/0035-Disable-Onboarding-Messages.patch
@@ -12,14 +12,14 @@ index a0fc277ec7..1e2e5c5327 100644
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
@@ -1088,8 +1088,7 @@ const BASE_MESSAGES = () => [
];
-
+
// Eventually, move Feature Callout messages to their own provider
-const ONBOARDING_MESSAGES = () =>
- BASE_MESSAGES().concat(FeatureCalloutMessages.getMessages());
-+const ONBOARDING_MESSAGES = [];
-
++const ONBOARDING_MESSAGES = () => ([]);
+
const OnboardingMessageProvider = {
async getExtraAttributes() {
---
+--
2.39.2 (Apple Git-143)
diff --git a/patches/0036-Build-mach-package-use-MOZ_FETCHES-in-automation.patch b/patches/0036-Build-mach-package-use-MOZ_FETCHES-in-automation.patch
index e62cc93eae..5f64e4f69f 100644
--- a/patches/0036-Build-mach-package-use-MOZ_FETCHES-in-automation.patch
+++ b/patches/0036-Build-mach-package-use-MOZ_FETCHES-in-automation.patch
@@ -10,32 +10,31 @@ diff --git a/build/moz.configure/bootstrap.configure b/build/moz.configure/boots
index 5abb27f469..e34e9472cf 100644
--- a/build/moz.configure/bootstrap.configure
+++ b/build/moz.configure/bootstrap.configure
-@@ -143,6 +143,7 @@ def bootstrap_path(path, **kwargs):
-
+@@ -146,6 +146,7 @@ def bootstrap_path(path, **kwargs):
+
@depends(
enable_bootstrap,
+ "MOZ_AUTOMATION",
toolchains_base_dir,
moz_fetches_dir,
bootstrap_toolchain_tasks,
-@@ -159,7 +160,7 @@ def bootstrap_path(path, **kwargs):
- @imports(_from="__builtin__", _import="open")
+@@ -164,6 +165,7 @@ def bootstrap_path(path, **kwargs):
@imports(_from="__builtin__", _import="Exception")
def bootstrap_path(
-- bootstrap, toolchains_base_dir, moz_fetches_dir, tasks, build_env, path
-+ bootstrap, automation, toolchains_base_dir, moz_fetches_dir, tasks, build_env, path
- ):
- if not path:
- return
-@@ -282,7 +283,7 @@ def bootstrap_path(path, **kwargs):
+ bootstrap,
++ automation,
+ toolchains_base_dir,
+ moz_fetches_dir,
+ tasks,
+@@ -294,7 +296,7 @@ def bootstrap_path(path, **kwargs):
return True
-
+
path = os.path.join(toolchains_base_dir, path_prefix, *path_parts)
- if bootstrap and bootstrap(path_parts[0]):
+ if bootstrap and bootstrap(path_parts[0]) and not automation:
try:
if not try_bootstrap(os.path.exists(path)):
# If there aren't toolchain artifacts to use for this build,
---
+--
2.39.2 (Apple Git-143)
diff --git a/patches/0037-Disable-help-on-switching-to-a-new-device.patch b/patches/0037-Disable-help-on-switching-to-a-new-device.patch
new file mode 100644
index 0000000000..f1cb9caede
--- /dev/null
+++ b/patches/0037-Disable-help-on-switching-to-a-new-device.patch
@@ -0,0 +1,29 @@
+From: Krzysztof Modras
+Date: Tue, 12 Sep 2023 16:34:14 +0200
+Subject: Disable help on switching to a new device
+
+---
+ browser/base/content/browser-menubar.inc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
+index fca2398bfc..83d10b6406 100644
+--- a/browser/base/content/browser-menubar.inc
++++ b/browser/base/content/browser-menubar.inc
+@@ -501,10 +501,11 @@
+ data-l10n-id="menu-help-not-deceptive"
+ appmenu-data-l10n-id="appmenu-help-not-deceptive"
+ hidden="true"/>
+-
++ appmenu-data-l10n-id="appmenu-help-switch-device"/>-->
+
+