From cb188dc0f925a1613535e3322aaaa2ec1b95c8a8 Mon Sep 17 00:00:00 2001 From: celenity Date: Tue, 10 Mar 2026 19:55:16 +0000 Subject: [PATCH] IronFox v148.0.2 ironfox-oss/IronFox!130 # IronFox 148.0.2 ____ ## Changes - Updated to Firefox [`148.0.2`](https://firefox.com/firefox/android/148.0.2/releasenotes/). - Updated to Rust [`1.94.0`](https://releases.rs/docs/1.94.0/). - Minor tweaks, fixes, and enhancements. MR-author: celenity Approved-by: Akash Yadav Merged-by: celenity --- patches/fenix-ironfox-onboarding.patch | 90 ++++++++++---------- patches/fenix-ironfox-settings.patch | 9 +- patches/gecko-enable-abouttranslations.patch | 15 +++- patches/gecko-fix-canvas-randomization.patch | 13 +++ scripts/build-if.sh | 4 +- scripts/env_ci.sh | 3 + scripts/env_common.sh | 1 - scripts/get_sources-if.sh | 3 +- scripts/patch_create.sh | 8 +- scripts/prebuild-if.sh | 8 +- scripts/versions.sh | 40 ++++----- 11 files changed, 103 insertions(+), 91 deletions(-) diff --git a/patches/fenix-ironfox-onboarding.patch b/patches/fenix-ironfox-onboarding.patch index 5fa9179a..66d93545 100644 --- a/patches/fenix-ironfox-onboarding.patch +++ b/patches/fenix-ironfox-onboarding.patch @@ -1,6 +1,6 @@ -From 99c7f87be39d1ba6d17fed0c48e7c7bba41318f1 Mon Sep 17 00:00:00 2001 +From 571f3b02c770b5eb85535d39cd68c59eaba34b97 Mon Sep 17 00:00:00 2001 From: celenity -Date: Tue, 17 Feb 2026 04:54:19 +0000 +Date: Tue, 10 Mar 2026 01:00:42 +0000 Subject: [PATCH] feat: add support for IronFox onboarding cards Signed-off-by: celenity @@ -9,21 +9,21 @@ Signed-off-by: celenity .../org/mozilla/fenix/FenixApplication.kt | 1 + .../fenix/onboarding/OnboardingFragment.kt | 3 + .../redesign/view/OnboardingScreenRedesign.kt | 14 ++++ - .../fenix/onboarding/view/OnboardingMapper.kt | 40 ++++++++++ + .../fenix/onboarding/view/OnboardingMapper.kt | 42 ++++++++++ .../onboarding/view/OnboardingPageState.kt | 17 ++++ .../onboarding/view/OnboardingPageUiData.kt | 7 ++ .../fenix/onboarding/view/OnboardingScreen.kt | 20 +++++ .../settings/doh/root/DohSettingsScreen.kt | 2 +- - 9 files changed, 183 insertions(+), 1 deletion(-) + 9 files changed, 185 insertions(+), 1 deletion(-) diff --git a/mobile/android/fenix/app/onboarding.fml.yaml b/mobile/android/fenix/app/onboarding.fml.yaml -index 77ce1334c2bf..277881292e03 100644 +index 07dc0bd5ca..5d14935267 100644 --- a/mobile/android/fenix/app/onboarding.fml.yaml +++ b/mobile/android/fenix/app/onboarding.fml.yaml -@@ -124,6 +124,43 @@ features: - body-line-one-text: onboarding_marketing_learn_more - body-line-one-link-text: onboarding_marketing_learn_more - body-line-two-text: onboarding_marketing_opt_out_checkbox +@@ -99,6 +99,43 @@ features: + marketing-data: + body-line-one-text: nova_onboarding_marketing_body + body-line-one-link-text: nova_onboarding_marketing_body_link_text + + if-preference-doh: + card-type: if-preference-doh @@ -64,7 +64,7 @@ index 77ce1334c2bf..277881292e03 100644 defaults: - channel: developer value: -@@ -468,6 +505,11 @@ objects: +@@ -372,6 +409,11 @@ objects: description: > An optional marketing data for the onboarding card. default: null @@ -76,7 +76,7 @@ index 77ce1334c2bf..277881292e03 100644 CustomizationToolbarData: description: An object to describe the placement of the toolbar. -@@ -579,6 +621,26 @@ objects: +@@ -483,6 +525,26 @@ objects: description: The text for line two of the body. default: "" @@ -103,7 +103,7 @@ index 77ce1334c2bf..277881292e03 100644 enums: OnboardingCardType: -@@ -600,6 +662,10 @@ enums: +@@ -504,6 +566,10 @@ enums: description: Page to display the terms of services. marketing-data: description: Allows user to opt out of marketing data collection. @@ -114,7 +114,7 @@ index 77ce1334c2bf..277881292e03 100644 ToolbarType: description: An enum to describe a toolbar placement option. -@@ -618,3 +684,17 @@ enums: +@@ -522,3 +588,17 @@ enums: description: Sets the theme to light mode. theme-dark: description: Sets the theme to dark mode. @@ -133,7 +133,7 @@ index 77ce1334c2bf..277881292e03 100644 + install-ublock: + description: Whether to install uBlock Origin. diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt -index 725fe78ce0cc..d323ea6349e0 100644 +index 725fe78ce0..d323ea6349 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt @@ -316,6 +316,7 @@ open class FenixApplication : LocaleAwareApplication(), Provider { @@ -145,18 +145,18 @@ index 725fe78ce0cc..d323ea6349e0 100644 logger = logger, analytics = components.analytics, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt -index 947a088c2dc4..3582181ce34c 100644 +index 1a9d800cbf..2d8f6b427c 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt -@@ -65,6 +65,7 @@ import org.mozilla.fenix.settings.SupportUtils - import org.mozilla.fenix.theme.FirefoxTheme - import org.mozilla.fenix.utils.canShowAddSearchWidgetPrompt - import org.mozilla.fenix.utils.maybeShowAddSearchWidgetPrompt -+import org.ironfoxoss.ironfox.utils.GeckoSettingsBridge +@@ -4,6 +4,7 @@ - /** - * Fragment displaying the onboarding flow. -@@ -469,6 +470,8 @@ class OnboardingFragment : Fragment() { + package org.mozilla.fenix.onboarding + ++import org.ironfoxoss.ironfox.utils.GeckoSettingsBridge + import android.annotation.SuppressLint + import android.appwidget.AppWidgetManager + import android.content.Context +@@ -461,6 +462,8 @@ class OnboardingFragment : Fragment() { requireComponents.fenixOnboarding.finish() val settings = requireContext().settings() @@ -166,10 +166,10 @@ index 947a088c2dc4..3582181ce34c 100644 initializeGlean( requireContext().applicationContext, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt -index 9849fb85d5b2..abfede88560e 100644 +index 10bc7aacee..44bdd95697 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt -@@ -239,6 +239,12 @@ fun OnboardingScreenRedesign( +@@ -238,6 +238,12 @@ fun OnboardingScreenRedesign( onMarketingDataContinueClick(allowMarketingDataCollection) scrollToNextPageOrDismiss() }, @@ -182,7 +182,7 @@ index 9849fb85d5b2..abfede88560e 100644 onboardingStore = onboardingStore, ) } -@@ -285,6 +291,8 @@ private fun OnboardingContent( +@@ -284,6 +290,8 @@ private fun OnboardingContent( onMarketingOptInToggle: (optIn: Boolean) -> Unit, onMarketingDataLearnMoreClick: () -> Unit, onMarketingDataContinueClick: (allowMarketingDataCollection: Boolean) -> Unit, @@ -191,7 +191,7 @@ index 9849fb85d5b2..abfede88560e 100644 ) { BoxWithConstraints(modifier = Modifier.fillMaxSize()) { val layout = getOnboardingLayout(this) -@@ -333,6 +341,8 @@ private fun OnboardingContent( +@@ -331,6 +339,8 @@ private fun OnboardingContent( onAddFirefoxWidgetSkipClick = onSkipFirefoxWidgetClick, onCustomizeToolbarButtonClick = onCustomizeToolbarButtonClick, onTermsOfServiceButtonClick = onAgreeAndConfirmTermsOfService, @@ -200,7 +200,7 @@ index 9849fb85d5b2..abfede88560e 100644 shouldShowElevation = !layout.isSmall, ) -@@ -448,6 +458,8 @@ private fun OnboardingPageForType( +@@ -446,6 +456,8 @@ private fun OnboardingPageForType( // no-ops OnboardingPageUiData.Type.THEME_SELECTION, @@ -209,7 +209,7 @@ index 9849fb85d5b2..abfede88560e 100644 -> { logger.error("Unsupported page type: $type used for onboarding redesign.") } -@@ -618,6 +630,8 @@ private fun OnboardingScreenPreview() { +@@ -616,6 +628,8 @@ private fun OnboardingScreenPreview() { onMarketingDataContinueClick = {}, onNotificationPermissionButtonClick = {}, onNotificationPermissionSkipClick = {}, @@ -219,19 +219,19 @@ index 9849fb85d5b2..abfede88560e 100644 } } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingMapper.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingMapper.kt -index 421a1d091fdd1..306c920c88a0e 100644 +index 421a1d091f..b00d0d8881 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingMapper.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingMapper.kt -@@ -12,6 +12,9 @@ import org.mozilla.fenix.nimbus.OnboardingCardType - import org.mozilla.fenix.nimbus.TermsOfServiceData - import org.mozilla.fenix.nimbus.ThemeType - import org.mozilla.fenix.nimbus.ToolbarType +@@ -4,6 +4,9 @@ + + package org.mozilla.fenix.onboarding.view + +import java.lang.UnsupportedOperationException +import org.mozilla.fenix.nimbus.IfOnboardingPreferenceType +import org.mozilla.fenix.nimbus.IfPreferencesData - - /** - * Returns a list of all the required Nimbus 'cards' that have been converted to [OnboardingPageUiData]. + import org.mozilla.fenix.nimbus.CustomizationThemeData + import org.mozilla.fenix.nimbus.CustomizationToolbarData + import org.mozilla.fenix.nimbus.MarketingData @@ -114,6 +117,7 @@ private fun OnboardingCardData.toPageUiData(privacyCaption: Caption?) = Onboardi ?.toOnboardingThemeOptions(), termsOfService = extraData?.termOfServiceData?.toOnboardingTermsOfService(), @@ -313,17 +313,17 @@ index 421a1d091fdd1..306c920c88a0e 100644 shouldShowElevation = shouldShowElevation, ) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPageState.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPageState.kt -index df9918a6241f..9813fd9b6088 100644 +index df9918a624..83d86b7edb 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPageState.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPageState.kt -@@ -6,6 +6,7 @@ package org.mozilla.fenix.onboarding.view +@@ -4,6 +4,7 @@ + package org.mozilla.fenix.onboarding.view + ++import org.mozilla.fenix.nimbus.IfPreferencesData import androidx.annotation.DrawableRes import org.mozilla.fenix.compose.LinkTextState -+import org.mozilla.fenix.nimbus.IfPreferencesData - /** - * Model containing data for [OnboardingPage]. @@ -34,6 +35,7 @@ data class OnboardingPageState( val termsOfService: OnboardingTermsOfService? = null, val toolbarOptions: List? = null, @@ -355,7 +355,7 @@ index df9918a6241f..9813fd9b6088 100644 * Model containing data for the terms of service page during onboarding. */ diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPageUiData.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPageUiData.kt -index 6625e28ee5c9..f8aa6816d77a 100644 +index 6625e28ee5..f8aa6816d7 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPageUiData.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPageUiData.kt @@ -22,6 +22,7 @@ data class OnboardingPageUiData( @@ -380,7 +380,7 @@ index 6625e28ee5c9..f8aa6816d77a 100644 } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingScreen.kt -index 586b9d487f85..23ef69aa682b 100644 +index 586b9d487f..23ef69aa68 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingScreen.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingScreen.kt @@ -216,6 +216,12 @@ fun OnboardingScreen( @@ -439,7 +439,7 @@ index 586b9d487f85..23ef69aa682b 100644 } } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/doh/root/DohSettingsScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/doh/root/DohSettingsScreen.kt -index a8299a9eafe9..83ec862a6b2b 100644 +index a8299a9eaf..83ec862a6b 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/doh/root/DohSettingsScreen.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/doh/root/DohSettingsScreen.kt @@ -437,7 +437,7 @@ private fun buildProviderMenuItems( diff --git a/patches/fenix-ironfox-settings.patch b/patches/fenix-ironfox-settings.patch index 36afaddd..56adc5fc 100644 --- a/patches/fenix-ironfox-settings.patch +++ b/patches/fenix-ironfox-settings.patch @@ -68,23 +68,22 @@ index 4ecf8c8e6467..2035846c88b3 100644 * For >=Q -> Use new RoleManager API to show in-app browser switching dialog. * For =N -> Navigate user to Android Default Apps Settings. diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt -index 81d95a9666a1..e483f0ceedb4 100644 +index 81d95a9666a1a..d0e261c4cae8c 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt -@@ -4,6 +4,8 @@ +@@ -4,6 +4,7 @@ package org.mozilla.fenix.utils +import org.ironfoxoss.ironfox.utils.IronFoxSettings -+import org.mozilla.fenix.perf.lazyMonitored import android.accessibilityservice.AccessibilityServiceInfo.CAPABILITY_CAN_PERFORM_GESTURES import android.appwidget.AppWidgetManager import android.content.Context -@@ -174,6 +176,8 @@ class Settings( +@@ -174,6 +175,8 @@ class Settings( private const val CLOUDFLARE_URI = "https://mozilla.cloudflare-dns.com/dns-query" } -+ val ironfox by lazyMonitored { IronFoxSettings(appContext) } ++ val ironfox = IronFoxSettings(appContext) + private val logger = Logger("Settings") diff --git a/patches/gecko-enable-abouttranslations.patch b/patches/gecko-enable-abouttranslations.patch index 6c236148..00040bee 100644 --- a/patches/gecko-enable-abouttranslations.patch +++ b/patches/gecko-enable-abouttranslations.patch @@ -12,10 +12,10 @@ index 5c1543ab806f..29eb4a27cf2f 100644 if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] == 'android': about_pages.append('crashcontentjava') diff --git a/toolkit/modules/ActorManagerParent.sys.mjs b/toolkit/modules/ActorManagerParent.sys.mjs -index dc976a7e8b11..0ec25692cff3 100644 +index e672ab192109f..f0e8f3e664700 100644 --- a/toolkit/modules/ActorManagerParent.sys.mjs +++ b/toolkit/modules/ActorManagerParent.sys.mjs -@@ -752,7 +752,7 @@ if (AppConstants.platform != "android") { +@@ -754,7 +754,7 @@ if (AppConstants.platform != "android") { messageManagerGroups: ["browsers"], allFrames: true, }; @@ -24,3 +24,14 @@ index dc976a7e8b11..0ec25692cff3 100644 JSWINDOWACTORS.AboutTranslations = { parent: { esModuleURI: "resource://gre/actors/AboutTranslationsParent.sys.mjs", +@@ -772,8 +772,9 @@ if (AppConstants.platform != "android") { + }, + matches: ["about:translations"], + remoteTypes: ["privilegedabout"], ++ enablePreference: "browser.translations.enable", + }; +- ++} if (AppConstants.platform != "android") { + JSWINDOWACTORS.ColorPicker = { + parent: { + esModuleURI: "moz-src:///toolkit/actors/ColorPickerParent.sys.mjs", diff --git a/patches/gecko-fix-canvas-randomization.patch b/patches/gecko-fix-canvas-randomization.patch index a73d93a6..b3a8b573 100644 --- a/patches/gecko-fix-canvas-randomization.patch +++ b/patches/gecko-fix-canvas-randomization.patch @@ -74,6 +74,19 @@ index 12492d606cc2..d16ecc6be00b 100644 const auto pii = webgl::PackingInfoInfo::For(desc.pi); // DoReadPixels() requres pii to be Some(). MOZ_ASSERT(pii.isSome()); +diff --git a/dom/canvas/OffscreenCanvasDisplayHelper.cpp b/dom/canvas/OffscreenCanvasDisplayHelper.cpp +index 73bc8ae654..8c2d693317 100644 +--- a/dom/canvas/OffscreenCanvasDisplayHelper.cpp ++++ b/dom/canvas/OffscreenCanvasDisplayHelper.cpp +@@ -610,7 +610,7 @@ UniquePtr OffscreenCanvasDisplayHelper::GetImageBuffer( + principal, imageBuffer.get(), dataSurface->GetSize().width, + dataSurface->GetSize().height, + dataSurface->GetSize().width * dataSurface->GetSize().height * 4); +- if (aExtractionBehavior == CanvasUtils::ImageExtraction::Randomize) { ++ if (aExtractionBehavior == CanvasUtils::ImageExtraction::Randomize || aExtractionBehavior == CanvasUtils::ImageExtraction::EfficientRandomize) { + nsRFPService::RandomizePixels( + cookieJarSettings, principal, imageBuffer.get(), + dataSurface->GetSize().width, dataSurface->GetSize().height, diff --git a/toolkit/components/resistfingerprinting/nsRFPService.cpp b/toolkit/components/resistfingerprinting/nsRFPService.cpp index d900f49a3b1b..c81d308cb823 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.cpp diff --git a/scripts/build-if.sh b/scripts/build-if.sh index 23181e76..3dc302e5 100755 --- a/scripts/build-if.sh +++ b/scripts/build-if.sh @@ -326,8 +326,8 @@ function build_llvm() { pushd "${llvm}" llvmtarget=$(cat "${IRONFOX_BUILD}/targets_to_build") echo_green_text "building llvm for ${llvmtarget}" - cmake -S llvm -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=out -DCMAKE_C_COMPILER=clang-20 \ - -DCMAKE_CXX_COMPILER=clang++-20 -DLLVM_ENABLE_PROJECTS="clang" -DLLVM_TARGETS_TO_BUILD="$llvmtarget" \ + cmake -S llvm -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=out -DCMAKE_C_COMPILER=clang \ + -DCMAKE_CXX_COMPILER=clang++ -DLLVM_ENABLE_PROJECTS="clang" -DLLVM_TARGETS_TO_BUILD="$llvmtarget" \ -DLLVM_USE_LINKER=lld -DLLVM_BINUTILS_INCDIR=/usr/include -DLLVM_ENABLE_PLUGINS=FORCE_ON \ -DLLVM_DEFAULT_TARGET_TRIPLE="x86_64-unknown-linux-gnu" cmake --build build -j"$(nproc)" diff --git a/scripts/env_ci.sh b/scripts/env_ci.sh index 7ac20aed..7922ebff 100644 --- a/scripts/env_ci.sh +++ b/scripts/env_ci.sh @@ -17,5 +17,8 @@ export MOZ_BUILD_DATE="$(date -d "${CI_PIPELINE_CREATED_AT}" "+%Y%m%d%H%M%S")" # Log directory export IRONFOX_LOG_DIR="${IRONFOX_LOG_ARTIFACTS}" +# Log directory +export IRONFOX_LOG_DIR="${IRONFOX_LOG_ARTIFACTS}" + # Safe Browsing export IRONFOX_SB_GAPI_KEY_FILE='/opt/IronFox/ironfox-sb-gapi.data' diff --git a/scripts/env_common.sh b/scripts/env_common.sh index fd4e6f98..aaaaf091 100644 --- a/scripts/env_common.sh +++ b/scripts/env_common.sh @@ -38,7 +38,6 @@ if [ "${IRONFOX_CI}" == 1 ]; then fi # Environment configuration -IRONFOX_ENV_DEFAULTS="${IRONFOX_SCRIPTS}/env_defaults.sh" export IRONFOX_ENV_FDROID="${IRONFOX_SCRIPTS}/env_fdroid.sh" # Build environment configuration diff --git a/scripts/get_sources-if.sh b/scripts/get_sources-if.sh index 5f904441..3814b1ed 100755 --- a/scripts/get_sources-if.sh +++ b/scripts/get_sources-if.sh @@ -143,7 +143,6 @@ elif [ "${mode}" != 'download' ]; then exit 1 fi - # Include version info source "${IRONFOX_VERSIONS}" @@ -782,8 +781,8 @@ function get_rust() { rustup set profile minimal rustup default "${RUST_VERSION}" rustup override set "${RUST_VERSION}" - rustup target add armv7-linux-androideabi rustup target add aarch64-linux-android + rustup target add armv7-linux-androideabi rustup target add thumbv7neon-linux-androideabi rustup target add x86_64-linux-android diff --git a/scripts/patch_create.sh b/scripts/patch_create.sh index 588e50c8..c382b8ed 100755 --- a/scripts/patch_create.sh +++ b/scripts/patch_create.sh @@ -97,13 +97,7 @@ git commit -am "${PATCH_MSG}" --sign git format-patch -1 --stdout >"${IRONFOX_PATCHES}/${PATCH_NAME}.patch" # Finally, switch back to the original branch, and remove our temporary branch -if [ "${PROJECT}" == 'AS' ]; then - git checkout "${APPSERVICES_COMMIT}" -elif [ "${PROJECT}" == 'glean' ]; then - git checkout "${GLEAN_COMMIT}" -else - git checkout "${FIREFOX_COMMIT}" -fi +git checkout main git branch -D "${PATCH_NAME}" echo_green_text "SUCCESS: Created patch: ${IRONFOX_PATCHES}/${PATCH_NAME}.patch :)" diff --git a/scripts/prebuild-if.sh b/scripts/prebuild-if.sh index 874bc81d..d43b4eb4 100755 --- a/scripts/prebuild-if.sh +++ b/scripts/prebuild-if.sh @@ -611,12 +611,6 @@ cp -vf browser/locales/en-US/browser/aboutRobots.ftl ironfox/locales/en-US/brows -e "s/singleVariant('debug')/singleVariant('release')/" \ mobile/android/geckoview/build.gradle -# Hack the timeout for -# geckoview:generateJNIWrappersForGeneratedWithGeckoBinariesDebug -"${IRONFOX_SED}" -i \ - -e 's/max_wait_seconds=600/max_wait_seconds=1800/' \ - mobile/android/gradle.py - # Break the dependency on older Rust "${IRONFOX_SED}" -i -e "s|rust-version = .*|rust-version = \""${RUST_VERSION}\""|g" Cargo.toml "${IRONFOX_SED}" -i -e "s|rust-version = .*|rust-version = \""${RUST_MAJOR_VERSION}\""|g" intl/icu_capi/Cargo.toml @@ -1004,7 +998,7 @@ rm -vf mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher.webp if [[ -n "${FDROID_BUILD+x}" ]]; then # Patch the LLVM source code - # Search clang- in https://android.googlesource.com/IRONFOX_PLATFORM/ndk/+/refs/tags/ndk-r28b/ndk/toolchains.py + # Search clang- in https://android.googlesource.com/platform/ndk/+/refs/tags/ndk-r28b/ndk/toolchains.py LLVM_SVN='530567' python3 "${toolchain_utils}/llvm_tools/patch_manager.py" \ --svn_version $LLVM_SVN \ diff --git a/scripts/versions.sh b/scripts/versions.sh index 9f1a0be0..f9d02ee4 100644 --- a/scripts/versions.sh +++ b/scripts/versions.sh @@ -3,10 +3,10 @@ ## Firefox ### https://github.com/mozilla-firefox/firefox -### (This commit corresponds to https://github.com/mozilla-firefox/firefox/releases/tag/FIREFOX-ANDROID_148_0_1_RELEASE) -FIREFOX_COMMIT='d555441a1bdc6cdc541da1abf6559036d47f1e79' -FIREFOX_SHA512SUM='b1d56aeff8b209c9a499dccb9a57d45d07e89794096c6bd9b740172ececa6ddbca8d29b389c0dd981c0edf2955524144bc282452837468f72d95da941048b14f' -FIREFOX_VERSION='148.0.1' +### (This commit corresponds to https://github.com/mozilla-firefox/firefox/releases/tag/FIREFOX-ANDROID_148_0_2_RELEASE) +FIREFOX_COMMIT='6de52d04ec7b706f103e14bf37137b3a7a94556e' +FIREFOX_SHA512SUM='89391b168d1e697ae59e2a5878050ebba960b90d7152b6ce3e526dd73db13241ee4087848cccd45fb4abb5e5adb02a99bbab973bc27b4242cc8f541856fbd747' +FIREFOX_VERSION='148.0.2' IRONFOX_VERSION="${FIREFOX_VERSION}" @@ -20,8 +20,8 @@ APPSERVICES_SHA512SUM='01cab72477772e4c7b3a49b9a1b11493659794c70e02f15efc51f4657 ### https://github.com/mozilla-l10n/firefox-l10n ### NOTE: This repo is updated several times a day... ### so I think best approach here will be for us to just update it alongside new releases -L10N_COMMIT='30b3418ff8444761bd219db03fa46c267a6813d3' -L10N_SHA512SUM='91f21e267a7827a47e929248065767b849f9bd5e1e38feb3adcd5e4902e9a35ac12042a20f5a82d267e4ee0a66905a3b5b3b154e02b76f8e1d0e8db8ed20ccc6' +L10N_COMMIT='487e1166cd4877adbd0b2e4754441bcd4715be58' +L10N_SHA512SUM='7deacdf49eaa44d26c6fbdead71b10c0b42cba5db6904c8b7e203e016be1b0c6d13bad2d4a3dcceed8071caef8f994dff3f61545f2aab4caab0027a4027fa267' ## Glean ### Version: v66.2.0 @@ -60,8 +60,8 @@ UNIFFI_VERSION='0.29.0' ## UnifiedPush-AC ### https://gitlab.com/ironfox-oss/unifiedpush-ac -UNIFIEDPUSHAC_COMMIT='7ba42eb12d2ac8e7dd21603a79d8a7f4cdfd25f1' -UNIFIEDPUSHAC_SHA512SUM='048fad650c57ea93520fb5ce2ee98b5c9543d589872c26a3529abf2c0ad3836ca6d6d1528fe29bda4187a0875e2a744e268465b74abdea8a3286f987bbe62211' +UNIFIEDPUSHAC_COMMIT='5001f61025535f17bec8409c7706bc97e3d440c8' +UNIFIEDPUSHAC_SHA512SUM='48726a3bd0f489095095d85a72e9327d83b8c35ecebce91c85062d2fb3a5eb03877213260bac2023096359faf2a23ecac800dc75e23fd77b317fe97f2d48ba12' ## WASI SDK ### https://github.com/WebAssembly/wasi-sdk @@ -115,10 +115,10 @@ PIP_SHA512SUM='3fca339b7c2596581fcf9691b8ef43664b4d0b25494b30eebda803586134c160a ## Rust ### https://releases.rs/ -#RUST_MAJOR_VERSION='1.93' -#RUST_VERSION="${RUST_MAJOR_VERSION}.0" -RUST_MAJOR_VERSION='1.93.1' -RUST_VERSION="${RUST_MAJOR_VERSION}" +RUST_MAJOR_VERSION='1.94' +RUST_VERSION="${RUST_MAJOR_VERSION}.0" +# RUST_MAJOR_VERSION='1.93.1' +# RUST_VERSION="${RUST_MAJOR_VERSION}" ## rustup ### https://github.com/rust-lang/rustup/tags @@ -128,14 +128,14 @@ RUSTUP_VERSION='1.28.2' # For prebuilds ## https://gitlab.com/ironfox-oss/prebuilds -PREBUILDS_COMMIT='5f3e3d5af8d990b57bd43bf2afd4bfb407e5e288' -PREBUILDS_SHA512SUM='8d8af2f9c1fceafaf7f02f38933ede621f6c942c63a58c2438821ab6452ae0e8a4f52b0222cb2d6e62107ec99ee08784936d3977a9376e66082025e84ba9186d' -UNIFFI_LINUX_IRONFOX_COMMIT='5f3e3d5af8d990b57bd43bf2afd4bfb407e5e288' -UNIFFI_LINUX_IRONFOX_REVISION='5' -UNIFFI_LINUX_IRONFOX_SHA512SUM='2821385fbe37af84b7985ce68f683472c7f6038a5cd7d1fc578ac7f9d243d0d352e9a0de12a80827422510784ba470cc8128c197f10454197f23d38db626e407' -UNIFFI_OSX_IRONFOX_COMMIT='74d5b4bc62c3aa4ceab64c41e5185026574a86b6' -UNIFFI_OSX_IRONFOX_REVISION='5' -UNIFFI_OSX_IRONFOX_SHA512SUM='1247ea28c18d37212a9eea3ace3ed4dbe5c192bc07e809ac3422ed17562c851b96a0ea9e5691b72ec84c62f6901fb7767e8d5134be9af6275f4ba15e80fe6314' +PREBUILDS_COMMIT='ca7c4fc9ef478833f337bc2992a9a70d54ab4816' +PREBUILDS_SHA512SUM='5a771b36d064312e68f7cc1addc071cc93d8f3de06c116aa523fde18a289ca04656ab9996637cece5b7f1ca4919a47a7cd264386c3c100194c59094df12a3d42' +UNIFFI_LINUX_IRONFOX_COMMIT='ca7c4fc9ef478833f337bc2992a9a70d54ab4816' +UNIFFI_LINUX_IRONFOX_REVISION='6' +UNIFFI_LINUX_IRONFOX_SHA512SUM='688d26d5611007bd79fcbed7ed5ce2696feb1a9d45422b4bf954309c5b74523e076317f66457aba589bcfb2c061459018a191babaa1e39c5d23d8e4cd7c3d523' +UNIFFI_OSX_IRONFOX_COMMIT='26d7ee9767014143dd401230d303c98a48920357' +UNIFFI_OSX_IRONFOX_REVISION='6' +UNIFFI_OSX_IRONFOX_SHA512SUM='9c5fb325c1e4e63344152839bcf1998f80c20b4d5b7bc1d1f82bf93b757a52cedba01ce9bd3548a39d95bcabcb8db4d5c1e3c35baace75a1c6c8f5157c1ea7af' WASI_LINUX_IRONFOX_COMMIT='b76a3b2a8f3124e9297036e3b27802a47c0263a4' WASI_LINUX_IRONFOX_REVISION='4' WASI_LINUX_IRONFOX_SHA512SUM='98d81e0f47229184fe767fb47906685eec6dd34ad425030e08d1eea42ddec1ebef678530e70dfc954aa2d0904ac44d38a869334c098b0baf9fff1b87233ff31e'