[3.20] backports/signal-desktop: upgrade to 7.11.0 #513

Merged
ayakael merged 1 commit from signal-desktop/upgrade-7.11.0-320 into v3.20 2024-06-04 16:15:21 +00:00
3 changed files with 41 additions and 24 deletions

View file

@ -1,13 +1,12 @@
# Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Contributor: lauren n. liberda <lauren@selfisekai.rocks>
# Maintainer: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
pkgname=signal-desktop pkgname=signal-desktop
pkgver=7.9.0 pkgver=7.11.0
pkgrel=0 pkgrel=0
pkgdesc="A messaging app for simple private communication with friends" pkgdesc="A messaging app for simple private communication with friends"
url="https://github.com/signalapp/Signal-Desktop/" url="https://github.com/signalapp/Signal-Desktop/"
# same as electron # same as electron
# build failure arch="aarch64 x86_64"
#arch="aarch64 x86_64"
license="AGPL-3.0-only" license="AGPL-3.0-only"
depends=" depends="
electron electron
@ -64,14 +63,14 @@ makedepends="
options="net !check" options="net !check"
# follow signal-desktop package.json -> @signalapp/libsignal-client # follow signal-desktop package.json -> @signalapp/libsignal-client
_libsignalver=0.45.0 _libsignalver=0.46.2
# follow signal-desktop package.json -> @signalapp/ringrtc # follow signal-desktop package.json -> @signalapp/ringrtc
_ringrtcver=2.41.0 _ringrtcver=2.42.0
# follow ringrtc (on version above) -> config/version.properties -> webrtc.version # follow ringrtc (on version above) -> config/version.properties -> webrtc.version
# downloading tarball generated with abuild snapshot (with gclient dependencies fetched) # downloading tarball generated with abuild snapshot (with gclient dependencies fetched)
_webrtcver=6261g _webrtcver=6261i
# follow @signalapp/better-sqlite3 (on version in package.json) -> deps/download.js -> TOKENIZER_VERSION # follow @signalapp/better-sqlite3 (on version in package.json) -> deps/download.js -> TOKENIZER_VERSION
# last bsqlite version: 8.7.1 # last bsqlite version: 8.7.1
@ -89,6 +88,7 @@ source="
signal-disable-updates.patch signal-disable-updates.patch
signal-update-links.patch signal-update-links.patch
signal-show-window-please.patch signal-show-window-please.patch
signal-fix-dns-fallback.patch
ringrtc-webrtc-renamed.patch ringrtc-webrtc-renamed.patch
webrtc-shared-like-my-wife.patch webrtc-shared-like-my-wife.patch
webrtc-compiler.patch webrtc-compiler.patch
@ -472,17 +472,18 @@ package() {
} }
sha512sums=" sha512sums="
53ef9feccdbe1c52eee88d2e2ed337746dcaf0fd18ee0d462ba3faaef02b38e9ba7269857e975f241c719d6750ce01fc42b0d90bbd9ef7bbee14b9b4540adbb8 Signal-Desktop-7.9.0.tar.gz cebb1c8412089fe6f5faa9d4bfcb8bb4e8c9d2f3e4a13eef15e8f36d97b4bc65eae3c0865af0a7c82a0af2fd0597482b3d7c1f25e7d51465ea2589c817183b19 Signal-Desktop-7.11.0.tar.gz
70f2cb7d05e019235cd044c401bcf072a934fdfea4a161ef5be988d2e3932ba5233110b4b06525e6f33ea9cad036def442e70adad15eab883903d9246969896e libsignal-0.45.0.tar.gz 6be40fcfbcb9bd20c51dd9ef1c65e7f586fbbee04af66af89a5b8c0ce3fa2ce5efd586e10de1d6d5c579126ed4bb2f31e50a8448ed5390d12e226cd075537007 libsignal-0.46.2.tar.gz
3adccc33d4efa29e003175d0e00cceb169426a73f467ea32406e9cd721c72aeaa45a7816985e484b8adceb2de2a6405f306f6d609b43a25c950b18dd49a14476 ringrtc-2.41.0.tar.gz 5cb7e88e8c04244a8f4727237dd0662357eb84dfb384de57c6579f01f0c53944d019a2af29efe37c4d30993fdba4be6f9bd9f7975ac24e43207fe814e0b95f95 ringrtc-2.42.0.tar.gz
6dc8c709986816e724a57d056a165cf72db70644593e8de8e3026e511d1f8f3d6d5e171d500cfabe760309c5a81795b667b4399c9885be30163d326cbc82c1b4 webrtc-6261g.tar.zst 89796d611bd7cda7c0e98318826753b1acc373396d77f2a0a826bf95e9e28d2c0f33181705b50b1afc52fdf12dbf3d35e30ad86b0ce3052ed9131ea20c842d04 webrtc-6261i.tar.zst
84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28 stokenizer-0.2.1.tar.gz 84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28 stokenizer-0.2.1.tar.gz
be5b4e823543b79175a12314f10c6326d9f0d59f470136962daed4665887006acc05b48b40dc1b67747396d8f6f7d23be298c1e110ccdd35ff9b09d5e6b80bab bettersqlite-use-system-sqlcipher.patch be5b4e823543b79175a12314f10c6326d9f0d59f470136962daed4665887006acc05b48b40dc1b67747396d8f6f7d23be298c1e110ccdd35ff9b09d5e6b80bab bettersqlite-use-system-sqlcipher.patch
92de6fc7cc5f2b6d65bedbd74cc733dd86dafc9cbfb9b727c3267aef63a71a07247cde9b163c68fddfeb9096dcd7f554d36d0b2de078d8905e3825645ddbd6eb libsignal-auditable.patch 92de6fc7cc5f2b6d65bedbd74cc733dd86dafc9cbfb9b727c3267aef63a71a07247cde9b163c68fddfeb9096dcd7f554d36d0b2de078d8905e3825645ddbd6eb libsignal-auditable.patch
152435231cdcf52a17a9e24aadf95d77511258e818172941ba074a73a90a541f0136feb58868674f2bcb19191a6d12933fe6cd5baf3ee99e508915c72523163b signal-disable-updates.patch 152435231cdcf52a17a9e24aadf95d77511258e818172941ba074a73a90a541f0136feb58868674f2bcb19191a6d12933fe6cd5baf3ee99e508915c72523163b signal-disable-updates.patch
d50eb5724502df9ea4d795db8cfc27af767c25168d7db2af512e615be7cc2ca290210a9ae78e1abb153c0198677e858ad3d74926c958099d0319295e7d9e7f1d signal-update-links.patch d50eb5724502df9ea4d795db8cfc27af767c25168d7db2af512e615be7cc2ca290210a9ae78e1abb153c0198677e858ad3d74926c958099d0319295e7d9e7f1d signal-update-links.patch
646d303fe58cae3f0896ae0275a66695b902fae6ddde7c568cc9798157dee9f45ceff907bc951fadc4c511d512a73d114b4e4f7c8914e2311c63929d29e1621a signal-show-window-please.patch 646d303fe58cae3f0896ae0275a66695b902fae6ddde7c568cc9798157dee9f45ceff907bc951fadc4c511d512a73d114b4e4f7c8914e2311c63929d29e1621a signal-show-window-please.patch
ab51b8fdcda1d8811213d2c5d8cb5d8457b478a02e23ce40f36b38ec56d45a3bd7a2d184720c27046f98a27771551cfad93c1290fe93856cc02695d318b33e47 ringrtc-webrtc-renamed.patch 3df878d259cdc12fe116651e9978deb6c15b5bce477d692b2301f17bc660327b29ac4412cfd6966bd0cef15c90675c56ce7c3abd8e2119899cc5d281ab1d9474 signal-fix-dns-fallback.patch
b11fdd930943ca327650e4738ed85cd6b5eea779455a5895bccebba98e449bafc6b0f09bcf4545f2b2e16644355664e9768dd6d4d62f87619207c430367f72c5 ringrtc-webrtc-renamed.patch
9d92389637cdda83a0a7039fa6c52516d7bc491d0b1e42d5374b9d1f4fa7b9c930642f2dca896da17a2dc3344fa1bb97434c8dddd0539a4fedfd0dec809fc875 webrtc-shared-like-my-wife.patch 9d92389637cdda83a0a7039fa6c52516d7bc491d0b1e42d5374b9d1f4fa7b9c930642f2dca896da17a2dc3344fa1bb97434c8dddd0539a4fedfd0dec809fc875 webrtc-shared-like-my-wife.patch
e07ae8544988d402aaf0fbd95ea36a64c94c59566c561132578aa6dcf8ff11a34058530e64dc204e5cadc2482f1401e74b32384a144e5e08017c663d0cf7c2fc webrtc-compiler.patch e07ae8544988d402aaf0fbd95ea36a64c94c59566c561132578aa6dcf8ff11a34058530e64dc204e5cadc2482f1401e74b32384a144e5e08017c663d0cf7c2fc webrtc-compiler.patch
88515d8b8cc82355c9f9b0f44fac83b7ff149b13e9fb102fd46036ec5234cfb2385fa5ad58a0520ee604b93dc4ddd6ae18a7005978ef207841645724ef7a9749 webrtc-gcc13.patch 88515d8b8cc82355c9f9b0f44fac83b7ff149b13e9fb102fd46036ec5234cfb2385fa5ad58a0520ee604b93dc4ddd6ae18a7005978ef207841645724ef7a9749 webrtc-gcc13.patch

