backports/signal-desktop/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=signal-desktop
-pkgver=7.39.0
+pkgver=7.40.0
 pkgrel=0
 pkgdesc="A messaging app for simple private communication with friends"
 url="https://github.com/signalapp/Signal-Desktop/"
@@ -67,9 +67,9 @@ makedepends="
 options="net !check"
 
 # use _check_depends to validate this
-_libsignalver=0.65.0
-_ringrtcver=2.49.2
-_webrtcver=6723c
+_libsignalver=0.65.2
+_ringrtcver=2.49.3
+_webrtcver=6834c
 _stokenizerver=0.2.1
 
 source="
@@ -89,6 +89,7 @@ source="
 	webrtc-compiler.patch
 	webrtc-gcc13.patch
 	webrtc-rollback-red.patch
+	webrtc-rollback-3rdparty-build-gn.patch
 
 	signal-desktop.sh
 	"
@@ -457,10 +458,10 @@ package() {
 }
 
 sha512sums="
-a94d52ef8b4d96786c2794b7fa25dc881e410c4c240cb642339d2bc69c3c43109a8a77d2e3d68b0e9335b1fc5b5ac653a82f7dbdbfc48d7defd60cbed2d1a32a  Signal-Desktop-7.39.0.tar.gz
-ecd7575cf7e3d5ba2c0ebd8b3d2835b041219fdb9982263c125ec06e8e999ee3c6ce6b23c00f22991883edc8974e7a7943330def4e9d24a727c16bedaad520c0  libsignal-0.65.0.tar.gz
-159ea7842cb2d8ba9e31a1a093b1e094f8288b6a2eb35d213e1e3beeeec867b416926364daa1db21232d44602d00069d5474293a679487e2f7dce344ced0a5b0  ringrtc-2.49.2.tar.gz
-89b4bfdf86d3d38daea00892cb27af6aaefd1bf01110d3528724223a64f7a0b06109e792f199dfa7f612983d2b49079b086fdf4d3475c655846c2b916d289c74  webrtc-6723c.tar.zst
+f5991bc6b5a50eab1b4b7b843102ecf5131d2eaa270203475d8612134f57be31011c8555b6f7a3f36034eae654a6ee3ddad253129fa2edd895373a2089c733a0  Signal-Desktop-7.40.0.tar.gz
+96ada8462dcde98ee12eb12bd6ebb62f84105792c7337c3c3e7651b19fa22cd6cc7c3a414d04c309780cd3455c82620b95ad2e73c1916606d9f29bd07a0a3f03  libsignal-0.65.2.tar.gz
+f25f57791c18196846599e3794791e0d900cd887a936c6e09c919a60db66d012794a40120e4baae83ad2741b74515d6e2e5a1434cd88c3865100d5f19080a3d1  ringrtc-2.49.3.tar.gz
+0da308e8484fd0863947b871d0f702052ab2c416a3ff2a34fb60b7b57867e6663bdd0b882be7efc3645019b9029bd185367ca3f5867d25a3417b76da7e9439a5  webrtc-6834c.tar.zst
 84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28  stokenizer-0.2.1.tar.gz
 8d2d2d82c8546c2dd1fef161b61df79918f8c22235a56a46adb375a0beb4acef12c5fe53e67242a4be97f77adc522ff79b47949c352956c742a70d50f4179f7f  libsignal-auditable.patch
 18d5a0208d75fa910b6c0d531997402bba83290dfc7d7ce903acdcd0ce1d88bd3026ace40ecd32a88c2e429e48530b4e40f207a3d15bd9c0d6ebc8c447fa8ff9  signal-use-system-sqlcipher.patch
@@ -470,7 +471,8 @@ fc2af28645364cd85c106304a26811b036f6be048c52137fbbcc112870a84132a181f532563e0569
 02a648bb8541a39c75fec2db39f024a27976afca41908eefa2fe1f2e30b05b5d59f980ccc930021c0b0c09ba8b0cbcae071e9f0dd530543c667adbc4272af552  ringrtc-webrtc-renamed.patch
 98a7e4df27c3ed56c5968ebc3ae8e08bfb54362d0c910f9af1d414079a6d5fe0f18aa570ae3c38042f4691af6a130cb3ff689625e26a3987720dd319a5f587b1  webrtc-shared-libs.patch
 fe78cdc58c18826fc4227cc8e9377980766229390544578f6a1a6f7322bc3243c066963b589323dbfe4f2bfd37f8859ad84f63cb3783317892e5ae3652270a3a  webrtc-compiler.patch
