From 0a669827a1b7462007294770087fe362fab6809c Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Fri, 1 Dec 2023 14:13:53 -0500
Subject: [PATCH] backports/signal-desktop: upgrade to 6.40.0
---
backports/signal-desktop/APKBUILD | 16 +++++++++-------
.../webrtc-no-shared-deps-in-static-lib.patch | 14 ++++++++++++++
2 files changed, 23 insertions(+), 7 deletions(-)
create mode 100644 backports/signal-desktop/webrtc-no-shared-deps-in-static-lib.patch
diff --git a/backports/signal-desktop/APKBUILD b/backports/signal-desktop/APKBUILD
index 85ccf68..def119a 100644
--- a/backports/signal-desktop/APKBUILD
+++ b/backports/signal-desktop/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: lauren n. liberda <lauren@selfisekai.rocks>
# Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
pkgname=signal-desktop
-pkgver=6.39.1
+pkgver=6.40.0
pkgrel=0
pkgdesc="A messaging app for simple private communication with friends"
url="https://github.com/signalapp/Signal-Desktop/"
@@ -64,11 +64,11 @@ options="net !check"
_libsignalver=0.32.1
# follow signal-desktop package.json -> @signalapp/ringrtc
-_ringrtcver=2.34.1
+_ringrtcver=2.34.3
# follow ringrtc (on version above) -> config/version.properties -> webrtc.version
# downloading tarball generated with abuild snapshot (with gclient dependencies fetched)
-_webrtcver=5845i
+_webrtcver=5845j
# follow @signalapp/better-sqlite3 (on version in package.json) -> deps/download.js -> TOKENIZER_VERSION
# last bsqlite version: 8.5.2
@@ -116,6 +116,7 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=clang"
export YARN_CACHE_FOLDER="$srcdir/.yarn"
# webrtc only, the other dependencies are fine with tarballs
+_distbucket="sakamoto/lnl-aports-snapshots/"
snapshot() {
mkdir -p "$srcdir"
cd "$srcdir"
@@ -159,7 +160,8 @@ target_cpu_only = True
--exclude-vcs \
webrtc-$_webrtcver
- zstd --ultra --long -22 -T4 -vv webrtc-$_webrtcver.tar
+ 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"
}
# manual patches
@@ -462,10 +464,10 @@ package() {
}
sha512sums="
-dc15b9693f22c0e71a1ceebe2bb967b6034dc2e3e1ced1e9be7eeca30e9253ed4c4baa49c6f87536c55118cabf2bc16d6f65f7f1bfcb73640eeb9a9942406dad Signal-Desktop-6.39.1.tar.gz
+6666029a4b7d163eb5d5833a73c699d11ddd56a644a66da3363b5874ff50469add0c1415b41e568882c9f33cec72024f6c2a50774f9b182d0634d24fb831119a Signal-Desktop-6.40.0.tar.gz
855f053a1329d12e20f254f607db0c0db9f6e1a3eb10061996da75805bf462a5dee0f4f841ec679980c77da87d600f92a21cd643c36d44e017cb3cbf57003b09 libsignal-0.32.1.tar.gz
-ba6cdfeeadab0bec9a10a0ce9bc19a58a060e8dc5b0007e59c38011454bebf112fda0bdc291cc3e995b3e1d468b96a1a85c840b058ed0f57f5cccb3050600dbc ringrtc-2.34.1.tar.gz
-1d61be0ff5358251760d7916aced3e4a957c183f9f5313ebff266987d99ada4adec8d4d95a9a94a14539e4f182c3fb6fb574937494afb7a3ae1e9ad9c11871de webrtc-5845i.tar.zst
+83df430ead75eb965513b9dec9e722d10fc4c74dc6dba8ee809bd2b77657c9d545b8d72c00a99273183c3fbcaf94ee9894c5a2d57f45ffeb3419a9957fe74426 ringrtc-2.34.3.tar.gz
+a1e78d6c8fed69dbc9ece48dc2e5f0e38ab74d3483e02059c90abe9f0be6d915d0a135a0498c05fd9ef87f444b34efb0d67d7dc577f086cba4a6012981d9d9bd webrtc-5845j.tar.zst
84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28 stokenizer-0.2.1.tar.gz
be5b4e823543b79175a12314f10c6326d9f0d59f470136962daed4665887006acc05b48b40dc1b67747396d8f6f7d23be298c1e110ccdd35ff9b09d5e6b80bab bettersqlite-use-system-sqlcipher.patch
90d47914e30f095515c47c9ef7c763a7a2583a281228d6ea7e2a3444be670b3ae506c82b4fcea8a228f88f688a43c23c8dcef52b65805d2105287234550718a5 libsignal-auditable.patch
diff --git a/backports/signal-desktop/webrtc-no-shared-deps-in-static-lib.patch b/backports/signal-desktop/webrtc-no-shared-deps-in-static-lib.patch
new file mode 100644
index 0000000..d2a83b2
--- /dev/null
+++ b/backports/signal-desktop/webrtc-no-shared-deps-in-static-lib.patch
@@ -0,0 +1,14 @@
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -480,11 +480,6 @@
+ "rtc_base",
+ "sdk",
+ "video",
+-
+- # Added by RingRTC
+- # Necessary for use_custom_libcxx=true,
+- # which is in turn necessary for deploying to Ubuntu 16.04.
+- "//build/config:shared_library_deps",
+ ]
+
+ if (rtc_include_builtin_audio_codecs) {