View file

@ -1,19 +1,23 @@
--- ./src/rust/build.rs.orig --- ./src/rust/build.rs.orig
+++ ./src/rust/build.rs +++ ./src/rust/build.rs
@@ -41,15 +41,15 @@ @@ -79,6 +79,7 @@
if cfg!(feature = "native") {
if let Ok(out_dir) = out_dir {
println!(
- "cargo:rustc-link-search=native={}/{}/obj/",
+ "cargo:rustc-link-search=native={}/{}/",
out_dir, build_type,
);
- println!("cargo:rerun-if-changed={}/{}/obj/", out_dir, build_type,);
+ println!("cargo:rerun-if-changed={}/{}/", out_dir, build_type,);
} else {
println!("cargo:warning=No WebRTC output directory (OUTPUT_DIR) defined!");
}
if cfg!(feature = "native") {
let webrtc_dir = if cfg!(feature = "prebuilt_webrtc") {
+ panic!("trying to download prebuild webrtc");
if let Err(e) = fs::create_dir_all(&out_dir) {
panic!("Failed to create webrtc out directory: {:?}", e);
}
@@ -86,12 +87,12 @@
// Ignore build type since we only have release prebuilts
format!("{}/release/obj/", out_dir)
} else {
- format!("{}/{}/obj", out_dir, build_type)
+ format!("{}/{}", out_dir, build_type)
};
println!("cargo:rerun-if-changed={}", webrtc_dir);
println!("cargo:rerun-if-changed={}", config_dir());
println!("cargo:rustc-link-search=native={}", webrtc_dir);
- println!("cargo:rustc-link-lib=webrtc"); - println!("cargo:rustc-link-lib=webrtc");
+ println!("cargo:rustc-link-lib=dylib=signaldeswebrtc"); + println!("cargo:rustc-link-lib=dylib=signaldeswebrtc");

View file

@ -0,0 +1,12 @@
diff --git a/ts/scripts/generate-dns-fallback.ts.orig b/ts/scripts/generate-dns-fallback.ts
index dec7023..39f442f 100644
--- a/ts/scripts/generate-dns-fallback.ts.orig
+++ b/ts/scripts/generate-dns-fallback.ts
@@ -20,7 +20,6 @@ const FALLBACK_DOMAINS = [
'cdn3.signal.org',
'updates2.signal.org',
'sfu.voip.signal.org',
- 'create.signal.art',
];
async function main() {