morgan pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

1 changed file:

Changes:

  • rbm.conf
    ... ... @@ -150,8 +150,7 @@ var:
    150 150
         [% SET step = c("step") -%]
    
    151 151
         [% c(step, { filename => 'f', output_dir => '/out', norec => {} }) %]
    
    152 152
     
    
    153
    -  Project_Name_Channel: '[% c("var/Project_Name") %] [% c("var/channel") FILTER ucfirst %]'
    
    154
    -  display_name: '[% c("var/Project_Name_Channel") %]'
    
    153
    +  display_name: '[% c("var/Project_Name") %] [% c("var/channel") FILTER ucfirst %]'
    
    155 154
       exe_name: firefox
    
    156 155
       faketime_date: "[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"
    
    157 156
       faketime_setup: |
    
    ... ... @@ -269,7 +268,6 @@ var:
    269 268
         [% END -%]
    
    270 269
     
    
    271 270
     
    
    272
    -  DOCSDIR_project: '[% project %]'
    
    273 271
       set_MOZ_BUILD_DATE: 'export MOZ_BUILD_DATE=[% c("var/MOZ_BUILD_DATE") %]'
    
    274 272
       MOZ_BUILD_DATE: '[% USE date; date.format(c("var/browser_release_date"), "%Y%m%d%H%M%S") %]'
    
    275 273
     
    
    ... ... @@ -467,7 +465,6 @@ targets:
    467 465
           compiler: android-toolchain
    
    468 466
           android_min_api: 21
    
    469 467
           CC: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang'
    
    470
    -      CXX: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang'
    
    471 468
           container:
    
    472 469
             suite: bookworm
    
    473 470
             arch: amd64
    
    ... ... @@ -592,9 +589,6 @@ targets:
    592 589
           platform: linux
    
    593 590
           compiler: gcc
    
    594 591
           configure_opt: '[% c("var/configure_opt_project") %]'
    
    595
    -      # Only build Namecoin for linux on nightly
    
    596
    -      # Temporarily disabled until we have a fix for tor-browser-build#40845
    
    597
    -      #namecoin: '[% c("var/nightly") && c("var/tor-browser") %]'
    
    598 592
           container:
    
    599 593
             suite: stretch
    
    600 594
             arch: amd64