From ff2840345eb3b049b9deb4472e2e6fc73f05e935 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 9 Jan 2025 08:58:38 -0500 Subject: [PATCH] backports/signal-desktop: upgrade to 7.37.0 --- backports/signal-desktop/APKBUILD | 18 +++++----- .../ringrtc-webrtc-renamed.patch | 34 ++++++++++--------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/backports/signal-desktop/APKBUILD b/backports/signal-desktop/APKBUILD index ae59954..e64df73 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=7.36.1 +pkgver=7.37.0 pkgrel=0 pkgdesc="A messaging app for simple private communication with friends" url="https://github.com/signalapp/Signal-Desktop/" @@ -66,9 +66,9 @@ makedepends=" options="net !check" # use _check_depends to validate this -_libsignalver=0.62.0 -_ringrtcver=2.48.7 -_webrtcver=6723a +_libsignalver=0.64.1 +_ringrtcver=2.49.1 +_webrtcver=6723b _stokenizerver=0.2.1 source=" @@ -455,17 +455,17 @@ package() { } sha512sums=" -ccdd98fb26dd8cc3c74d3102c9dbdccbc09ee27b4f580228a920269e097111c8af742aef4e13d858576ddd7f28452eba966869349a923767056694e39da2a382 Signal-Desktop-7.36.1.tar.gz -2a1d171a6bf9f1dfea9fc1fbc4f200c8b9e2ccb30d9d63f29007f252ff79ae7d149ab5707a8e430010da90ad1e3112475bd0eba8efb5cc011d5e3098aa1e26de libsignal-0.62.0.tar.gz -e5e5ab27dc3bd37ef577c248d450e70fa11e72bdfab00fef233aad84d3d8aa3434166c03267f6b95b69d593e9da2f37017b5b7a0913f68499f387354742ba50a ringrtc-2.48.7.tar.gz -64eed5c2a6f5a505d014bc4fa80e15b21103df1ea27825eaa1dfecc23c269f198a7e98472f29de7cae4ac7fa4fede6e837c27494b8ec4d03e36b85b029c64831 webrtc-6723a.tar.zst +3c922ece17adb8bff292f1b799b4653b65c662ffe4085627ca578d62bcb7c146dff6f5b000940aec44a27b8b3af41337b7bcea3730c8fc3839b449c94f148e55 Signal-Desktop-7.37.0.tar.gz +a3c02fc38a8a3032dab6aad9e89c2952b1c49fedfcd892d060c6274d9bcf7c02fd38b325b32456d47f4c6a16982af0b6fc7428e0e8b23a683667aebfc8f5953d libsignal-0.64.1.tar.gz +394f38bc4f815e716b1ff8a874453823ec7bd088239ea6c55f196200e921cccdbb2efa781b54df4ea48a0fcdf9526ab71b47f8d7cbc3b68b58114bba32fe384d ringrtc-2.49.1.tar.gz +433ca889f458ed8327ca18685491f6ddd4a5cec4f268455bc5fce688d19dd7b2878d938cfe6fffb9b0881bc99de9341856baa206269d41bf030bd9d1fecf1455 webrtc-6723b.tar.zst 84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28 stokenizer-0.2.1.tar.gz 8d2d2d82c8546c2dd1fef161b61df79918f8c22235a56a46adb375a0beb4acef12c5fe53e67242a4be97f77adc522ff79b47949c352956c742a70d50f4179f7f libsignal-auditable.patch 18d5a0208d75fa910b6c0d531997402bba83290dfc7d7ce903acdcd0ce1d88bd3026ace40ecd32a88c2e429e48530b4e40f207a3d15bd9c0d6ebc8c447fa8ff9 signal-use-system-sqlcipher.patch fc2af28645364cd85c106304a26811b036f6be048c52137fbbcc112870a84132a181f532563e0569b560fde3cf8c02480666a9b01d804b0008f97c728005b1c7 signal-disable-updates.patch 853de84d636f730694f17bcec63463fa7bfbdd0a7f7a64618a8fc6bc523ce1a9854b4c651753735af735c18101295d3efbe54f83ae0bccbed83c8c1fee3e7049 signal-update-links.patch 882d6889b23a3ebc6449c8b6acec8c3853674a7e94f066d65b57bab674ba8c11d582ba2c760825cb67b9202716e6d8b7123001d1e9f9229e49a0b77e9d978265 signal-show-window-please.patch -10284e0d86ab88de161ae689871082194f689ce416f3ebada8991d5db707994ea1cb8b4212756dd93ba5a3469964050988220f18afc37e38f3404a6e17ec8caf ringrtc-webrtc-renamed.patch +02a648bb8541a39c75fec2db39f024a27976afca41908eefa2fe1f2e30b05b5d59f980ccc930021c0b0c09ba8b0cbcae071e9f0dd530543c667adbc4272af552 ringrtc-webrtc-renamed.patch 98a7e4df27c3ed56c5968ebc3ae8e08bfb54362d0c910f9af1d414079a6d5fe0f18aa570ae3c38042f4691af6a130cb3ff689625e26a3987720dd319a5f587b1 webrtc-shared-libs.patch fe78cdc58c18826fc4227cc8e9377980766229390544578f6a1a6f7322bc3243c066963b589323dbfe4f2bfd37f8859ad84f63cb3783317892e5ae3652270a3a webrtc-compiler.patch 48ab5c733e643eaff08ccbe839086bebbb68d397984ad7c5c5b68df8071f75d2dfe92c3f52d9fbf9b81754934bdfa8a67c69addd476ce4265b978592fb4ff9bd webrtc-gcc13.patch diff --git a/backports/signal-desktop/ringrtc-webrtc-renamed.patch b/backports/signal-desktop/ringrtc-webrtc-renamed.patch index 6f8a2b3..6e5e6d1 100644 --- a/backports/signal-desktop/ringrtc-webrtc-renamed.patch +++ b/backports/signal-desktop/ringrtc-webrtc-renamed.patch @@ -1,20 +1,22 @@ ---- ./ringrtc/src/rust/build.rs.orig -+++ ./ringrtc/src/rust/build.rs -@@ -79,6 +79,7 @@ - +diff --git a/ringrtc/src/rust/build.rs.orig b/ringrtc/src/rust/build.rs +index ff2ce04d1cf..ccdaaaef84d 100644 +--- a/ringrtc/src/rust/build.rs.orig ++++ b/ringrtc/src/rust/build.rs +@@ -61,6 +61,7 @@ fn main() { 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) - }; + let webrtc_dir = + if cfg!(feature = "prebuilt_webrtc") || cfg!(feature = "prebuilt_webrtc_sim") { ++ panic!("trying to download prebuild webrtc"); + if let Err(e) = fs::create_dir_all(&out_dir) { + panic!("Failed to create webrtc out directory: {:?}", e); + } +@@ -74,12 +75,12 @@ fn main() { + // 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);