-48ab5c733e643eaff08ccbe839086bebbb68d397984ad7c5c5b68df8071f75d2dfe92c3f52d9fbf9b81754934bdfa8a67c69addd476ce4265b978592fb4ff9bd  webrtc-gcc13.patch
-ee5c87387c5566901ec5aefe1bb6b59e0f47e2a640dd21c194c98f721f3518f7a2ba68fb9d11e27d170e255fcb0b3825b8c929ae75958b77d43751af97baf99b  webrtc-rollback-red.patch
+3f1095861a79862ab5a55c86d7e353d272974617afba39e4d4441024bede8d7b9b8e122da90d56a9c3c0965171803d6b9e29e91d78167a08c6bcc86b3eedab18  webrtc-gcc13.patch
+8f53dcf3264c5cec338f037e57a7770ec939ee06dfb0c5dfeab23967a3a64d3f861a6b5419766ac892676036b4522bce2f47279ca3658b5c0b6a31c82ac05053  webrtc-rollback-red.patch
+f8bd574a0de077a643ced26e8a0e3f162e014bbf91c957bbefd113883a70e2b63e483bf400b7e2da8d09edfe76d4f6a257f194a14124f344f1625c5632d12acb  webrtc-rollback-3rdparty-build-gn.patch
 87534e7b5ad7365509eab75629e6bd1a9ed61ee92f7e358405a0abaf0df57de14623fb3894eb082f8785422e5c087e1c50f9e2e5cafbb2529591fd7bf447f7f5  signal-desktop.sh
 "

backports/signal-desktop/webrtc-gcc13.patch

@@ -17,4 +17,15 @@
 +#include <cstdint>
  #include <limits>
  #include <vector>
+
+--- ./webrtc/rtc_base/ssl_stream_adapter.h.orig
++++ ./webrtc/rtc_base/ssl_stream_adapter.h
+@@ -24,6 +24,7 @@
+ #include "rtc_base/ssl_certificate.h"
+ #include "rtc_base/ssl_identity.h"
+ #include "rtc_base/stream.h"
++#include <optional>
  
+ namespace rtc {
+ 
+

backports/signal-desktop/webrtc-rollback-3rdparty-build-gn.patch

@@ -0,0 +1,31 @@
+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
+@@ -55,12 +55,10 @@ group("jpeg_includes") {
+ component("freetype_harfbuzz") {
+   public_configs = []
+   public_deps = []
+-  if (enable_freetype) {
+-    if (use_system_freetype) {
+-      public_configs += [ "//build/linux:freetype_from_pkgconfig" ]
+-    } else {
+-      public_deps += [ "//third_party/freetype:freetype_source" ]
+-    }
++  if (use_system_freetype) {
++    public_configs += [ "//build/linux:freetype_from_pkgconfig" ]
++  } else {
++    public_deps += [ "//third_party/freetype:freetype_source" ]
+   }
+   if (use_system_harfbuzz) {
+     public_configs += [ "//third_party/harfbuzz-ng:harfbuzz_from_pkgconfig" ]
+@@ -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" ]
+ }

backports/signal-desktop/webrtc-rollback-red.patch

@@ -11,12 +11,10 @@ index d60f3d5e7ba..d561dedd1d0 100644
  
  namespace webrtc {
  namespace rffi {
-@@ -29,10 +29,8 @@ void CreateSessionDescriptionObserverRffi::OnSuccess(SessionDescriptionInterface
+@@ -29,8 +29,8 @@ void CreateSessionDescriptionObserverRffi::OnSuccess(SessionDescriptionInterface
    // TODO tweak the response a little
    std::string sdp;
    if (session_description->ToString(&sdp)) {
--    static LazyRE2 fmtp_re = {"(a=fmtp:111 ((?!cbr=).)*)\r?\n"};
--    RE2::Replace(&sdp, *fmtp_re, "$1;cbr=1\r\n");
 -    static LazyRE2 ssrc_re = {".+urn:ietf:params:rtp-hdrext:ssrc-audio-level.*\r?\n"};
 -    RE2::Replace(&sdp, *ssrc_re, "");
 +    sdp = std::regex_replace(sdp, std::regex("(a=fmtp:111 ((?!cbr=).)*)\r?\n"), "$1;cbr=1\r\n");