CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

firefox: add changes for 148.0.2 build

Browse source
This commit is contained in:
Luis Guzmán 2026-03-11 07:54:09 -06:00
parent 685f07c3e7
commit a5143ababe
4 changed files with 66 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

16
helpers/DATA/firefox/patch_changes/002-Remove_moreFromMozilla_Focus_and_Klar.patch
View file

@ -4,10 +4,10 @@ Based on https://git.parabola.nu/abslibre.git/diff/libre/iceweasel/9004-FSDG-mis
- Remove promos of Firefox Focus and Klar from Private Browsing
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index c5f7cf3a..f0124235 100644
index f9a558a1..9c171c72 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1368,9 +1368,9 @@ pref("accessibility.typeaheadfind.linksonly", false);
@@ -1366,11 +1366,11 @@ pref("accessibility.typeaheadfind.linksonly", false);
pref("accessibility.typeaheadfind.flashBar", 1);
// Whether we had to hide the "Firefox Labs" section because it would be empty.
@ -16,6 +16,9 @@ index c5f7cf3a..f0124235 100644
// Whether we show the "More from Mozilla" section.
-pref("browser.preferences.moreFromMozilla", true);
+pref("browser.preferences.moreFromMozilla", false);
// Whether we show the "AI Controls" pane.
-pref("browser.preferences.aiControls", true);
+pref("browser.preferences.aiControls", false);
// Used by settings to track whether the user customized advanced
// performance settings. Not used directly elsewhere.
@ -736,10 +739,10 @@ index 3888af10..1d6c606f 100644
"chrome://browser/content/asrouter/assets/fox-with-devices.svg",
"chrome://browser/content/asrouter/assets/fox-with-locked-box.svg",
diff --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js
index 8807b5d3..82367922 100644
index 109d334e..ee49d63f 100644
--- a/browser/components/preferences/moreFromMozilla.js
+++ b/browser/components/preferences/moreFromMozilla.js
@@ -81,51 +81,7 @@ var gMoreFromMozillaPane = {
@@ -81,50 +81,7 @@ var gMoreFromMozillaPane = {
renderProducts() {
const isRegionUS = Region.home.toLowerCase() === "us";
@ -777,9 +780,8 @@ index 8807b5d3..82367922 100644
- {
- id: "mozilla-monitor",
- title_string_id: "more-from-moz-mozilla-monitor-title",
- description_string_id: isRegionUS
- ? "more-from-moz-mozilla-monitor-us-description"
- : "more-from-moz-mozilla-monitor-global-description",
- description_string_id:
- "more-from-moz-mozilla-monitor-global-description",
- region: isRegionUS ? "us" : "global",
- button: {
- id: "mozillaMonitor",

9
helpers/DATA/firefox/patch_changes/003-disable_sponsored_topsites_and_keep_weather_widget_static.patch
View file

@ -24,8 +24,8 @@ index 217ed280..d91cde94 100644
// Do not enable the preonboarding experience on Linux
#ifdef XP_LINUX
@@ -1856,24 +1856,24 @@ pref("browser.newtabpage.activity-stream.mobileDownloadModal.variant-c", false);
pref("browser.newtabpage.activity-stream.discoverystream.refinedCardsLayout.enabled", true);
@@ -1879,28 +1879,28 @@ pref("browser.newtabpage.activity-stream.search.useHandoffComponent", true);
pref("browser.newtabpage.activity-stream.externalComponents.enabled", true);
// Mozilla Ad Routing Service (MARS) unified ads service
-pref("browser.newtabpage.activity-stream.unifiedAds.tiles.enabled", true);
@ -35,7 +35,12 @@ index 217ed280..d91cde94 100644
+pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false);
+pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "");
pref("browser.newtabpage.activity-stream.unifiedAds.adsFeed.enabled", false);
#ifdef NIGHTLY_BUILD
-pref("browser.newtabpage.activity-stream.unifiedAds.ohttp.enabled", true);
+pref("browser.newtabpage.activity-stream.unifiedAds.ohttp.enabled", false);
#else
pref("browser.newtabpage.activity-stream.unifiedAds.ohttp.enabled", false);
#endif
// Weather widget for newtab
-pref("browser.newtabpage.activity-stream.showWeather", true);

88
helpers/DATA/firefox/patch_changes/013-remove_finish_setup_third_party_services.patch
View file

@ -11,53 +11,53 @@ index ba47adb6..c4b29ec4 100644
where: "tabshifted",
},
navigate: true,
@@ -750,49 +750,6 @@ const MR_ABOUT_WELCOME_DEFAULT = {
@@ -865,6 +865,49 @@ const MR_ABOUT_WELCOME_DEFAULT = {
},
targeting: "isFxASignedIn",
},
- {
- id: "AW_ACCOUNT_LOGIN",
- content: {
- fullscreen: true,
- position: "split",
- split_narrow_bkg_position: "-228px",
- image_alt_text: {
- string_id: "mr2022-onboarding-gratitude-image-alt",
- },
- background:
- "url('chrome://activity-stream/content/data/content/assets/fox-doodle-waving-laptop.svg') center center / 80% no-repeat var(--mr-screen-background-color)",
- progress_bar: true,
- logo: {},
- title: {
- string_id: "onboarding-sign-up-title",
- },
- subtitle: {
- string_id: "onboarding-sign-up-description",
- },
- secondary_button: {
- label: {
- string_id: "mr2-onboarding-start-browsing-button-label",
- },
- style: "secondary",
- action: {
- navigate: true,
- },
- },
- primary_button: {
- label: {
- string_id: "onboarding-sign-up-button",
- },
- action: {
- data: {
- entrypoint: "newuser-onboarding-desktop",
- },
- type: "FXA_SIGNIN_FLOW",
- navigate: true,
- },
- },
- },
- targeting: "!isFxASignedIn",
- },
+ {
+ id: "AW_ACCOUNT_LOGIN",
+ content: {
+ fullscreen: true,
+ position: "split",
+ split_narrow_bkg_position: "-228px",
+ image_alt_text: {
+ string_id: "mr2022-onboarding-gratitude-image-alt",
+ },
+ background:
+ "url('chrome://activity-stream/content/data/content/assets/br-fxa-fox-mirror.svg') var(--mr-secondary-position) no-repeat light-dark(rgba(252, 245, 240, 1), rgba(33, 3, 64, 1))",
+ progress_bar: true,
+ logo: {},
+ title: {
+ string_id: "onboarding-sign-up-title",
+ },
+ subtitle: {
+ string_id: "onboarding-sign-up-description",
+ },
+ secondary_button: {
+ label: {
+ string_id: "mr2-onboarding-start-browsing-button-label",
+ },
+ style: "secondary",
+ action: {
+ navigate: true,
+ },
+ },
+ primary_button: {
+ label: {
+ string_id: "onboarding-sign-up-button",
+ },
+ action: {
+ data: {
+ entrypoint: "newuser-onboarding-desktop",
+ },
+ type: "FXA_SIGNIN_FLOW",
+ navigate: true,
+ },
+ },
+ },
+ targeting: "!isFxASignedIn",
+ },
],
};

