diff --git a/helpers/DATA/firefox/patch_changes/013-remove_finish_setup_third_party_services.patch b/helpers/DATA/firefox/patch_changes/013-remove_finish_setup_third_party_services.patch
index 0bc8d3ca..633d56db 100644
--- a/helpers/DATA/firefox/patch_changes/013-remove_finish_setup_third_party_services.patch
+++ b/helpers/DATA/firefox/patch_changes/013-remove_finish_setup_third_party_services.patch
@@ -61,19 +61,6 @@ index ba47adb6..c4b29ec4 100644
],
};
-diff --git a/browser/components/asrouter/modules/FeatureCalloutMessages.sys.mjs b/browser/components/asrouter/modules/FeatureCalloutMessages.sys.mjs
-index 29d2ca46..41b65ac4 100644
---- a/browser/components/asrouter/modules/FeatureCalloutMessages.sys.mjs
-+++ b/browser/components/asrouter/modules/FeatureCalloutMessages.sys.mjs
-@@ -885,7 +885,7 @@ const MESSAGES = () => {
- dismiss: true,
- type: "OPEN_URL",
- data: {
-- args: "https://addons.mozilla.org/en-US/firefox/collections/4757633/36d285535db74c6986abbeeed3e214/?page=1&collection_sort=added",
-+ args: "https://gnuzilla.gnu.org/",
- where: "tabshifted",
- },
- },
diff --git a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs
index abc6db68..0c86955f 100644
--- a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs
diff --git a/helpers/DATA/firefox/patch_changes/014-remove_support_firefox_mission_on_abrowser.patch b/helpers/DATA/firefox/patch_changes/014-remove_support_firefox_mission_on_abrowser.patch
index 680d38ad..37f0e3ae 100644
--- a/helpers/DATA/firefox/patch_changes/014-remove_support_firefox_mission_on_abrowser.patch
+++ b/helpers/DATA/firefox/patch_changes/014-remove_support_firefox_mission_on_abrowser.patch
@@ -19,43 +19,43 @@ index c0094fe0..08856c78 100644
diff --git a/browser/extensions/newtab/lib/AboutPreferences.sys.mjs b/browser/extensions/newtab/lib/AboutPreferences.sys.mjs
-index 0d43919b..f2e0fbd0 100644
+index eec8eb86..1aed35a8 100644
--- a/browser/extensions/newtab/lib/AboutPreferences.sys.mjs
+++ b/browser/extensions/newtab/lib/AboutPreferences.sys.mjs
-@@ -88,33 +88,6 @@ const PREFS_FOR_SETTINGS = () => [
- ),
- eventSource: "TOP_STORIES",
- },
-- {
-- id: "support-firefox",
-- pref: {
-- feed: "showSponsoredCheckboxes",
-- titleString: "home-prefs-support-firefox-header",
-- nestedPrefs: [
-- {
-- name: "showSponsoredTopSites",
-- titleString: "home-prefs-shortcuts-by-option-sponsored",
-- eventSource: "SPONSORED_TOP_SITES",
-- },
-- {
-- name: "showSponsored",
-- titleString: "home-prefs-recommended-by-option-sponsored-stories",
-- eventSource: "POCKET_SPOCS",
-- shouldHidePref: !Services.prefs.getBoolPref(
-- "browser.newtabpage.activity-stream.feeds.system.topstories",
-- true
-- ),
-- shouldDisablePref: !Services.prefs.getBoolPref(
-- "browser.newtabpage.activity-stream.feeds.section.topstories",
-- true
-- ),
-- },
-- ],
+@@ -90,33 +90,6 @@ const PREFS_FOR_SETTINGS = () => {
+ ),
+ eventSource: "TOP_STORIES",
+ },
+- {
+- id: "support-firefox",
+- pref: {
+- feed: "showSponsoredCheckboxes",
+- titleString: "home-prefs-support-firefox-header",
+- nestedPrefs: [
+- {
+- name: "showSponsoredTopSites",
+- titleString: "home-prefs-shortcuts-by-option-sponsored",
+- eventSource: "SPONSORED_TOP_SITES",
+- },
+- {
+- name: "showSponsored",
+- titleString: "home-prefs-recommended-by-option-sponsored-stories",
+- eventSource: "POCKET_SPOCS",
+- shouldHidePref: !Services.prefs.getBoolPref(
+- "browser.newtabpage.activity-stream.feeds.system.topstories",
+- true
+- ),
+- shouldDisablePref: !Services.prefs.getBoolPref(
+- "browser.newtabpage.activity-stream.feeds.section.topstories",
+- true
+- ),
+- },
+- ],
+- },
- },
-- },
- ];
+ ];
+ };
- export class AboutPreferences {
@@ -344,41 +317,9 @@ export class AboutPreferences {
}
});
diff --git a/helpers/DATA/firefox/patch_changes/018-adjust_wallpapers_abrowser.patch b/helpers/DATA/firefox/patch_changes/018-adjust_wallpapers_abrowser.patch
index d582d489..1bb19f52 100644
--- a/helpers/DATA/firefox/patch_changes/018-adjust_wallpapers_abrowser.patch
+++ b/helpers/DATA/firefox/patch_changes/018-adjust_wallpapers_abrowser.patch
@@ -8,7 +8,7 @@ index 72df22b3..24f2f807 100644
? {
- wallpaperUrl: `${baseAttachmentURL}${record.attachment.location}`,
+ wallpaperUrl: record.attachment.location.includes("trisquel")
-+ ? `https://trisquel.cmxsl.org/newtab/${record.attachment.filename.replace(".avif", ".webp")}`
++ ? `chrome://browser/content/wallpapers/${record.attachment.filename.replace(".avif", ".webp")}`
+ : `${baseAttachmentURL}${record.attachment.location}`,
}
: {}),
diff --git a/helpers/DATA/firefox/settings.js b/helpers/DATA/firefox/settings.js
index a297d56b..b7fee646 100644
--- a/helpers/DATA/firefox/settings.js
+++ b/helpers/DATA/firefox/settings.js
@@ -210,7 +210,7 @@ pref("media.gmp-widevinecdm.enabled", false);
pref("media.eme.enabled", false);
//Disable middle click content load
-//Avoid loading urls by mistake
+//Avoid loading urls by mistake
pref("middlemouse.contentLoadURL", false);
//Disable heartbeat
@@ -324,3 +324,6 @@ pref("messaging-system.rsexperimentloader.enabled", false);
pref("network.trr.mode", 5);
pref("doh-rollout.enabled", false);
pref("doh-rollout.provider-steering.enabled", false);
+
+// Disable remote rollouts
+pref("nimbus.rollouts.enabled", false);
diff --git a/helpers/DATA/firefox/ui_branding/illustrations/abrowser-offline.svg b/helpers/DATA/firefox/ui_branding/illustrations/abrowser-offline.svg
new file mode 100644
index 00000000..98ba8721
--- /dev/null
+++ b/helpers/DATA/firefox/ui_branding/illustrations/abrowser-offline.svg
@@ -0,0 +1,655 @@
+
+
+
+
diff --git a/helpers/DATA/firefox/ui_branding/illustrations/abrowser-online.svg b/helpers/DATA/firefox/ui_branding/illustrations/abrowser-online.svg
new file mode 100644
index 00000000..9b5f0f66
--- /dev/null
+++ b/helpers/DATA/firefox/ui_branding/illustrations/abrowser-online.svg
@@ -0,0 +1,614 @@
+
+
+
+
diff --git a/helpers/DATA/firefox/ui_branding/illustrations/no-connection.svg b/helpers/DATA/firefox/ui_branding/illustrations/no-connection.svg
new file mode 100644
index 00000000..310e0e9c
--- /dev/null
+++ b/helpers/DATA/firefox/ui_branding/illustrations/no-connection.svg
@@ -0,0 +1,520 @@
+
+
+
+
diff --git a/helpers/DATA/firefox/ui_branding/illustrations/security-error.svg b/helpers/DATA/firefox/ui_branding/illustrations/security-error.svg
new file mode 100644
index 00000000..9377e9f2
--- /dev/null
+++ b/helpers/DATA/firefox/ui_branding/illustrations/security-error.svg
@@ -0,0 +1,350 @@
+
+
+
+
diff --git a/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-abe-01.webp b/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-abe-01.webp
new file mode 100644
index 00000000..7fbf740f
Binary files /dev/null and b/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-abe-01.webp differ
diff --git a/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-abe-02.webp b/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-abe-02.webp
new file mode 100644
index 00000000..4c7256e0
Binary files /dev/null and b/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-abe-02.webp differ
diff --git a/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-abe-03.webp b/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-abe-03.webp
new file mode 100644
index 00000000..f1402033
Binary files /dev/null and b/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-abe-03.webp differ
diff --git a/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-abe-04.webp b/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-abe-04.webp
new file mode 100644
index 00000000..fe35e658
Binary files /dev/null and b/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-abe-04.webp differ
diff --git a/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-aramo.webp b/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-aramo.webp
new file mode 100644
index 00000000..dda54b3f
Binary files /dev/null and b/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-aramo.webp differ
diff --git a/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-ecne.webp b/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-ecne.webp
new file mode 100644
index 00000000..83f5b475
Binary files /dev/null and b/helpers/DATA/firefox/ui_branding/wallpapers/trisquel-ecne.webp differ
diff --git a/helpers/make-firefox b/helpers/make-firefox
index 6440b799..ff88d577 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=132
+VERSION=133
EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
REPOKEY=AEBDF4819BE21867
@@ -278,10 +278,31 @@ done
# Replace sidebar icons
rm -rf browser/themes/shared/sidebar
cp -R $DATA/ui_branding/sidebar browser/themes/shared/
+# Replace brand illustrations
+grep -rl kit-concerned.svg | xargs -r sed -i 's|kit-concerned.svg|abrowser-offline.svg|g'
+grep -rl kit-happy.svg | xargs -r sed -i 's|kit-happy.svg|abrowser-online.svg|g'
+cp $DATA/ui_branding/illustrations/* toolkit/themes/shared/illustrations/
+for i in kit-concerned.svg kit-happy.svg
+do
+ echo "> removing replaced illustration $i"
+ rm toolkit/themes/shared/illustrations/$i
+done
python3 $DATA/ui_branding/wallpaper-replace.py --source $DATA/ui_branding/build.json \
--replace services/settings/dumps/main/newtab-wallpapers-v2.json
+# Static wallpapers
+mkdir -p browser/base/content/wallpapers/
+cp $DATA/ui_branding/wallpapers/*.webp browser/base/content/wallpapers/
+
+echo "" >> browser/base/jar.mn
+echo "browser.jar:" >> browser/base/jar.mn
+
+for img in browser/base/content/wallpapers/*.webp; do
+ filename=$(basename "$img")
+ echo " content/browser/wallpapers/$filename (content/wallpapers/$filename)" >> browser/base/jar.mn
+done
+
# Graphic Debranding
cp $DATA/ui_branding/debranding/assets/puzzle-fox.svg browser/extensions/newtab/data/content/assets/puzzle-fox.svg
## replace multiple firefox qr codes.