[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41535: Do not install python3-distutils.

Title: GitLab

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

  • 49ec2d1e
    by Pier Angelo Vendrame at 2026-01-08T16:25:48+01:00 
    Bug 41535: Do not install python3-distutils.

This module has been deprecated and will not be available in trixie.
In any case, our builds succeed also without it, so there is no reason
to keep it.
  • befef9ac
    by Pier Angelo Vendrame at 2026-01-08T16:25:51+01:00 
    Bug 41535: Use trixie for Windows and macOS containers.

Debian trixie has recently become stable, so we can use it to build for
Windows and macOS.
We cannot use it yet for Android because GeckoView does not work well
with Java 21, and trixie removed Java 17.

5 changed files:

Changes:

  • projects/browser/config
    ... ... @@ -27,7 +27,6 @@ targets:
    27 27 
             - faketime
    28 28 
             - python3-dev
    29 29 
             - python3-pip
    30 
    -        - python3-distutils-extra
    31 30 
             - python3-psutil
    32 31 
           pt_path: PluggableTransports/
    33 32

  • projects/firefox/config
    ... ... @@ -153,7 +153,6 @@ targets:
    153 153 
           nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-macos'
    154 154 
           arch_deps:
    155 155 
             - python3
    156 
    -        - python3-distutils
    157 156 
             - python3-zstandard
    158 157 
             - rsync
    159 158
    ... ... @@ -161,7 +160,6 @@ targets:
    161 160 
         var:
    162 161 
           arch_deps:
    163 162 
             - python3
    164 
    -        - python3-distutils
    165 163 
             - python3-zstandard
    166 164 
             - wine
    167 165

  • projects/geckoview/config
    ... ... @@ -31,7 +31,6 @@ var:
    31 31 
         - autoconf
    32 32 
         - yasm
    33 33 
         - python3
    34 
    -    - python3-distutils
    35 34 
         - python3-venv
    36 35 
         - python3-zstandard
    37 36 
         - pkg-config

  • projects/mmdebstrap-image/config
    ... ... @@ -42,25 +42,18 @@ targets:
    42 42 
               "deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://archive.debian.org/debian-archive/debian/ stretch main"
    43 43 
               "deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://archive.debian.org/debian-archive/debian-security/ stretch/updates main"
    44 44
    45 
    -  buster-amd64:
    46 
    -    var:
    47 
    -      minimal_apt_version: 1.8.2
    48 
    -      container:
    49 
    -        suite: buster
    50 
    -        arch: amd64
    51 
    -
    52 
    -  bullseye-amd64:
    45 
    +  bookworm-amd64:
    53 46 
         var:
    54 
    -      minimal_apt_version: 2.2.4
    47 
    +      minimal_apt_version: 2.6.1
    55 48 
           container:
    56 
    -        suite: bullseye
    49 
    +        suite: bookworm
    57 50 
             arch: amd64
    58 51
    59 
    -  bookworm-amd64:
    52 
    +  trixie-amd64:
    60 53 
         var:
    61 
    -      minimal_apt_version: 2.6.1
    54 
    +      minimal_apt_version: 3.0.3
    62 55 
           container:
    63 
    -        suite: bookworm
    56 
    +        suite: trixie
    64 57 
             arch: amd64
    65 58
    66 59 
     input_files:

  • rbm.conf
    ... ... @@ -486,7 +486,6 @@ targets:
    486 486 
             - bison
    487 487 
             - ca-certificates
    488 488 
             - python3
    489 
    -        - python3-distutils
    490 489 
             - python3-venv
    491 490 
             - automake
    492 491 
             - libtool
    ... ... @@ -630,7 +629,7 @@ targets:
    630 629 
           windows: 1
    631 630 
           platform: windows
    632 631 
           container:
    633 
    -        suite: bookworm
    632 
    +        suite: trixie
    634 633 
             arch: amd64
    635 634 
           configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]" [% c("var/configure_opt_project") %]'
    636 635 
           CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]'
    ... ... @@ -641,7 +640,6 @@ targets:
    641 640 
             - build-essential
    642 641 
             - ca-certificates
    643 642 
             - python3
    644 
    -        - python3-distutils
    645 643 
             - bison
    646 644 
             - automake
    647 645 
             - libtool
    ... ... @@ -713,7 +711,7 @@ targets:
    713 711 
           platform: macos
    714 712 
           osname: macos
    715 713 
           container:
    716 
    -        suite: bookworm
    714 
    +        suite: trixie
    717 715 
             arch: amd64
    718 716 
           compiler: 'macosx-toolchain'
    719 717 
           configure_opt: '--host=[% c("var/build_target") %] CC="[% c("var/build_target") %]-clang [% c("var/FLAGS") %]" CXX="[% c("var/build_target") %]-clang++ [% c("var/FLAGS") %]" [% c("var/configure_opt_project") %]'
    ... ... @@ -725,7 +723,6 @@ targets:
    725 723 
             - ca-certificates
    726 724 
             - faketime
    727 725 
             - python3
    728 
    -        - python3-distutils
    729 726 
             - automake
    730 727 
             - bison
    731 728 
             - libtool

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/6c8d0e997d03306aff1139eb2c6b284fdec46882...befef9aca1a47707385b83022050f9838d7e4935 at 1767895820 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx