firefox: adjust helper for 124 release, remove the gitignore_from_json function.

This commit is contained in:
Luis Guzmán 2024-03-13 22:36:21 +00:00
parent 7ce55619f5
commit 456a3cb02e
2 changed files with 8 additions and 19 deletions

View file

@ -57,9 +57,9 @@ diff -Nru a/browser/base/content/test/static/browser_all_files_referenced.js b/b
{ file: "resource://gre/greprefs.js" },
// layout/mathml/nsMathMLChar.cpp
diff -Nru a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm 2022-10-16 05:35:50.783203285 -0500
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm 2022-10-16 06:20:07.235345215 -0500
diff -Nru a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
--- a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs 2022-10-16 05:35:50.783203285 -0500
+++ b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs 2022-10-16 06:20:07.235345215 -0500
@@ -513,315 +515,6 @@ const BASE_MESSAGES = () => [
],
},
@ -376,10 +376,10 @@ diff -Nru a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browse
{
id: "PB_NEWTAB_INFO_SECTION",
template: "pb_newtab",
diff --git a/browser/components/newtab/lib/PanelTestProvider.sys.mjs b/browser/components/newtab/lib/PanelTestProvider.sys.mjs
diff --git a/browser/components/asrouter/modules/PanelTestProvider.sys.mjs b/browser/components/newtab/lib/PanelTestProvider.sys.mjs
index b5ff592..22cdf39 100644
--- a/browser/components/newtab/lib/PanelTestProvider.sys.mjs 2022-10-16 05:35:50.835203327 -0500
+++ b/browser/components/newtab/lib/PanelTestProvider.sys.mjs 2022-10-16 06:24:48.095827505 -0500
--- a/browser/components/asrouter/modules/PanelTestProvider.sys.mjs 2022-10-16 05:35:50.835203327 -0500
+++ b/browser/components/asrouter/modules/PanelTestProvider.sys.mjs 2022-10-16 06:24:48.095827505 -0500
@@ -367,85 +374,6 @@ const MESSAGES = () => [
frequency: { lifetime: 3 },
trigger: { id: "defaultBrowserCheck" },

View file

@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=108
VERSION=109
EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
REPOKEY=9BDB3D89CE49EC21
@ -33,7 +33,7 @@ sed '/async download.*/areturn;' -i services/settings/RemoteSettingsClient.sys.m
# Disable activity-stream antifeatures.
# These are not condensed into a single sed script to make it fail on individual commands that didn't change the source
ActivityStream=browser/components/newtab/lib/ActivityStream.jsm
ActivityStream=browser/components/newtab/lib/ActivityStream.sys.mjs
sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i browser/components/newtab/lib/DefaultSites.sys.mjs
sed '/"showSponsored"/,/value/s/value: true/value: false/' -i $ActivityStream
sed '/"telemetry"/,/value/s/value: true/value: false/' -i $ActivityStream
@ -70,17 +70,6 @@ sed -i '/browser.theme.colorway-closet/s|true|false|' browser/app/profile/firefo
##Remove mailto handlers. 110
sed -i '/kHandlerList = {/,/^ };/{/^ /d}' uriloader/exthandler/HandlerList.sys.mjs
# Remove .gitignore call as those files get cleaned out on dpkg tarball by default.
remove_gitignore_from_json(){
jq . ${1} |sed '/.gitignore/d'|awk -v RS= '{$1=$1}1'|tr -d ' '|tee ${1}.new
mv ${1}.new ${1}
}
for json in $(find -name \.cargo-checksum.json|xargs grep -rl gitignore)
do
remove_gitignore_from_json $json
done
# Replace ubufox recommendation
sed 's/xul-ext-ubufox/xul-ext-youtube-html5-video-player/' -i debian/control.in