morgan pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser

Commits:

3 changed files:

Changes:

  • mozconfig-linux-aarch64-dev
    1
    +. $topsrcdir/browser/config/mozconfigs/tor-browser
    
    2
    +
    
    3
    +# This mozconfig file is not used in official builds.
    
    4
    +# It is only intended to be used when doing incremental Linux builds
    
    5
    +# during development.
    
    6
    +
    
    7
    +# Moz switched to lld for all Linux targets in Bug 1839739.
    
    8
    +ac_add_options --enable-linker=lld
    
    9
    +
    
    10
    +export MOZILLA_OFFICIAL=
    
    11
    +export MOZ_APP_REMOTINGNAME="Tor Browser Dev"
    
    12
    +ac_add_options --with-branding=browser/branding/tb-nightly
    
    13
    +
    
    14
    +ac_add_options --enable-default-toolkit=cairo-gtk3
    
    15
    +
    
    16
    +ac_add_options --disable-strip
    
    17
    +ac_add_options --disable-install-strip
    
    18
    +
    
    19
    +ac_add_options --with-base-browser-version=dev-build
    
    20
    +ac_add_options --disable-base-browser-update

  • tools/torbrowser/Makefile
    ... ... @@ -12,11 +12,17 @@ ifeq ($(ARCHITECTURE), "arm64")
    12 12
       ARCHITECTURE = "aarch64"
    
    13 13
     endif
    
    14 14
     
    
    15
    +ifeq ($(ARCHITECTURE), "aarch64")
    
    16
    +  LINUX_VENDOR = "unknown"
    
    17
    +else
    
    18
    +  LINUX_VENDOR = "pc"
    
    19
    +endif
    
    20
    +
    
    15 21
     # Define build output path based on the platform.
    
    16 22
     ifeq ("$(shell uname)", "Darwin")
    
    17 23
       BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-apple-darwin$(shell uname -r)"
    
    18 24
     else
    
    19
    -  BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-pc-linux-gnu"
    
    25
    +  BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-$(LINUX_VENDOR)-linux-gnu"
    
    20 26
     endif
    
    21 27
     
    
    22 28
     # Define the run command based on the platform.
    

  • tools/torbrowser/fetch.sh
    ... ... @@ -10,7 +10,7 @@ TOR_BROWSER_VERSION=$(grep -Eo "\"version\":\"[0-9.a]+\"" downloads.json | grep
    10 10
     if [ "$(uname)" = "Darwin" ]; then
    
    11 11
         TOR_BROWSER_PACKAGE="tor-browser-macos-${TOR_BROWSER_VERSION}.dmg"
    
    12 12
       else
    
    13
    -    TOR_BROWSER_PACKAGE="tor-browser-linux-x86_64-${TOR_BROWSER_VERSION}.tar.xz"
    
    13
    +    TOR_BROWSER_PACKAGE="tor-browser-linux-$(uname -m)-${TOR_BROWSER_VERSION}.tar.xz"
    
    14 14
     fi
    
    15 15
     TOR_BROWSER_PACKAGE_URL="https://dist.torproject.org/torbrowser/${TOR_BROWSER_VERSION}/${TOR_BROWSER_PACKAGE}"
    
    16 16