Pier Angelo Vendrame pushed to branch tor-browser-155.0a1-17.0-1 at The Tor Project / Applications / Tor Browser Commits: d646ae03 by Pier Angelo Vendrame at 2026-11-04T21:59:23+01:00 BB 41108: Remove privileged macOS installation - - - - - 8518d56b by Pier Angelo Vendrame at 2026-11-04T21:59:23+01:00 fixup! Base Browser's .mozconfigs. BB 45240: Fix updater-related build errors on macOS. Introduce CONFIG["BASE_BROWSER"]. - - - - - 4 changed files: - browser/app/moz.build - moz.configure - toolkit/moz.build - toolkit/xre/MacRunFromDmgUtils.mm Changes: ===================================== browser/app/moz.build ===================================== @@ -80,6 +80,12 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": f"!/{FINAL_TARGET}/org.mozilla.updater", "Library/LaunchServices/org.mozilla.updater", )) + moves = [("ChannelPrefs.framework", "Frameworks/ChannelPrefs.framework")] + if not CONFIG["BASE_BROWSER"]: + moves.append(( + "org.mozilla.dmgInstallHelper", + "Library/LaunchServices/org.mozilla.dmgInstallHelper", + )) MacOSBundle( f"!/dist/{CONFIG['MOZ_MACBUNDLE_NAME']}", skeleton="macbuild/Contents", @@ -93,13 +99,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": (f"!/{FINAL_TARGET}/{CONFIG['MOZ_APP_NAME']}", CONFIG["MOZ_APP_NAME"]) ], extra_files=extra_files, - moves=[ - ("ChannelPrefs.framework", "Frameworks/ChannelPrefs.framework"), - ( - "org.mozilla.dmgInstallHelper", - "Library/LaunchServices/org.mozilla.dmgInstallHelper", - ), - ], + moves=moves, pkginfo="APPLTORB", ) ===================================== moz.configure ===================================== @@ -1035,6 +1035,9 @@ def base_browser_version_quoted(value): return f'"{value[0]}"' +set_config( + "BASE_BROWSER", depends(base_browser_version)(lambda v: True if v else False) +) set_define("BASE_BROWSER_VERSION", base_browser_version) set_define("BASE_BROWSER_VERSION_QUOTED", base_browser_version_quoted) ===================================== toolkit/moz.build ===================================== @@ -63,11 +63,12 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": ] elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": DIRS += [ - "mozapps/dmgInstallHelper", "mozapps/macos-frameworks", "system/commonproxy", "system/osxproxy", ] + if not CONFIG["BASE_BROWSER"]: + DIRS += ["mozapps/dmgInstallHelper"] elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": DIRS += [ "system/commonproxy", ===================================== toolkit/xre/MacRunFromDmgUtils.mm ===================================== @@ -279,6 +279,7 @@ static void ShowInstallFailedDialog() { NS_OBJC_END_TRY_IGNORE_BLOCK; } +#ifndef BASE_BROWSER_VERSION // Install the DMGInstallHelper as an elevated helper and use it to install bool LaunchElevatedDmgInstall(NSString* aBundlePath, NSString* aDestPath) { NS_OBJC_BEGIN_TRY_BLOCK_RETURN; @@ -355,6 +356,7 @@ bool LaunchElevatedDmgInstall(NSString* aBundlePath, NSString* aDestPath) { NS_OBJC_END_TRY_BLOCK_RETURN(false); } +#endif // Note: both arguments are expected to contain the app name (to end with // '.app'). @@ -381,6 +383,7 @@ static bool InstallFromPath(NSString* aBundlePath, NSString* aDestPath) { os_log_info(runFromDMGLogger, "Unelevated installation: %s", installSuccessful ? "success" : "failed"); +#ifndef BASE_BROWSER_VERSION // The installation may have been unsuccessful if the user did not have the // rights to write to the Applications directory. Check for this situation and // launch an elevated helper application. @@ -396,6 +399,7 @@ static bool InstallFromPath(NSString* aBundlePath, NSString* aDestPath) { return false; } } +#endif if (!installSuccessful) { os_log_error(runFromDMGLogger, "Unknown install failure."); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/90e50e2... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/90e50e2... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help