From 2e411e11f253a2b8e3668fcfb7efa706ee98b860 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 7 Jan 2026 22:37:17 -0500 Subject: [PATCH] backports/signal-desktop: upgrade to 7.84.0 --- backports/signal-desktop/APKBUILD | 28 +++++---- .../signal-do-not-package-desktop-entry.patch | 8 +-- .../signal-rollback-locale-changes.patch | 35 ++++++----- .../signal-show-window-please.patch | 6 +- .../signal-desktop/signal-update-links.patch | 14 +++-- ...ion-that-change-meaning-inside-class.patch | 58 ------------------- 6 files changed, 46 insertions(+), 103 deletions(-) delete mode 100644 backports/signal-desktop/webrtc-fix-declaration-that-change-meaning-inside-class.patch diff --git a/backports/signal-desktop/APKBUILD b/backports/signal-desktop/APKBUILD index ede5795..a36ca7f 100644 --- a/backports/signal-desktop/APKBUILD +++ b/backports/signal-desktop/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Antoine Martin (ayakael) # Maintainer: Antoine Martin (ayakael) pkgname=signal-desktop -pkgver=7.76.0 -pkgrel=1 +pkgver=7.84.0 +pkgrel=0 pkgdesc="A messaging app for simple private communication with friends" url="https://github.com/signalapp/Signal-Desktop/" # same as electron @@ -65,9 +65,9 @@ makedepends=" options="net !check" # use _check_depends to validate this -_libsignalver=0.83.0 -_ringrtcver=2.59.0 -_webrtcver=7339c +_libsignalver=0.86.3 +_ringrtcver=2.61.0 +_webrtcver=7444a _sqlcipherver=2.4.4 source=" @@ -90,7 +90,6 @@ source=" webrtc-shared-libs.patch webrtc-compiler.patch webrtc-use-only-payloadtypesuggester-for-pt-assignement.patch - webrtc-fix-declaration-that-change-meaning-inside-class.patch webrtc-rtcbase-platform-thread-type-do-not-include-linux-prctl-header.patch signal-desktop.sh @@ -481,25 +480,24 @@ package() { } sha512sums=" -c847d3679df77ca137b4c3345b3b941a08639677efcd5eeea6613572fa90b8ad1b8d1d53e077902d4f47c05c480c408787024906d6917dcbf4a840838bf6d79d Signal-Desktop-7.76.0.tar.gz -43271a64f65a4cf0e7855fb84476ff811ef248665cb74fdaa9ce12b02d2039abdf8fca28554e7e884eabaa9bdd77e8f5383e6354e589436671675ddab7194d81 libsignal-0.83.0.tar.gz -ba4a1850bd096470a6370a0bf730550f64df4a2349cacca3b4864ef1a3a04713dd200307b9ad7ba47425322573148d6bd2ce85c11c2a49232d41e739ef5e788d ringrtc-2.59.0.tar.gz +bc39d85c43c29cc4c0e550d6bfb76999011e06b980018813899e0b3fdf50d9a810c38591db00ed3ebf0d29f30667a1ccc56f7ac4fec8816d43c7ad30e3bf185f Signal-Desktop-7.84.0.tar.gz +9cce1053f81890172b34c756b759140eaf80d26978ff908d2de990267bf1bef30f4936cdda91acef1033bb8c81721f5bea9ccd8d444796a9dbff4e10895b71e2 libsignal-0.86.3.tar.gz +c260b8a01a1315f64a54d6953f57c5771f9941ad0cb9bed2334f802240bd6b8730182538a8c20793857cb0e636eeae8a5dc868d09f3e0db8d763f7a921f29255 ringrtc-2.61.0.tar.gz 79dd21548329b4ee409fa73b013c18ed4e85038aeef7a4cfe196fd6b5113279da8ad287a259fa6a6b546b52a5a6dd6ae2cb1050007043d25f76d7917dbbbc02d node-sqlcipher-2.4.4.tar.gz -06ffb4cdb82f818cc419d42ff2de03977d7e94c5f3eb8ac8a401bcb52ec38fa988c5d757f4bd79e5d9968fa83754fc9046180c950961c90a59eeb6130bf5552f webrtc-7339c.tar.zst +0b04222e96cf1be6f5467539a428b2889f33f2668d5796509edc8dac007b35e0d3f91ad2436273f41bfdfc1b2dc834422c84ac7944c43376a063f206e4fbd6ce webrtc-7444a.tar.zst 8d2d2d82c8546c2dd1fef161b61df79918f8c22235a56a46adb375a0beb4acef12c5fe53e67242a4be97f77adc522ff79b47949c352956c742a70d50f4179f7f libsignal-auditable.patch 7ee747c8aaa9d6e9149fe0a031e3d4cc9e9c08f22c42076bd05e2acb86952f8170032613d13a53716010edfa3f26ad97b530e82460318eb46a42e28cf5faeb9d signal-use-system-sqlcipher.patch ef3622da416a5bd2d4bea4f2a4fbb21a985f660d4acc17bbe66ce51ac1180ab92c0c843a5414ff56ea1deda87c2b0f611a299ca8ebe4d6a24df53626b36ceea8 signal-disable-updates.patch -853de84d636f730694f17bcec63463fa7bfbdd0a7f7a64618a8fc6bc523ce1a9854b4c651753735af735c18101295d3efbe54f83ae0bccbed83c8c1fee3e7049 signal-update-links.patch -882d6889b23a3ebc6449c8b6acec8c3853674a7e94f066d65b57bab674ba8c11d582ba2c760825cb67b9202716e6d8b7123001d1e9f9229e49a0b77e9d978265 signal-show-window-please.patch -3dd3bf2f6925e2672a20ef56bbac519099d54e912e5a434a0649ea152db5039dbe1bbade3430b485ae9a6085d747dd88602d4efc5198d5a4dbf1b8359de11f94 signal-rollback-locale-changes.patch +60f843fb72d18aa7a48e47a751737b9432e3860dc7390b9094acb211df8b383293f2b4299787a6458999dfd185b502bdeecb717731724e68e37fc098a3afa3ed signal-update-links.patch +e09a573e579bb464fccecbe80d1c197ec316dce420d1e2cd18a5661c2831871099766439d08b8000638c23b9652b3ef598a33c7453507b3fd246e9630c86bdd2 signal-show-window-please.patch +b428a80478f2151a8a28858a92c604533ab7c8d2f39ec9797a80a4397e8e242754ab2cf08c8641d967b7966e45bca6357e92a8d83acdcddbde386e1cc97b4b9b signal-rollback-locale-changes.patch 961568777b86f8fbcc73360252123686c9d1e16b2650f23d8afbc6d7580d53024f81b62e9e9cbdcd0031b5cf99854bd47c6dd4580197f2b27b8b4cbb51c6c9c9 signal-do-not-package-sqlcipher-deps.patch -d8cafd4ae1f7438417f5c414d68a175c3d24b66a14b9f3b8ca9c9acae2b2eaa68985ee81c1df7d754a206ff1c9b02929803440fb0734db38b6ac9ab3e34205b0 signal-do-not-package-desktop-entry.patch +03ee8d925d610990a1003e976d91f214a4781c879063bdc91ba9a705edfd3f25235f6ec075d4e663a296cdbd872832b7e818aec4c451716d1000f393dc0d39ee signal-do-not-package-desktop-entry.patch 02a648bb8541a39c75fec2db39f024a27976afca41908eefa2fe1f2e30b05b5d59f980ccc930021c0b0c09ba8b0cbcae071e9f0dd530543c667adbc4272af552 ringrtc-webrtc-renamed.patch 19d2e07bdc0b160ec542fcb0a3d94ae1e37dcb1b3455e57b278cf074f8aac625341b47f4f06a1f7eb5a197cb0f11754de8785ffd10876852972cbfafdc2615db ringrtc-use-sh.patch a9374040dcbc9203c8a3b4ad1cf97d58805cd4755f4f585a988b113697ea97d5900ad68f6a30aa0621f34ab54ae98984a8ce228a2d08186ee1bf3384abf3f364 webrtc-shared-libs.patch 8ba740f0552872ddf383545a6bb99bf7bcdd2610cee51c6e69dc667893006facd5d72f62274e25c1a58e1a58c8e8b0b5303b648e4c74a71925639cc9691c72c4 webrtc-compiler.patch d44f62e4ccf2d9094d6ed217b24fa2cde276c7f64f4d6fd26e84dfc021ea667abcb21f9e4666cfd0d88d6ee0a6b1a20b6cc68c8720462711e3b5451e263f6c4a webrtc-use-only-payloadtypesuggester-for-pt-assignement.patch -ace87a2be03c6965012a87a10918c5923b10d5e74a7169c1e1384c15b34a367d0c47e806764c368cc30dad01a3dce54b50587abea9831130178db3806619abc8 webrtc-fix-declaration-that-change-meaning-inside-class.patch d17ecd89e867b24a21144d267e1bf7d09e3898018a0f9fcd87084b9de8091bc56f904a1cabdc487a8e46ab509c11ddd363c574d75d85a79e3c4d9424a13b2093 webrtc-rtcbase-platform-thread-type-do-not-include-linux-prctl-header.patch 8e1de53ec1608fa05972af605213e8423b8f88cfd8d6a1989bdcaf77ed1420871c39efa15c56ffeccb6ff86677acc5bc436020f3554bee4f94930c7d9f4e16b6 signal-desktop.sh " diff --git a/backports/signal-desktop/signal-do-not-package-desktop-entry.patch b/backports/signal-desktop/signal-do-not-package-desktop-entry.patch index 7a973a1..6302fbb 100644 --- a/backports/signal-desktop/signal-do-not-package-desktop-entry.patch +++ b/backports/signal-desktop/signal-do-not-package-desktop-entry.patch @@ -1,16 +1,16 @@ diff --git a/Signal-Desktop/package.json.orig b/Signal-Desktop/package.json -index 832035e..e6ac14c 100644 +index 64782c6..0880002 100644 --- a/Signal-Desktop/package.json.orig +++ b/Signal-Desktop/package.json -@@ -519,11 +519,6 @@ - }, +@@ -522,11 +522,6 @@ "linux": { + "executableName": "signal-desktop", "category": "Network;InstantMessaging;Chat", - "desktop": { - "entry": { - "StartupWMClass": "signal" - } - }, + "artifactName": "${name}_${version}_${arch}.${ext}", "target": [ "deb" - ], diff --git a/backports/signal-desktop/signal-rollback-locale-changes.patch b/backports/signal-desktop/signal-rollback-locale-changes.patch index 97e2cf9..51f1235 100644 --- a/backports/signal-desktop/signal-rollback-locale-changes.patch +++ b/backports/signal-desktop/signal-rollback-locale-changes.patch @@ -29,25 +29,24 @@ index 04dd9f9200b..e7b69ef963f 100644 }, "js/**", "libtextsecure/**", -diff --git a/Signal-Desktop/app/locale.ts.orig b/Signal-Desktop/app/locale.ts -index a63eef4079d..2a959da4d0d 100644 ---- a/Signal-Desktop/app/locale.ts.orig -+++ b/Signal-Desktop/app/locale.ts -@@ -1,9 +1,8 @@ +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 @@ // Copyright 2017 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only -import { join } from 'node:path'; -import { readFileSync } from 'node:fs'; --import { app } from 'electron'; +import { join } from 'path'; +import { readFileSync } from 'fs'; import lodash from 'lodash'; import * as LocaleMatcher from '@formatjs/intl-localematcher'; import { z } from 'zod'; -@@ -16,9 +15,6 @@ import type { LocalizerType } from '../ts/types/Util'; - import * as Errors from '../ts/types/errors'; - import { parseUnknown } from '../ts/util/schemas'; +@@ -20,9 +20,6 @@ import { parseUnknown } from '../ts/util/schemas.std.js'; + + const { merge } = lodash; -type CompactLocaleMessagesType = ReadonlyArray; -type CompactLocaleKeysType = ReadonlyArray; @@ -55,7 +54,7 @@ index a63eef4079d..2a959da4d0d 100644 const TextInfoSchema = z.object({ direction: z.enum(['ltr', 'rtl']), }); -@@ -29,17 +25,6 @@ function getLocaleMessages(locale: string): LocaleMessagesType { +@@ -33,17 +30,6 @@ function getLocaleMessages(locale: string): LocaleMessagesType { return JSON.parse(readFileSync(targetFile, 'utf-8')); } @@ -73,7 +72,7 @@ index a63eef4079d..2a959da4d0d 100644 export type LocaleDisplayNames = Record>; export type CountryDisplayNames = Record>; -@@ -154,42 +139,13 @@ export function load({ +@@ -160,42 +146,13 @@ export function load({ logger.info(`locale: Matched locale: ${matchedLocale}`); @@ -83,7 +82,7 @@ index a63eef4079d..2a959da4d0d 100644 const countryDisplayNames = getCountryDisplayNames(); - let finalMessages: LocaleMessagesType; -- if (app.isPackaged) { +- if (isPackaged) { - const matchedLocaleMessages = getCompactLocaleValues(matchedLocale); - const englishMessages = getCompactLocaleValues('en'); - const keys = getCompactLocaleKeys(); @@ -119,17 +118,17 @@ index a63eef4079d..2a959da4d0d 100644 + const finalMessages = merge(englishMessages, matchedLocaleMessages); const i18n = setupI18n(matchedLocale, finalMessages, { renderEmojify: shouldNeverBeCalled, - }); -diff --git a/Signal-Desktop/ts/scripts/generate-compact-locales.ts.orig b/Signal-Desktop/ts/scripts/generate-compact-locales.ts -index 7187d287acc..9a17d638f44 100644 ---- a/Signal-Desktop/ts/scripts/generate-compact-locales.ts.orig -+++ b/Signal-Desktop/ts/scripts/generate-compact-locales.ts + 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 @@ import { readdir, mkdir, readFile, writeFile } from 'node:fs/promises'; import { join, dirname } from 'node:path'; -import pMap from 'p-map'; --import { isLocaleMessageType } from '../util/setupI18nMain.js'; +-import { isLocaleMessageType } from '../util/setupI18nMain.std.js'; - -async function compact({ - sourceDir, diff --git a/backports/signal-desktop/signal-show-window-please.patch b/backports/signal-desktop/signal-show-window-please.patch index c8c5a65..8357e37 100644 --- a/backports/signal-desktop/signal-show-window-please.patch +++ b/backports/signal-desktop/signal-show-window-please.patch @@ -1,7 +1,7 @@ -diff --git a/Signal-Desktop/app/main.ts.orig b/Signal-Desktop/app/main.ts +diff --git a/Signal-Desktop/app/main.main.ts.orig b/Signal-Desktop/app/main.main.ts index aa1bec8..bd7c1d5 100644 ---- a/Signal-Desktop/app/main.ts.orig -+++ b/Signal-Desktop/app/main.ts +--- a/Signal-Desktop/app/main.main.ts.orig ++++ b/Signal-Desktop/app/main.main.ts @@ -690,7 +690,7 @@ async function createWindow() { : DEFAULT_HEIGHT; diff --git a/backports/signal-desktop/signal-update-links.patch b/backports/signal-desktop/signal-update-links.patch index afd0b6b..323b927 100644 --- a/backports/signal-desktop/signal-update-links.patch +++ b/backports/signal-desktop/signal-update-links.patch @@ -1,6 +1,8 @@ ---- ./Signal-Desktop/ts/components/DialogExpiredBuild.tsx.orig -+++ ./Signal-Desktop/ts/components/DialogExpiredBuild.tsx -@@ -23,9 +23,9 @@ +diff --git a/Signal-Desktop/ts/components/DialogExpiredBuild.dom.tsx.orig b/Signal-Desktop/ts/components/DialogExpiredBuild.dom.tsx +index ef929c7..202251a 100644 +--- a/Signal-Desktop/ts/components/DialogExpiredBuild.dom.tsx.orig ++++ b/Signal-Desktop/ts/components/DialogExpiredBuild.dom.tsx +@@ -23,9 +23,9 @@ export function DialogExpiredBuild({ containerWidthBreakpoint={containerWidthBreakpoint} type="error" onClick={() => { @@ -12,8 +14,10 @@ hasAction > {i18n('icu:expiredWarning')}{' '} ---- ./Signal-Desktop/ts/types/support.ts.orig -+++ ./Signal-Desktop/ts/types/support.ts +diff --git a/Signal-Desktop/ts/types/support.std.ts.orig b/Signal-Desktop/ts/types/support.std.ts +index 4fd97f0..cb4be22 100644 +--- a/Signal-Desktop/ts/types/support.std.ts.orig ++++ b/Signal-Desktop/ts/types/support.std.ts @@ -1,7 +1,7 @@ // Copyright 2023 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only diff --git a/backports/signal-desktop/webrtc-fix-declaration-that-change-meaning-inside-class.patch b/backports/signal-desktop/webrtc-fix-declaration-that-change-meaning-inside-class.patch deleted file mode 100644 index 565f8d2..0000000 --- a/backports/signal-desktop/webrtc-fix-declaration-that-change-meaning-inside-class.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/webrtc/p2p/base/port_interface.h b/webrtc/p2p/base/port_interface.h -index 2335fc2..1484a14 100644 ---- a/webrtc/p2p/base/port_interface.h -+++ b/webrtc/p2p/base/port_interface.h -@@ -55,7 +55,7 @@ - virtual ~PortInterface(); - - virtual IceCandidateType Type() const = 0; -- virtual const Network* Network() const = 0; -+ virtual const ::webrtc::Network* Network() const = 0; - - // Methods to set/get ICE role and tiebreaker values. - virtual void SetIceRole(IceRole role) = 0; -diff --git a/webrtc/pc/codec_vendor.h b/webrtc/pc/codec_vendor.h -index aaddc4f..719a082 100644 ---- a/webrtc/pc/codec_vendor.h -+++ b/webrtc/pc/codec_vendor.h -@@ -119,7 +119,7 @@ - class CodecLookupHelper { - public: - virtual ~CodecLookupHelper() = default; -- virtual PayloadTypeSuggester* PayloadTypeSuggester() = 0; -+ virtual ::webrtc::PayloadTypeSuggester* PayloadTypeSuggester() = 0; - // Look up the codec vendor to use, depending on context. - // This call may get additional arguments in the future, to aid - // in selection of the correct context. -diff --git a/webrtc/pc/jsep_transport.h b/webrtc/pc/jsep_transport.h -index 017aad7..50dc991 100644 ---- a/webrtc/pc/jsep_transport.h -+++ b/webrtc/pc/jsep_transport.h -@@ -115,14 +115,12 @@ - } - - RTCError SetLocalJsepTransportDescription( -- const JsepTransportDescription& jsep_description, -- SdpType type); -+ const JsepTransportDescription& jsep_description, SdpType type); - - // Set the remote TransportDescription to be used by DTLS and ICE channels - // that are part of this Transport. - RTCError SetRemoteJsepTransportDescription( -- const JsepTransportDescription& jsep_description, -- SdpType type); -+ const JsepTransportDescription& jsep_description, SdpType type); - RTCError AddRemoteCandidates(const Candidates& candidates); - - // Set the "needs-ice-restart" flag as described in JSEP. After the flag is -@@ -204,7 +202,9 @@ - return rtp_dtls_transport_; - } - -- scoped_refptr SctpTransport() const { return sctp_transport_; } -+ scoped_refptr<::webrtc::SctpTransport> SctpTransport() const { -+ return sctp_transport_; -+ } - - // TODO(bugs.webrtc.org/9719): Delete method, update callers to use - // SctpTransport() instead. -- 2.49.1