firefox: add changes for 147.0.1 build

helpers/DATA/firefox/patch_changes/003-disable_sponsored_topsites_and_keep_weather_widget_static.patch

@@ -1,33 +1,32 @@
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 52a520fd..81cc685d 100644
+index 217ed280..d91cde94 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -1718,19 +1718,19 @@
- pref("browser.topsites.component.enabled", false);
+@@ -1806,16 +1806,16 @@ 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);
-
+ 
+ // 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);
+ 
  // Mozilla Ad Routing Service (MARS) unified ads service
 -pref("browser.newtabpage.activity-stream.unifiedAds.tiles.enabled", true);
 -pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", true);
@@ -36,19 +35,23 @@ index 52a520fd..81cc685d 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);
- pref("browser.newtabpage.activity-stream.unifiedAds.adsFeed.tiles.enabled", false);
-
+ pref("browser.newtabpage.activity-stream.unifiedAds.ohttp.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);
-
+ 
+ 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");
++pref("browser.newtabpage.activity-stream.discoverystream.region-weather-config", "");
+ 
+ // List of locales that weather widget supports.
+ pref("browser.newtabpage.activity-stream.discoverystream.locale-weather-config", "en-US,en-GB,en-CA");

helpers/DATA/firefox/patch_changes/014-remove_support_firefox_mission_on_abrowser.patch

@@ -116,10 +116,10 @@ index 269eca10..4c35b53f 100644
  # Variables:
  #   $num (number) - Number of rows displayed
 diff --git a/browser/themes/shared/preferences/preferences.css b/browser/themes/shared/preferences/preferences.css
-index 3b0f222f..60e0dc1d 100644
+index 701d29be..769791d7 100644
 --- a/browser/themes/shared/preferences/preferences.css
 +++ b/browser/themes/shared/preferences/preferences.css
-@@ -1475,11 +1475,3 @@ richlistitem .text-link:hover {
+@@ -1478,15 +1478,6 @@ setting-group[groupid="home"] {
    margin: 0;
  }
  
@@ -131,3 +131,7 @@ index 3b0f222f..60e0dc1d 100644
 -    font-size: var(--font-size-small);
 -  }
 -}
+-
+ #dohProviderSelect {
+   --select-max-width: 235px;
+ }

helpers/make-firefox

@@ -19,9 +19,9 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=128
+VERSION=129
 EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
-REPOKEY=9BDB3D89CE49EC21
+REPOKEY=AEBDF4819BE21867
 
 . ./config
 
@@ -89,7 +89,6 @@ sed -i '/browser.uitour.enabled/s|true|false|' $BAP_FirefoxJs
 for i in browser.urlbar.allowSearchSuggestionsForSimpleOrigins \
          browser.urlbar.quicksuggest.online.enabled \
          browser.urlbar.suggest.yelpRealtime \
-         browser.search.suggest.ohttp.enabled \
          browser.newtabpage.activity-stream.discoverystream.reportAds.enabled \
          browser.newtabpage.activity-stream.discoverystream.publisherFavicon.enabled \
          browser.ml.chat.page
@@ -311,13 +310,15 @@ s|firefox-help|abrowser-help|g;
 
 echo "Running batch replace operation"
 find . -type f -not -iregex '.*changelog.*' \
-       -not -iregex '.*copyright.*' -not -iregex '.*third_party/.*' \
-       -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
+               -not -iregex '.*copyright.*' \
+               -not -iregex '.*third_party/.*' \
+               -not -iregex '.*/mozglue/static/rust/.*' \
+               -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
 
 echo "Replacing Firefox with Abrowser on ./l10n"
-find l10n -type f  -not -iregex '.*changelog.*' \
-          -not -iregex '.*copyright.*' \
-          -execdir /bin/sed --follow-symlinks -i "s/Firefox/Abrowser/" '{}' ';'
+find l10n -type f -not -iregex '.*changelog.*' \
+                  -not -iregex '.*copyright.*' \
+                  -execdir /bin/sed --follow-symlinks -i "s/Firefox/Abrowser/" '{}' ';'
 
 sed 's/Firefox/Abrowser/' -i debian/control.in \
                              browser/locales/en-US/chrome/overrides/appstrings.properties