From c7db15fe9d160e8de906241cfb02762aa971c00e Mon Sep 17 00:00:00 2001 From: "mr. m" Date: Wed, 11 Feb 2026 13:47:34 +0100 Subject: [PATCH] feat: New ignore rules to moz.configure for patch calculations, b=no-bug, c=scripts --- scripts/recalculate-patches.sh | 2 +- src/toolkit/moz-configure.patch | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/scripts/recalculate-patches.sh b/scripts/recalculate-patches.sh index 547e2521a..b03cf83ce 100644 --- a/scripts/recalculate-patches.sh +++ b/scripts/recalculate-patches.sh @@ -11,7 +11,7 @@ npm run import IGNORE_FILES=( "shared.nsh" "ignorePrefs.json" - "toolkit/moz.configure" + "moz.configure" ) # Recursively find all .patch files in the current directory and its subdirectories diff --git a/src/toolkit/moz-configure.patch b/src/toolkit/moz-configure.patch index c203198ce..cacaabb60 100644 --- a/src/toolkit/moz-configure.patch +++ b/src/toolkit/moz-configure.patch @@ -1,8 +1,8 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure -index 226d0c5a93a9a2404e1974001da4e34b7b670067..4bc5f1dddd9e4a18900bb2e8e209cc4d7cf1e0fe 100644 +index 226d0c5a93a9a2404e1974001da4e34b7b670067..b73277448f7d2706d316df2505e17d232f392d47 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure -@@ -22,19 +22,21 @@ def check_moz_app_id(moz_app_id, build_project): +@@ -22,6 +22,7 @@ def check_moz_app_id(moz_app_id, build_project): project_flag( env="MOZ_APP_VENDOR", @@ -10,14 +10,7 @@ index 226d0c5a93a9a2404e1974001da4e34b7b670067..4bc5f1dddd9e4a18900bb2e8e209cc4d nargs=1, help='Used for application.ini\'s "Vendor" field, which also impacts profile location and user-visible fields', ) - - project_flag( - env="MOZ_APP_UA_NAME", -- default="", -+ default="Firefox", - nargs=1, - help="Application name in the User Agent string", - ) +@@ -35,6 +36,7 @@ project_flag( project_flag( "MOZ_APP_PROFILE",