[tor-browser] branch tor-browser-102.0.1-12.0-1 updated (9975cd0582b42 -> ca3d332904782)
This is an automated email from the git hooks/post-receive script.
pierov pushed a change to branch tor-browser-102.0.1-12.0-1 in repository tor-browser.
from 9975cd0582b42 fixup! Bug 10760: Integrate TorButton to TorBrowser core new c6d7561cb33c7 fixup! Bug 41004: Bundled fonts are not picked up on macOS new ca3d332904782 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: gfx/thebes/gfxMacPlatformFontList.mm | 17 +++++++++++++++++ toolkit/xre/MacRunFromDmgUtils.mm | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-)
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-102.0.1-12.0-1 in repository tor-browser.
commit c6d7561cb33c7a0c3cbf9475b2d310eebacdb6ca Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Wed Aug 17 13:26:15 2022 +0200
fixup! Bug 41004: Bundled fonts are not picked up on macOS --- gfx/thebes/gfxMacPlatformFontList.mm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/gfx/thebes/gfxMacPlatformFontList.mm b/gfx/thebes/gfxMacPlatformFontList.mm index 114b2653bcb35..e7d1da96de672 100644 --- a/gfx/thebes/gfxMacPlatformFontList.mm +++ b/gfx/thebes/gfxMacPlatformFontList.mm @@ -2160,3 +2160,20 @@ void gfxMacPlatformFontList::ReadFaceNamesForFamily(fontlist::Family* aFamily, } } } + +#ifdef MOZ_BUNDLED_FONTS +void gfxMacPlatformFontList::ActivateBundledFonts() { + nsCOMPtr<nsIFile> localDir; + if (NS_FAILED(NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(localDir)))) { + return; + } + if (NS_FAILED(localDir->Append(u"fonts"_ns))) { + return; + } + nsAutoCString path; + if (NS_FAILED(localDir->GetNativePath(path))) { + return; + } + ActivateFontsFromDir(path, &mBundledFamilies); +} +#endif
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-102.0.1-12.0-1 in repository tor-browser.
commit ca3d3329047825b3fee04a8d0e25e3f5bcf9d1a5 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Wed Aug 17 13:28:01 2022 +0200
fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. --- toolkit/xre/MacRunFromDmgUtils.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/toolkit/xre/MacRunFromDmgUtils.mm b/toolkit/xre/MacRunFromDmgUtils.mm index cf84c6f5e4743..4317837a07ba0 100644 --- a/toolkit/xre/MacRunFromDmgUtils.mm +++ b/toolkit/xre/MacRunFromDmgUtils.mm @@ -288,7 +288,7 @@ static void StripQuarantineBit(NSString* aBundlePath) { LaunchTask(@"/usr/bin/xattr", arguments); }
-#ifdef MOZ_UPDATER +#if defined(MOZ_UPDATER) && !defined(TOR_BROWSER_UPDATE) bool LaunchElevatedDmgInstall(NSString* aBundlePath, NSArray* aArguments) { NSTask* task; if (@available(macOS 10.13, *)) { @@ -332,7 +332,7 @@ static bool InstallFromPath(NSString* aBundlePath, NSString* aDestPath) {
bool triedElevatedInstall = false;
-#ifdef MOZ_UPDATER +#if defined(MOZ_UPDATER) && !defined(TOR_BROWSER_UPDATE) // 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 installation if necessary. Rather than creating a new,
tor-commits@lists.torproject.org
-
gitolite role