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: - projects/browser/config - projects/firefox/config - projects/geckoview/config - projects/mmdebstrap-image/config - rbm.conf Changes: ===================================== projects/browser/config ===================================== @@ -27,7 +27,6 @@ targets: - faketime - python3-dev - python3-pip - - python3-distutils-extra - python3-psutil pt_path: PluggableTransports/ ===================================== projects/firefox/config ===================================== @@ -153,7 +153,6 @@ targets: nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-macos' arch_deps: - python3 - - python3-distutils - python3-zstandard - rsync @@ -161,7 +160,6 @@ targets: var: arch_deps: - python3 - - python3-distutils - python3-zstandard - wine ===================================== projects/geckoview/config ===================================== @@ -31,7 +31,6 @@ var: - autoconf - yasm - python3 - - python3-distutils - python3-venv - python3-zstandard - pkg-config ===================================== projects/mmdebstrap-image/config ===================================== @@ -42,25 +42,18 @@ targets: "deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://archive.debian.org/debian-archive/debian/ stretch main" "deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://archive.debian.org/debian-archive/debian-security/ stretch/updates main" - buster-amd64: - var: - minimal_apt_version: 1.8.2 - container: - suite: buster - arch: amd64 - - bullseye-amd64: + bookworm-amd64: var: - minimal_apt_version: 2.2.4 + minimal_apt_version: 2.6.1 container: - suite: bullseye + suite: bookworm arch: amd64 - bookworm-amd64: + trixie-amd64: var: - minimal_apt_version: 2.6.1 + minimal_apt_version: 3.0.3 container: - suite: bookworm + suite: trixie arch: amd64 input_files: ===================================== rbm.conf ===================================== @@ -486,7 +486,6 @@ targets: - bison - ca-certificates - python3 - - python3-distutils - python3-venv - automake - libtool @@ -630,7 +629,7 @@ targets: windows: 1 platform: windows container: - suite: bookworm + suite: trixie arch: amd64 configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]" [% c("var/configure_opt_project") %]' CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]' @@ -641,7 +640,6 @@ targets: - build-essential - ca-certificates - python3 - - python3-distutils - bison - automake - libtool @@ -713,7 +711,7 @@ targets: platform: macos osname: macos container: - suite: bookworm + suite: trixie arch: amd64 compiler: 'macosx-toolchain' 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: - ca-certificates - faketime - python3 - - python3-distutils - automake - bison - libtool View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/6... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/6... You're receiving this email because of your account on gitlab.torproject.org.
participants (1)
-
Pier Angelo Vendrame (@pierov)