From 1bdff4e06842330c1231d36a2b69c1ba0ffb9601 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 4 Apr 2026 14:27:07 -0400 Subject: [PATCH] backports/signal-desktop: upgrade to 8.5.0 --- backports/signal-desktop/APKBUILD | 162 ++++++++++-------- .../signal-rollback-locale-changes.patch | 38 ++-- .../signal-desktop/webrtc-shared-libs.patch | 60 +------ 3 files changed, 109 insertions(+), 151 deletions(-) diff --git a/backports/signal-desktop/APKBUILD b/backports/signal-desktop/APKBUILD index 762ce25..30a2513 100644 --- a/backports/signal-desktop/APKBUILD +++ b/backports/signal-desktop/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Antoine Martin (ayakael) # Maintainer: Antoine Martin (ayakael) pkgname=signal-desktop -pkgver=8.3.0 +pkgver=8.5.0 pkgrel=0 pkgdesc="A messaging app for simple private communication with friends" url="https://github.com/signalapp/Signal-Desktop/" @@ -66,17 +66,21 @@ makedepends=" options="net !check" # use _check_depends to validate this -_libsignalver=0.88.2 -_ringrtcver=2.65.3 -_webrtcver=7444g -_sqlcipherver=2.4.4 +_libsignalver=0.89.2 +_ringrtcver=2.67.0 +_webrtcver=7444h +_sqlcipherver=3.2.1 +_chromiumver=142.0.7444.0 +_opus_overlay_commit=22244de5a79bd1d6d623c32e72bf1954b56235be source=" https://github.com/signalapp/Signal-Desktop/archive/refs/tags/v$pkgver/Signal-Desktop-$pkgver.tar.gz https://github.com/signalapp/libsignal/archive/refs/tags/v$_libsignalver/libsignal-$_libsignalver.tar.gz https://github.com/signalapp/ringrtc/archive/refs/tags/v$_ringrtcver/ringrtc-$_ringrtcver.tar.gz https://github.com/signalapp/node-sqlcipher/archive/refs/tags/v$_sqlcipherver/node-sqlcipher-$_sqlcipherver.tar.gz - https://ayakael.net/api/packages/mirrors/generic/webrtc/$_webrtcver/webrtc-$_webrtcver.tar.zst + https://github.com/signalapp/webrtc/archive/refs/tags/$_webrtcver/webrtc-$_webrtcver.tar.gz + opus-$_opus_overlay_commit.tar.gz::https://github.com/xiph/opus/archive/$_opus_overlay_commit.tar.gz + https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver-lite.tar.xz libsignal-auditable.patch signal-use-system-sqlcipher.patch @@ -97,6 +101,9 @@ source=" " builddir="$srcdir" +# Required for cubeb-sys's. +unset CARGO_TARGET_DIR + # webrtc broken on clang https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101227 export CC=gcc export CXX=g++ @@ -123,79 +130,81 @@ export YARN_CACHE_FOLDER="$srcdir/.yarn" _update_depends() { msg "Updating extra dependencies version information in $APKBUILD..." - # _libsignalver: follow signal-desktop package.json -> @signalapp/libsignal-client - # _ringrtcver: follow signal-desktop package.json -> @signalapp/ringrtc - # _webrtcver: follow ringrtc (on version above) -> config/version.properties -> webrtc.version - # downloading tarball generated with abuild snapshot (with gclient dependencies fetched) - # _sqlcipherver: follow signal-desktop package.json -> @signalapp/sqlcipher - local _libsignalver=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Desktop/v$pkgver/package.json | grep "@signalapp/libsignal-client\": \"" | awk '{print $2}' | tr -d ',' | tr -d '"' | head -n 1) - local _ringrtcver=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Desktop/v$pkgver/package.json | grep "@signalapp/ringrtc\": \"" | awk '{print $2}' | tr -d ',' | tr -d '"' | head -n 1) - local _webrtcver=$(curl --silent https://raw.githubusercontent.com/signalapp/ringrtc/v$_ringrtcver/config/version.properties | awk -F '=' '{if($1 == "webrtc.version"){print $2}}' | head -n 1) - local _sqlcipherver=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Desktop/v$pkgver/package.json | grep "@signalapp/sqlcipher\": \"" | awk '{print $2}' | tr -d ',' | tr -d '"' | head -n 1) + # signal-desktop package.json -> dependency versions + local _pkg_json + _pkg_json=$(curl --silent "https://raw.githubusercontent.com/signalapp/Signal-Desktop/v$pkgver/package.json") + + local _libsignalver=$(echo "$_pkg_json" | grep "@signalapp/libsignal-client\": \"" | awk '{print $2}' | tr -d ',"' | head -n 1) + local _ringrtcver=$(echo "$_pkg_json" | grep "@signalapp/ringrtc\": \"" | awk '{print $2}' | tr -d ',"' | head -n 1) + local _sqlcipherver=$(echo "$_pkg_json" | grep "@signalapp/sqlcipher\": \"" | awk '{print $2}' | tr -d ',"' | head -n 1) + + # ringrtc config -> webrtc version tag + local _webrtcver=$(curl --silent "https://raw.githubusercontent.com/signalapp/ringrtc/v$_ringrtcver/config/version.properties" \ + | awk -F= '/^webrtc.version=/{print $2}') + + msg " signal: libsignal=$_libsignalver ringrtc=$_ringrtcver sqlcipher=$_sqlcipherver webrtc=$_webrtcver" + + # webrtc DEPS -> commit hashes for opus and chromium. + local _deps + _deps=$(curl --silent "https://raw.githubusercontent.com/signalapp/webrtc/$_webrtcver/DEPS") + + local _opus_overlay_commit=$(echo "$_deps" | grep -A3 "'src/ringrtc/opus/src':" \ + | head -4 | grep -oE '[a-f0-9]{40}' | head -1) + + local _chromium_rev=$(echo "$_deps" | grep -oE "'chromium_revision': '[a-f0-9]{40}'" \ + | grep -oE '[a-f0-9]{40}') + local _chrome_version=$(curl --silent \ + "https://chromium.googlesource.com/chromium/src/+/$_chromium_rev/chrome/VERSION?format=TEXT" \ + | base64 -d) + local _chromiumver="$(echo "$_chrome_version" | awk -F= '/^MAJOR/{maj=$2} /^MINOR/{min=$2} /^BUILD/{bld=$2} /^PATCH/{pat=$2} END{print maj"."min"."bld"."pat}')" + + msg " chromium=$_chromiumver opus_overlay=$_opus_overlay_commit" sed -i \ -e "s|^_libsignalver=.*|_libsignalver=$_libsignalver|" \ -e "s|^_ringrtcver=.*|_ringrtcver=$_ringrtcver|" \ -e "s|^_webrtcver=.*|_webrtcver=$_webrtcver|" \ -e "s|^_sqlcipherver=.*|_sqlcipherver=$_sqlcipherver|" \ - $APKBUILD -} - -# webrtc only, the other dependencies are fine with tarballs -_distbucket="sakamoto/lnl-aports-snapshots/" -snapshot() { - mkdir -p "$srcdir" - cd "$srcdir" - - # cleanup if retrying - rm -rf src - rm -rf webrtc-$_webrtcver - rm -f webrtc-$_webrtcver.tar - rm -f webrtc-$_webrtcver.tar.zst - - echo " -solutions = [{ - 'name': 'src', - 'url': 'https://github.com/signalapp/webrtc.git@$_webrtcver', -}] -target_cpu = ['x64', 'arm64'] -target_cpu_only = True -" > .gclient - - gclient sync --no-history --nohooks --tpot-cipd-ignore-platformed - - # needed DEPS hooks - python3 'src/build/landmines.py' --landmine-scripts 'src/tools_webrtc/get_landmines.py' --src-dir 'src' - python3 'src/build/util/lastchange.py' -o 'src/build/util/LASTCHANGE' - - for elf in $(scanelf -RA -F "%F" src); do - rm -f "$elf" - done - - mv src webrtc-$_webrtcver - - msg "generating tarball.." - tar -cf webrtc-$_webrtcver.tar \ - --exclude="ChangeLog*" \ - --exclude="testdata/" \ - --exclude="test_data/" \ - --exclude="android_rust_toolchain/toolchain/" \ - --exclude="base/" \ - --exclude-backups \ - --exclude-caches-all \ - --exclude-vcs \ - webrtc-$_webrtcver - - zstd --auto-threads=logical --ultra --long -22 -T"${ZSTD_LIMIT:-0}" -vv webrtc-$_webrtcver.tar -o "$SRCDEST"/webrtc-$_webrtcver.tar.zst - mcli cp "$SRCDEST"/webrtc-$_webrtcver.tar.zst "$_distbucket" + -e "s|^_chromiumver=.*|_chromiumver=$_chromiumver|" \ + -e "s|^_opus_overlay_commit=.*|_opus_overlay_commit=$_opus_overlay_commit|" \ + "$APKBUILD" } prepare() { - # Moves to builddir to use abuild patch logics - for i in Signal-Desktop-$pkgver libsignal-$_libsignalver ringrtc-$_ringrtcver webrtc-$_webrtcver node-sqlcipher-$_sqlcipherver; do + # Move non-webrtc sources to their build directories. + for i in Signal-Desktop-$pkgver libsignal-$_libsignalver ringrtc-$_ringrtcver node-sqlcipher-$_sqlcipherver; do mv "$srcdir"/$i "$builddir"/${i%-*} done + + # Assemble WebRTC tree: webrtc source + chromium build/third_party deps. + mv "$srcdir"/webrtc-$_webrtcver "$builddir"/webrtc + local _chromium="$srcdir"/chromium-$_chromiumver + for dir in build buildtools testing tools third_party; do + cp -r "$_chromium"/$dir "$builddir"/webrtc/ + done + + # Opus source overlay for ringrtc. + mkdir -p "$builddir"/webrtc/ringrtc/opus/src + cp -r "$srcdir"/opus-$_opus_overlay_commit/* "$builddir"/webrtc/ringrtc/opus/src/ + + echo "LASTCHANGE=$_webrtcver" > "$builddir"/webrtc/build/util/LASTCHANGE + + mkdir -p "$builddir"/webrtc/build/config + cat > "$builddir"/webrtc/build/config/gclient_args.gni <<-EOF + generate_location_tags = false + EOF + + # Use system libatomic instead of compiling compiler-rt's atomic.c + cat > "$builddir"/webrtc/third_party/compiler-rt/BUILD.gn <<-'EOGN' + config("atomic_config") { + libs = [ "atomic" ] + } + group("atomic") { + public_configs = [ ":atomic_config" ] + } + EOGN + default_prepare cd "$builddir"/Signal-Desktop @@ -255,6 +264,8 @@ prepare() { -delete done + touch third_party/libjpeg.gni + msg "Replacing gn files" python3 build/linux/unbundle/replace_gn_files.py --system-libraries \ $use_system @@ -328,6 +339,7 @@ build() { rtc_enable_sctp=false rtc_include_tests=false rtc_include_ilbc=false + rtc_enable_google_benchmarks=false rtc_libvpx_build_vp9=true rtc_use_x11=false rustc_version=\"yes\" @@ -481,22 +493,24 @@ package() { } sha512sums=" -fdf4efba12761ae38ce048ef872efecf6c134beaf91e0e1dd8fd559c3a393f80415f170a2882ae8b71fa3e47ad75a99e2e01461eecce6a714c5dd5978d9d6c74 Signal-Desktop-8.3.0.tar.gz -af3524816c6d4162677c48cdf200f9b241b372e8e51e0a90f4aa6af35aa73fb768722f1d5a6176fb6620cfedcec407fff844d3ee88917c5b8d669822a28615ca libsignal-0.88.2.tar.gz -d277727856a1ae4aa8b6c6f26172545fe90c74bc33ee7c8e2c65b22baf5dc408944d723901a86b50f0af869f3b7656778c15a0570d81422db8c32705ced6c7df ringrtc-2.65.3.tar.gz -79dd21548329b4ee409fa73b013c18ed4e85038aeef7a4cfe196fd6b5113279da8ad287a259fa6a6b546b52a5a6dd6ae2cb1050007043d25f76d7917dbbbc02d node-sqlcipher-2.4.4.tar.gz -186ce959aa00c9d881d9621ccf4e84a5cf952eb60ba9dcc682cacdcf9cbe06842587d0477cb08a2fe44196426faa60401fdaa900e6bd0389c5240ae0e79e987f webrtc-7444g.tar.zst +ad14408978a991374dc67d74017daa287460497c7b8c7a780c5bf33aa1906a4402afbf3262d2bf4a3442202483e5d7df490d76bbe3883f158505e78d3f95ecd2 Signal-Desktop-8.5.0.tar.gz +bf233af7554a842b4ed8cfafc258989dcb808f8a588c2ebc72fd86d0a900284c30e4135f7efe34931a8a8bd0ab5a05ae46da2f9fd728d697907dacb21b3e21be libsignal-0.89.2.tar.gz +8b4d220a87fb38c748dcc242da13b6705c9713e7b9b8735c88dae9dd1fa21130b3e166cdac6de99530691fe98f18c319a6be0456aff7c84546d840702433d958 ringrtc-2.67.0.tar.gz +5c17c3300caebc3a9d86bf7e1c9f4927cc534bd46d528667abc13409d46418f68efced9716793b444ce8593b66e2865caf1e925fd073e07f9954e7cdb8133ff3 node-sqlcipher-3.2.1.tar.gz +d769637eb62542b04492d0f8a2339feb33a62cf0e166fab033ece5bd5bffc655c4b8306b27f454dbd33408eb4f914f1ab0590a07012a81dcc6950f35f2e311ca webrtc-7444h.tar.gz +f2735ee9ae63627ea7dfc4066f3dbf101967011d04784babadde1769808c06c8dae9e0ec4e2f14cb29683bf9db733fb641125d001db6c3779fc20c3190c88465 opus-22244de5a79bd1d6d623c32e72bf1954b56235be.tar.gz +4bf51fea87f1f6c70f5b59f373d7f3e726663ae752e5b9d8089e44d13dd7a930fba5380e515ebc82a661da422482fd0fc848622709a80bef4902f715ba69b612 chromium-142.0.7444.0-lite.tar.xz 8d2d2d82c8546c2dd1fef161b61df79918f8c22235a56a46adb375a0beb4acef12c5fe53e67242a4be97f77adc522ff79b47949c352956c742a70d50f4179f7f libsignal-auditable.patch 7ee747c8aaa9d6e9149fe0a031e3d4cc9e9c08f22c42076bd05e2acb86952f8170032613d13a53716010edfa3f26ad97b530e82460318eb46a42e28cf5faeb9d signal-use-system-sqlcipher.patch ef3622da416a5bd2d4bea4f2a4fbb21a985f660d4acc17bbe66ce51ac1180ab92c0c843a5414ff56ea1deda87c2b0f611a299ca8ebe4d6a24df53626b36ceea8 signal-disable-updates.patch 60f843fb72d18aa7a48e47a751737b9432e3860dc7390b9094acb211df8b383293f2b4299787a6458999dfd185b502bdeecb717731724e68e37fc098a3afa3ed signal-update-links.patch e09a573e579bb464fccecbe80d1c197ec316dce420d1e2cd18a5661c2831871099766439d08b8000638c23b9652b3ef598a33c7453507b3fd246e9630c86bdd2 signal-show-window-please.patch -b428a80478f2151a8a28858a92c604533ab7c8d2f39ec9797a80a4397e8e242754ab2cf08c8641d967b7966e45bca6357e92a8d83acdcddbde386e1cc97b4b9b signal-rollback-locale-changes.patch +9e80d9e8b8c2aa4e42c2749086762394a2f61ac961011ffb0882d80bb5973d6c6f2ca1757f973951af207c48c5837cad5accddafe9603f202d7ca29ea2d19869 signal-rollback-locale-changes.patch 961568777b86f8fbcc73360252123686c9d1e16b2650f23d8afbc6d7580d53024f81b62e9e9cbdcd0031b5cf99854bd47c6dd4580197f2b27b8b4cbb51c6c9c9 signal-do-not-package-sqlcipher-deps.patch 03ee8d925d610990a1003e976d91f214a4781c879063bdc91ba9a705edfd3f25235f6ec075d4e663a296cdbd872832b7e818aec4c451716d1000f393dc0d39ee signal-do-not-package-desktop-entry.patch 02a648bb8541a39c75fec2db39f024a27976afca41908eefa2fe1f2e30b05b5d59f980ccc930021c0b0c09ba8b0cbcae071e9f0dd530543c667adbc4272af552 ringrtc-webrtc-renamed.patch 19d2e07bdc0b160ec542fcb0a3d94ae1e37dcb1b3455e57b278cf074f8aac625341b47f4f06a1f7eb5a197cb0f11754de8785ffd10876852972cbfafdc2615db ringrtc-use-sh.patch -a9374040dcbc9203c8a3b4ad1cf97d58805cd4755f4f585a988b113697ea97d5900ad68f6a30aa0621f34ab54ae98984a8ce228a2d08186ee1bf3384abf3f364 webrtc-shared-libs.patch +0886db42302cdde60a2a1854ed7621c796d0a6f55daee4f830af9b208e1da50bdb55c1b7ead7a79d12d7b758c8901f7ca28885b759e28976a7b4638d11b16ee3 webrtc-shared-libs.patch 8ba740f0552872ddf383545a6bb99bf7bcdd2610cee51c6e69dc667893006facd5d72f62274e25c1a58e1a58c8e8b0b5303b648e4c74a71925639cc9691c72c4 webrtc-compiler.patch d44f62e4ccf2d9094d6ed217b24fa2cde276c7f64f4d6fd26e84dfc021ea667abcb21f9e4666cfd0d88d6ee0a6b1a20b6cc68c8720462711e3b5451e263f6c4a webrtc-use-only-payloadtypesuggester-for-pt-assignement.patch d17ecd89e867b24a21144d267e1bf7d09e3898018a0f9fcd87084b9de8091bc56f904a1cabdc487a8e46ab509c11ddd363c574d75d85a79e3c4d9424a13b2093 webrtc-rtcbase-platform-thread-type-do-not-include-linux-prctl-header.patch diff --git a/backports/signal-desktop/signal-rollback-locale-changes.patch b/backports/signal-desktop/signal-rollback-locale-changes.patch index 51f1235..6939a9b 100644 --- a/backports/signal-desktop/signal-rollback-locale-changes.patch +++ b/backports/signal-desktop/signal-rollback-locale-changes.patch @@ -17,7 +17,7 @@ diff --git a/Signal-Desktop/package.json.orig b/Signal-Desktop/package.json index 04dd9f9200b..e7b69ef963f 100644 --- a/Signal-Desktop/package.json.orig +++ b/Signal-Desktop/package.json -@@ -538,10 +538,7 @@ +@@ -603,10 +603,7 @@ { "from": "build/compact-locales", "to": "_locales", @@ -25,12 +25,10 @@ index 04dd9f9200b..e7b69ef963f 100644 - "**/values.json", - "keys.json" - ] -+ "filter": "**/messages.json" ++ "filter": "**/messages.json" }, "js/**", "libtextsecure/**", -diff --git a/Signal-Desktop/app/locale.node.ts.orig b/Signal-Desktop/app/locale.node.ts -index 2c94d5d..779d936 100644 --- a/Signal-Desktop/app/locale.node.ts.orig +++ b/Signal-Desktop/app/locale.node.ts @@ -1,8 +1,8 @@ @@ -43,18 +41,17 @@ index 2c94d5d..779d936 100644 +import { readFileSync } from 'fs'; import lodash from 'lodash'; import * as LocaleMatcher from '@formatjs/intl-localematcher'; - import { z } from 'zod'; -@@ -20,9 +20,6 @@ import { parseUnknown } from '../ts/util/schemas.std.js'; + import { setupI18n } from '../ts/util/setupI18nMain.std.js'; +@@ -17,8 +17,6 @@ const { merge } = lodash; -type CompactLocaleMessagesType = ReadonlyArray; -type CompactLocaleKeysType = ReadonlyArray; -- - const TextInfoSchema = z.object({ - direction: z.enum(['ltr', 'rtl']), - }); -@@ -33,17 +30,6 @@ function getLocaleMessages(locale: string): LocaleMessagesType { + + function getLocaleMessages(locale: string): LocaleMessagesType { + const targetFile = join(__dirname, '..', '_locales', locale, 'messages.json'); +@@ -26,16 +24,7 @@ return JSON.parse(readFileSync(targetFile, 'utf-8')); } @@ -62,17 +59,16 @@ index 2c94d5d..779d936 100644 - const targetFile = join(__dirname, '..', '_locales', 'keys.json'); - return JSON.parse(readFileSync(targetFile, 'utf-8')); -} -- + -function getCompactLocaleValues(locale: string): CompactLocaleMessagesType { - const targetFile = join(__dirname, '..', '_locales', locale, 'values.json'); - - return JSON.parse(readFileSync(targetFile, 'utf-8')); -} -- + export type LocaleDisplayNames = Record>; export type CountryDisplayNames = Record>; - -@@ -160,42 +146,13 @@ export function load({ +@@ -124,41 +113,13 @@ logger.info(`locale: Matched locale: ${matchedLocale}`); @@ -113,14 +109,11 @@ index 2c94d5d..779d936 100644 - // We start with english, then overwrite that with anything present in locale - finalMessages = merge(englishMessages, matchedLocaleMessages); - } -- + // We start with english, then overwrite that with anything present in locale + const finalMessages = merge(englishMessages, matchedLocaleMessages); + const i18n = setupI18n(matchedLocale, finalMessages, { renderEmojify: shouldNeverBeCalled, - getLocaleDirection: shouldNeverBeCalled, -diff --git a/Signal-Desktop/ts/scripts/generate-compact-locales.node.ts.orig b/Signal-Desktop/ts/scripts/generate-compact-locales.node.ts -index c09aba2..9a17d63 100644 --- a/Signal-Desktop/ts/scripts/generate-compact-locales.node.ts.orig +++ b/Signal-Desktop/ts/scripts/generate-compact-locales.node.ts @@ -3,49 +3,6 @@ @@ -173,7 +166,7 @@ index c09aba2..9a17d63 100644 async function main(): Promise { const rootDir = join(__dirname, '..', '..'); -@@ -54,27 +11,30 @@ async function main(): Promise { +@@ -54,27 +11,30 @@ const locales = await readdir(sourceDir); @@ -196,12 +189,13 @@ index c09aba2..9a17d63 100644 - const keys = Array.from(new Set(allKeys.flat())).sort(); - await mkdir(targetDir, { recursive: true }); - await writeFile(join(targetDir, 'keys.json'), JSON.stringify(keys)); -+ await mkdir(dirname(targetPath), { recursive: true }); - +- - await pMap( - locales, - locale => compact({ sourceDir, targetDir, locale, keys }), - { concurrency: 10 } ++ await mkdir(dirname(targetPath), { recursive: true }); ++ + const json = JSON.parse(await readFile(sourcePath, 'utf8')); + for (const value of Object.values(json)) { + const typedValue = value as { description?: string }; diff --git a/backports/signal-desktop/webrtc-shared-libs.patch b/backports/signal-desktop/webrtc-shared-libs.patch index 04b55c0..7bc8c16 100644 --- a/backports/signal-desktop/webrtc-shared-libs.patch +++ b/backports/signal-desktop/webrtc-shared-libs.patch @@ -10,7 +10,7 @@ deps += [ "examples" ] } @@ -464,7 +464,7 @@ - + if (!build_with_chromium) { # Target to build all the WebRTC production code. - rtc_static_library("webrtc") { @@ -18,61 +18,11 @@ # Only the root target and the test should depend on this. visibility = [ "//:default", -@@ -530,7 +530,6 @@ if (!build_with_chromium) { - +@@ -530,7 +530,6 @@ + sources = [] - + - complete_static_lib = true suppressed_configs += [ "//build/config/compiler:thin_archive" ] defines = [] - -diff --git a/webrtc/third_party/googletest/BUILD.gn.orig b/webrtc/third_party/googletest/BUILD.gn -index 14089f0..b7dc621 100644 ---- a/webrtc/third_party/googletest/BUILD.gn.orig -+++ b/webrtc/third_party/googletest/BUILD.gn -@@ -48,7 +48,6 @@ config("gtest_config") { - - configs = [ - "//third_party/abseil-cpp:absl_include_config", -- "//third_party/re2:re2_config", - ] - } - -diff --git a/webrtc/third_party/googletest/BUILD.gn.orig b/webrtc/third_party/googletest/BUILD.gn -index b7dc621..367f929 100644 ---- a/webrtc/third_party/googletest/BUILD.gn.orig -+++ b/webrtc/third_party/googletest/BUILD.gn -@@ -129,7 +128,6 @@ source_set("gtest") { - - # googletest only needs `absl`, but this makes gn check happier. - deps = [ "//third_party/abseil-cpp:absl_full" ] -- public_deps = [ "//third_party/re2" ] - if (!build_with_chromium) { - defines += [ "GTEST_DISABLE_PRINT_STACK_TRACE" ] - sources -= [ -diff --git a/webrtc/third_party/fuzztest/BUILD.gn.orig b/webrtc/third_party/fuzztest/BUILD.gn -index 57ee790..ba1d297 100644 ---- a/webrtc/third_party/fuzztest/BUILD.gn.orig -+++ b/webrtc/third_party/fuzztest/BUILD.gn -@@ -309,7 +309,6 @@ source_set("fuzztest_internal") { - # For RE2 mutators. It's questionable whether we want to pull this library - # into every fuzztest target, but this is the approach used in other - # fuzztest contexts so we'll do the same -- "//third_party/re2", - - # For protobuf mutators - "$protobuf_target_prefix:protobuf_lite", -diff --git a/webrtc/third_party/BUILD.gn b/webrtc/third_party/BUILD.gn -index 256fd092e2e..4ce797ebad7 100644 ---- a/webrtc/third_party/BUILD.gn -+++ b/webrtc/third_party/BUILD.gn -@@ -71,8 +69,5 @@ component("freetype_harfbuzz") { - - buildflag_header("freetype_buildflags") { - header = "freetype_buildflags.h" -- flags = [ -- "USE_SYSTEM_FREETYPE=$use_system_freetype", -- "ENABLE_FREETYPE=$enable_freetype", -- ] -+ flags = [ "USE_SYSTEM_FREETYPE=$use_system_freetype" ] - } + -- 2.52.0