7
helpers/make-firefox
View file

@ -19,12 +19,13 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=129
VERSION=129.1
EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
REPOKEY=AEBDF4819BE21867
. ./config
MAIN_REBRANDING_ENABLED=1
# SHA256 HASHES UPDATES
GLEAN_CONF_RS_INITIAL=$(sha256sum third_party/rust/glean/src/configuration.rs|awk '{print$1}')
# GNUZILLA ADDON REPLACEMENT
@ -287,6 +288,7 @@ MOZ_ENABLE_BREAKPAD = 0
MOZ_ENABLE_TELEMETRY = 0
EOF
main_rebranding() {
SEDSCRIPT="
s|Updates from { -vendor-short-name } and { -brand-product-name }|Updates from { -vendor-short-name }|;
s/Try Firefox/Try Abrowser/g;
@ -322,6 +324,9 @@ find l10n -type f -not -iregex '.*changelog.*' \
sed 's/Firefox/Abrowser/' -i debian/control.in \
browser/locales/en-US/chrome/overrides/appstrings.properties
}
# Useful when trying to catch patch issues faster.
[ "$MAIN_REBRANDING_ENABLED" = 1 ] && main_rebranding
sed s/ubuntu/trisquel/g debian/distribution.ini -i
sed "s/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel $REVISION/; s/1010/40/" -i debian/firefox.postinst.in