From 492256dd6f2232d28eff54d3a7fc61440659c138 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Sat, 14 Jun 2025 16:00:02 -0600 Subject: [PATCH 01/10] misc: clean unused component on src line --- helpers/make-debootstrap | 2 +- helpers/make-llvm-toolchain-19 | 2 +- helpers/make-mate-user-admin | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helpers/make-debootstrap b/helpers/make-debootstrap index 561a5af..644dd69 100644 --- a/helpers/make-debootstrap +++ b/helpers/make-debootstrap @@ -18,7 +18,7 @@ # VERSION=7 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble main universe' +EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble main' NETINST=true . ./config diff --git a/helpers/make-llvm-toolchain-19 b/helpers/make-llvm-toolchain-19 index a6a2b2b..c097abd 100644 --- a/helpers/make-llvm-toolchain-19 +++ b/helpers/make-llvm-toolchain-19 @@ -18,7 +18,7 @@ # VERSION=1 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble main universe' +EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble universe' BACKPORTS=true . ./config diff --git a/helpers/make-mate-user-admin b/helpers/make-mate-user-admin index f2858c7..b6785ce 100644 --- a/helpers/make-mate-user-admin +++ b/helpers/make-mate-user-admin @@ -18,7 +18,7 @@ # VERSION=2 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble main universe' +EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble universe' . ./config From 94fcd284a37b18be7a9c429d64d000bbfe0af9c7 Mon Sep 17 00:00:00 2001 From: Jacob K Date: Tue, 17 Jun 2025 06:14:21 +0000 Subject: [PATCH 02/10] cron: correct copyright on crontab2english.pl (fixes TPH # 199) --- helpers/DATA/cron/license-info-fix.patch | 37 ++++++++++++++++++++++++ helpers/make-cron | 9 +++--- 2 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 helpers/DATA/cron/license-info-fix.patch diff --git a/helpers/DATA/cron/license-info-fix.patch b/helpers/DATA/cron/license-info-fix.patch new file mode 100644 index 0000000..b6221bd --- /dev/null +++ b/helpers/DATA/cron/license-info-fix.patch @@ -0,0 +1,37 @@ +diff --git a/debian/copyright b/debian/copyright +index 3c8824f..c6ec81a 100644 +--- a/debian/copyright ++++ b/debian/copyright +@@ -38,7 +38,7 @@ License: GPL-2+ + + Files: debian/examples/crontab2english.pl + Copyright: 2001, Sean M. Burke +-License: Artistic ++License: GPL-1+ or Artistic + + License: Paul-Vixie's-license + Distribute freely, except: don't remove my name from the source or +@@ -67,6 +67,23 @@ License: GPL-2+ + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + ++License: GPL-1+ ++ This package is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 1 of the License, or ++ (at your option) any later version. ++ . ++ This package is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ . ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see ++ . ++ On Debian systems, the complete text of the GNU General ++ Public License version 1 can be found in "/usr/share/common-licenses/GPL-1". ++ + License: Artistic + This program is free software; you can redistribute it and/or modify it + under the terms of the "Artistic License" which comes with Debian. diff --git a/helpers/make-cron b/helpers/make-cron index 3f6c3de..1b70b03 100644 --- a/helpers/make-cron +++ b/helpers/make-cron @@ -17,15 +17,14 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 +BUILD_UNTIL=12 . ./config -rm debian/examples/crontab2english.pl +patch_p1 $DATA/license-info-fix.patch -sed '/crontab2english.pl/,/License: Artistic/d;/License: Artistic/,/common-licenses/d' -i debian/copyright - -changelog "Removed non-free example #10868" +changelog "Corrected license info (package-helpers issue #199)" package From af31af9d45b92c6970612ee2213ecbeeaae21f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Tue, 17 Jun 2025 00:39:36 -0600 Subject: [PATCH 03/10] cron: remove build until direction. --- helpers/make-cron | 1 - 1 file changed, 1 deletion(-) diff --git a/helpers/make-cron b/helpers/make-cron index 1b70b03..df4d767 100644 --- a/helpers/make-cron +++ b/helpers/make-cron @@ -18,7 +18,6 @@ # VERSION=2 -BUILD_UNTIL=12 . ./config From 1aab15ff3ad9a3a305a6d47a47ed8a0d7ac39ac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Thu, 19 Jun 2025 15:01:55 -0600 Subject: [PATCH 04/10] dh-cargo: backport for newer abrowser releases --- helpers/make-dh-cargo | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 helpers/make-dh-cargo diff --git a/helpers/make-dh-cargo b/helpers/make-dh-cargo new file mode 100644 index 0000000..1f693f1 --- /dev/null +++ b/helpers/make-dh-cargo @@ -0,0 +1,29 @@ +#!/bin/sh +# +# Copyright (C) 2025 Luis Guzman +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +VERSION=1 +EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble main' +BACKPORT=true +BUILD_UNTIL=11.0 + +. ./config + +changelog "Adding package as a dependency for newer abrowser releases." + +package From 73229c9749452e4d2a11a21422f1199597f1d3fd Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Thu, 19 Jun 2025 21:03:27 +0000 Subject: [PATCH 05/10] libgit2: backport for newer abrowser releases --- helpers/make-libgit2 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 helpers/make-libgit2 diff --git a/helpers/make-libgit2 b/helpers/make-libgit2 new file mode 100644 index 0000000..1f693f1 --- /dev/null +++ b/helpers/make-libgit2 @@ -0,0 +1,29 @@ +#!/bin/sh +# +# Copyright (C) 2025 Luis Guzman +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +VERSION=1 +EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble main' +BACKPORT=true +BUILD_UNTIL=11.0 + +. ./config + +changelog "Adding package as a dependency for newer abrowser releases." + +package From b6b5bf299f77f0b15843be380944c31cdfdfd1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Thu, 19 Jun 2025 15:17:38 -0600 Subject: [PATCH 06/10] rustc-1.82: manually backported rustc-1.82 for latest abrowser builds --- ...000-edit_rules_job_numbers_for_amd64.patch | 18 +++++++++++ ...set_pkg-config_manual_path_for_aramo.patch | 12 +++++++ helpers/make-rustc-1.82 | 32 +++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 helpers/DATA/rustc-1.82/patch_changes/000-edit_rules_job_numbers_for_amd64.patch create mode 100644 helpers/DATA/rustc-1.82/patch_changes/001-set_pkg-config_manual_path_for_aramo.patch create mode 100644 helpers/make-rustc-1.82 diff --git a/helpers/DATA/rustc-1.82/patch_changes/000-edit_rules_job_numbers_for_amd64.patch b/helpers/DATA/rustc-1.82/patch_changes/000-edit_rules_job_numbers_for_amd64.patch new file mode 100644 index 0000000..5f55fc3 --- /dev/null +++ b/helpers/DATA/rustc-1.82/patch_changes/000-edit_rules_job_numbers_for_amd64.patch @@ -0,0 +1,18 @@ +diff --git a/debian/rules b/debian/rules +index 5651361f..26738cfd 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -70,9 +70,13 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + ifeq ($(DEB_HOST_ARCH),riscv64) + NJOBS := -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + else ++ifeq ($(DEB_HOST_ARCH),amd64) ++NJOBS := -j 8 ++else + NJOBS := -j 4 + endif + endif ++endif + RUSTBUILD = RUST_BACKTRACE=1 python3 src/bootstrap/bootstrap.py $(NJOBS) + RUSTBUILD_FLAGS = --stage 2 --config debian/config.toml --on-fail env + # rust-tidy depends on lots of modules that we strip out of the build. diff --git a/helpers/DATA/rustc-1.82/patch_changes/001-set_pkg-config_manual_path_for_aramo.patch b/helpers/DATA/rustc-1.82/patch_changes/001-set_pkg-config_manual_path_for_aramo.patch new file mode 100644 index 0000000..2a93689 --- /dev/null +++ b/helpers/DATA/rustc-1.82/patch_changes/001-set_pkg-config_manual_path_for_aramo.patch @@ -0,0 +1,12 @@ +diff --git a/debian/rules b/debian/rules +index 5651361f..2cc90e7b 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -4,6 +4,7 @@ + # The build regressed back when LTO was systematized in Ubuntu. + # This should be periodically revisited. + export DEB_BUILD_MAINT_OPTIONS=optimize=-lto ++export PKG_CONFIG=/usr/bin/pkg-config + + include /usr/share/dpkg/pkg-info.mk + include /usr/share/dpkg/vendor.mk diff --git a/helpers/make-rustc-1.82 b/helpers/make-rustc-1.82 new file mode 100644 index 0000000..a768f04 --- /dev/null +++ b/helpers/make-rustc-1.82 @@ -0,0 +1,32 @@ +#!/bin/bash +# +# Copyright (C) 2025 Luis Guzman +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +VERSION=0 +EXTERNAL='deb-src https://ppa.launchpadcontent.net/liushuyu-011/rust-updates-1.82/ubuntu noble main' +REPOKEY=327405FE663500EF +BACKPORTS=true +BUILD_UNTIL=11.0 + +. ./config + +apply_patch_changes + +changelog "Adding package as a dependency for newer abrowser releases." + +package From af678e2b2b6f629b35b44cdac7b6936ff616f726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Thu, 19 Jun 2025 15:23:08 -0600 Subject: [PATCH 07/10] firefox: prepare package changes for v139 --- ...01-Remove_Android_and_iOS_promotion.patch} | 0 ...move_moreFromMozilla_Focus_and_Klar.patch} | 114 +++++++++--------- ...ites_and_keep_weather_widget_static.patch} | 37 +++--- ..._sqlite-ppc.patch => 004-sqlite-ppc.patch} | 0 ...urls.patch => 005-apply_custom_urls.patch} | 0 ...06-remova_mailto_handlers_correctly.patch} | 0 ...disable_remote_settings_antifeature.patch} | 0 ...atch => 008-aboutRights_removal_fix.patch} | 12 +- ...bunfox_suggest_webext-ublock-origin.patch} | 0 ..._theme_recommendation_and_saas_forge.patch | 23 ++++ ...x_for_ppc64el_missing_fallback_value.patch | 13 ++ ...g_directory_on_home_dir_for_abrowser.patch | 14 +++ helpers/DATA/firefox/process-json-files.py | 2 +- helpers/DATA/firefox/settings.js | 3 +- helpers/make-firefox | 52 +++++--- 15 files changed, 172 insertions(+), 98 deletions(-) rename helpers/DATA/firefox/patch_changes/{001_Remove_Android_and_iOS_promotion.patch => 001-Remove_Android_and_iOS_promotion.patch} (100%) rename helpers/DATA/firefox/patch_changes/{002_Remove_moreFromMozilla_Focus_and_Klar.patch => 002-Remove_moreFromMozilla_Focus_and_Klar.patch} (99%) rename helpers/DATA/firefox/patch_changes/{003_disable_sponsored_topsites_and_keep_weather_widget_static.patch => 003-disable_sponsored_topsites_and_keep_weather_widget_static.patch} (69%) rename helpers/DATA/firefox/patch_changes/{004_sqlite-ppc.patch => 004-sqlite-ppc.patch} (100%) rename helpers/DATA/firefox/patch_changes/{005_apply_custom_urls.patch => 005-apply_custom_urls.patch} (100%) rename helpers/DATA/firefox/patch_changes/{006_remova_mailto_handlers_correctly.patch => 006-remova_mailto_handlers_correctly.patch} (100%) rename helpers/DATA/firefox/patch_changes/{007_disable_remote_settings_antifeature.patch => 007-disable_remote_settings_antifeature.patch} (100%) rename helpers/DATA/firefox/patch_changes/{008_aboutRights_removal_fix.patch => 008-aboutRights_removal_fix.patch} (88%) rename helpers/DATA/firefox/patch_changes/{009_remove_ubunfox_suggest_webext-ublock-origin.patch => 009-remove_ubunfox_suggest_webext-ublock-origin.patch} (100%) create mode 100644 helpers/DATA/firefox/patch_changes/010-remove_theme_recommendation_and_saas_forge.patch create mode 100644 helpers/DATA/firefox/patch_changes/011-temp_fix_for_ppc64el_missing_fallback_value.patch create mode 100644 helpers/DATA/firefox/patch_changes/012-fix_wrong_directory_on_home_dir_for_abrowser.patch diff --git a/helpers/DATA/firefox/patch_changes/001_Remove_Android_and_iOS_promotion.patch b/helpers/DATA/firefox/patch_changes/001-Remove_Android_and_iOS_promotion.patch similarity index 100% rename from helpers/DATA/firefox/patch_changes/001_Remove_Android_and_iOS_promotion.patch rename to helpers/DATA/firefox/patch_changes/001-Remove_Android_and_iOS_promotion.patch diff --git a/helpers/DATA/firefox/patch_changes/002_Remove_moreFromMozilla_Focus_and_Klar.patch b/helpers/DATA/firefox/patch_changes/002-Remove_moreFromMozilla_Focus_and_Klar.patch similarity index 99% rename from helpers/DATA/firefox/patch_changes/002_Remove_moreFromMozilla_Focus_and_Klar.patch rename to helpers/DATA/firefox/patch_changes/002-Remove_moreFromMozilla_Focus_and_Klar.patch index 859ed9a..1216ca7 100644 --- a/helpers/DATA/firefox/patch_changes/002_Remove_moreFromMozilla_Focus_and_Klar.patch +++ b/helpers/DATA/firefox/patch_changes/002-Remove_moreFromMozilla_Focus_and_Klar.patch @@ -487,63 +487,6 @@ index bb847abd..e69de29b 100644 - - 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/. --> - -diff --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js -index bf97580d..31017a6f 100644 ---- a/browser/components/preferences/moreFromMozilla.js -+++ b/browser/components/preferences/moreFromMozilla.js -@@ -81,51 +81,7 @@ var gMoreFromMozillaPane = { - - renderProducts() { - const isRegionUS = Region.home.toLowerCase() === "us"; -- let products = [ -- { -- id: "firefox-mobile", -- title_string_id: "more-from-moz-firefox-mobile-title", -- description_string_id: "more-from-moz-firefox-mobile-description", -- region: "global", -- button: { -- id: "fxMobile", -- type: "link", -- label_string_id: "more-from-moz-learn-more-link", -- actionURL: AppConstants.isChinaRepack() -- ? "https://www.firefox.com.cn/browsers/mobile/" -- : "https://www.mozilla.org/firefox/browsers/mobile/", -- }, -- qrcode: { -- title: { -- string_id: "more-from-moz-qr-code-box-firefox-mobile-title", -- }, -- image_src_prefix: -- "chrome://browser/content/preferences/more-from-mozilla-qr-code", -- button: { -- id: "qr-code-send-email", -- label: { -- string_id: "more-from-moz-qr-code-box-firefox-mobile-button", -- }, -- actionURL: AppConstants.isChinaRepack() -- ? "https://www.firefox.com.cn/mobile/get-app/" -- : "https://www.mozilla.org/firefox/mobile/get-app/?v=mfm", -- }, -- }, -- }, -- { -- 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", -- region: isRegionUS ? "us" : "global", -- button: { -- id: "mozillaMonitor", -- label_string_id: "more-from-moz-mozilla-monitor-button", -- actionURL: "https://monitor.mozilla.org/", -- }, -- }, -- ]; -+ let products = []; - - if (BrowserUtils.shouldShowVPNPromo()) { - const vpn = { diff -Nru a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg --- a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg 2022-05-22 09:35:55.412674110 +0000 +++ b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg 1970-01-01 00:00:00.000000000 +0000 @@ -794,3 +737,60 @@ index 3888af10..1d6c606f 100644 "chrome://browser/content/asrouter/assets/fox-with-box-on-cloud.svg", "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 +--- a/browser/components/preferences/moreFromMozilla.js ++++ b/browser/components/preferences/moreFromMozilla.js +@@ -81,51 +81,7 @@ var gMoreFromMozillaPane = { + + renderProducts() { + const isRegionUS = Region.home.toLowerCase() === "us"; +- let products = [ +- { +- id: "firefox-mobile", +- title_string_id: "more-from-moz-firefox-mobile-title", +- description_string_id: "more-from-moz-firefox-mobile-description", +- region: "global", +- button: { +- id: "fxMobile", +- type: "link", +- label_string_id: "more-from-moz-learn-more-link", +- actionURL: BrowserUtils.isChinaRepack() +- ? "https://www.firefox.com.cn/browsers/mobile/" +- : "https://www.mozilla.org/firefox/browsers/mobile/", +- }, +- qrcode: { +- title: { +- string_id: "more-from-moz-qr-code-box-firefox-mobile-title", +- }, +- image_src_prefix: +- "chrome://browser/content/preferences/more-from-mozilla-qr-code", +- button: { +- id: "qr-code-send-email", +- label: { +- string_id: "more-from-moz-qr-code-box-firefox-mobile-button", +- }, +- actionURL: BrowserUtils.isChinaRepack() +- ? "https://www.firefox.com.cn/mobile/get-app/" +- : "https://www.mozilla.org/firefox/mobile/get-app/?v=mfm", +- }, +- }, +- }, +- { +- 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", +- region: isRegionUS ? "us" : "global", +- button: { +- id: "mozillaMonitor", +- label_string_id: "more-from-moz-mozilla-monitor-button", +- actionURL: "https://monitor.mozilla.org/", +- }, +- }, +- ]; ++ let products = []; + + if (BrowserUtils.shouldShowVPNPromo()) { + const vpn = { diff --git a/helpers/DATA/firefox/patch_changes/003_disable_sponsored_topsites_and_keep_weather_widget_static.patch b/helpers/DATA/firefox/patch_changes/003-disable_sponsored_topsites_and_keep_weather_widget_static.patch similarity index 69% rename from helpers/DATA/firefox/patch_changes/003_disable_sponsored_topsites_and_keep_weather_widget_static.patch rename to helpers/DATA/firefox/patch_changes/003-disable_sponsored_topsites_and_keep_weather_widget_static.patch index a19dfa0..6865594 100644 --- a/helpers/DATA/firefox/patch_changes/003_disable_sponsored_topsites_and_keep_weather_widget_static.patch +++ b/helpers/DATA/firefox/patch_changes/003-disable_sponsored_topsites_and_keep_weather_widget_static.patch @@ -1,45 +1,54 @@ diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 391bc93e..df6b3f84 100644 +index 52a520fd..81cc685d 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -1718,19 +1718,19 @@ pref("browser.topsites.component.enabled", false); - +@@ -1718,19 +1718,19 @@ + pref("browser.topsites.component.enabled", false); pref("browser.topsites.useRemoteSetting", true); // Fetch sponsored Top Sites from Mozilla Tiles Service (Contile) -pref("browser.topsites.contile.enabled", true); -pref("browser.topsites.contile.endpoint", "https://contile.services.mozilla.com/v1/tiles"); +pref("browser.topsites.contile.enabled", false); +pref("browser.topsites.contile.endpoint", ""); - + // Whether to enable the Share-of-Voice feature for Sponsored Topsites via Contile. -pref("browser.topsites.contile.sov.enabled", true); +pref("browser.topsites.contile.sov.enabled", false); - + // The base URL for the Quick Suggest anonymizing proxy. To make a request to // the proxy, include a campaign ID in the path. -pref("browser.partnerlink.attributionURL", "https://topsites.services.mozilla.com/cid/"); -pref("browser.partnerlink.campaign.topsites", "amzn_2020_a1"); +pref("browser.partnerlink.attributionURL", ""); +pref("browser.partnerlink.campaign.topsites", ""); - + // Activates preloading of the new tab url. -pref("browser.newtab.preload", true); +pref("browser.newtab.preload", false); - + + pref("browser.preonboarding.onTrainRolloutPopulation", 0); + // Mozilla Ad Routing Service (MARS) unified ads service - pref("browser.newtabpage.activity-stream.unifiedAds.tiles.enabled", false); -@@ -1738,12 +1738,12 @@ pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false); - pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "https://ads.mozilla.org/"); - +-pref("browser.newtabpage.activity-stream.unifiedAds.tiles.enabled", true); +-pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", true); +-pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "https://ads.mozilla.org/"); ++pref("browser.newtabpage.activity-stream.unifiedAds.tiles.enabled", false); ++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); + pref("browser.newtabpage.activity-stream.unifiedAds.adsFeed.tiles.enabled", false); + // Weather widget for newtab -pref("browser.newtabpage.activity-stream.showWeather", true); +pref("browser.newtabpage.activity-stream.showWeather", false); pref("browser.newtabpage.activity-stream.weather.query", ""); pref("browser.newtabpage.activity-stream.weather.display", "simple"); - + ++pref("browser.newtabpage.activity-stream.images.smart", true); + // enable location search for newtab weather widget -pref("browser.newtabpage.activity-stream.weather.locationSearchEnabled", true); +pref("browser.newtabpage.activity-stream.weather.locationSearchEnabled", false); - + // List of regions that get weather by default. - pref("browser.newtabpage.activity-stream.discoverystream.region-weather-config", "US,CA"); + pref("browser.newtabpage.activity-stream.discoverystream.region-weather-config", "US,CA") diff --git a/helpers/DATA/firefox/patch_changes/004_sqlite-ppc.patch b/helpers/DATA/firefox/patch_changes/004-sqlite-ppc.patch similarity index 100% rename from helpers/DATA/firefox/patch_changes/004_sqlite-ppc.patch rename to helpers/DATA/firefox/patch_changes/004-sqlite-ppc.patch diff --git a/helpers/DATA/firefox/patch_changes/005_apply_custom_urls.patch b/helpers/DATA/firefox/patch_changes/005-apply_custom_urls.patch similarity index 100% rename from helpers/DATA/firefox/patch_changes/005_apply_custom_urls.patch rename to helpers/DATA/firefox/patch_changes/005-apply_custom_urls.patch diff --git a/helpers/DATA/firefox/patch_changes/006_remova_mailto_handlers_correctly.patch b/helpers/DATA/firefox/patch_changes/006-remova_mailto_handlers_correctly.patch similarity index 100% rename from helpers/DATA/firefox/patch_changes/006_remova_mailto_handlers_correctly.patch rename to helpers/DATA/firefox/patch_changes/006-remova_mailto_handlers_correctly.patch diff --git a/helpers/DATA/firefox/patch_changes/007_disable_remote_settings_antifeature.patch b/helpers/DATA/firefox/patch_changes/007-disable_remote_settings_antifeature.patch similarity index 100% rename from helpers/DATA/firefox/patch_changes/007_disable_remote_settings_antifeature.patch rename to helpers/DATA/firefox/patch_changes/007-disable_remote_settings_antifeature.patch diff --git a/helpers/DATA/firefox/patch_changes/008_aboutRights_removal_fix.patch b/helpers/DATA/firefox/patch_changes/008-aboutRights_removal_fix.patch similarity index 88% rename from helpers/DATA/firefox/patch_changes/008_aboutRights_removal_fix.patch rename to helpers/DATA/firefox/patch_changes/008-aboutRights_removal_fix.patch index 57ffc6f..e035ce2 100644 --- a/helpers/DATA/firefox/patch_changes/008_aboutRights_removal_fix.patch +++ b/helpers/DATA/firefox/patch_changes/008-aboutRights_removal_fix.patch @@ -1,14 +1,14 @@ diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml -index 53e4616a..ba6a3dfb 100644 +index c6498081..a8db34ad 100644 --- a/browser/base/content/aboutDialog.xhtml +++ b/browser/base/content/aboutDialog.xhtml -@@ -137,7 +137,7 @@ +@@ -138,7 +138,7 @@ diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp @@ -20,7 +20,7 @@ index d1fe0148..ce5d1f42 100644 "chrome://devtools/content/performance-new/aboutprofiling/index.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, - {"rights", "https://www.mozilla.org/about/legal/terms/firefox/", -+ {"rights", "https://trisquel.info/es/legal", ++ {"rights", "https://trisquel.info/legal", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::URI_MUST_LOAD_IN_CHILD}, {"robots", "chrome://browser/content/aboutRobots.xhtml", diff --git a/helpers/DATA/firefox/patch_changes/009_remove_ubunfox_suggest_webext-ublock-origin.patch b/helpers/DATA/firefox/patch_changes/009-remove_ubunfox_suggest_webext-ublock-origin.patch similarity index 100% rename from helpers/DATA/firefox/patch_changes/009_remove_ubunfox_suggest_webext-ublock-origin.patch rename to helpers/DATA/firefox/patch_changes/009-remove_ubunfox_suggest_webext-ublock-origin.patch diff --git a/helpers/DATA/firefox/patch_changes/010-remove_theme_recommendation_and_saas_forge.patch b/helpers/DATA/firefox/patch_changes/010-remove_theme_recommendation_and_saas_forge.patch new file mode 100644 index 0000000..dd0eb98 --- /dev/null +++ b/helpers/DATA/firefox/patch_changes/010-remove_theme_recommendation_and_saas_forge.patch @@ -0,0 +1,23 @@ +diff --git a/toolkit/mozapps/extensions/content/aboutaddons.html b/toolkit/mozapps/extensions/content/aboutaddons.html +index 77702576..35cf6593 100644 +--- a/toolkit/mozapps/extensions/content/aboutaddons.html ++++ b/toolkit/mozapps/extensions/content/aboutaddons.html +@@ -799,18 +799,6 @@ +
+ + +- + +