forge/ayaports
1
0
Fork 0
Code Issues 14 Pull requests 8 Projects Releases Packages Wiki Activity Actions

backports/signal-desktop: upgrade to 6.16.0

Browse source
This commit is contained in:
Antoine Martin 2023-05-05 01:22:13 -04:00
parent 56645601ce
commit 4fad6d38b2
Signed by: forge
GPG key ID: D62A472A4AA7D541
5 changed files with 84 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
backports/signal-desktop/APKBUILD
View file

@ -1,8 +1,8 @@
# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks>
# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
pkgname=signal-desktop
pkgver=6.12.0
pkgrel=1
pkgver=6.16.0
pkgrel=0
pkgdesc="A messaging app for simple private communication with friends"
url="https://github.com/signalapp/Signal-Desktop/"
# same as electron
@ -60,11 +60,11 @@ options="net !check"
_libsignalver=0.22.0
# follow signal-desktop package.json -> @signalapp/ringrtc
_ringrtcver=2.25.2
_ringrtcver=2.26.2
# follow ringrtc (on version above) -> config/version.properties -> webrtc.version
# downloading tarball generated with abuild snapshot (with gclient dependencies fetched)
_webrtcver=5481
_webrtcver=5481b
# follow @signalapp/better-sqlite3 (on version in package.json) -> deps/download.js -> TOKENIZER_VERSION
# last bsqlite version: 8.4.3
@ -79,9 +79,11 @@ source="
bettersqlite-use-system-sqlcipher.patch
libsignal-too-new-clang.patch
libsignal-fix-build-rust-1.69.patch
signal-disable-updates.patch
signal-update-links.patch
signal-tasje-whatever-the-fuck-is-ignore-doing-here.patch
signal-show-window-please.patch
webrtc-use-alpine-target.patch
webrtc-no-shared-deps-in-static-lib.patch
@ -450,16 +452,18 @@ package() {
}
sha512sums="
84e1e9f40aed65dbe48a98b8f7c863956e8e4922c6a6d7340db19f949e5077067100568ecab8005ee9ffe272b9f3efaf72f40dbb16aab30952aa1df10844904d Signal-Desktop-6.12.0.tar.gz
0f6fa53d8e9b8fef9af074a8c626ff8f607dd7707ed80ed0b12fbb77186f322f5c8664b5df836c55b2ecac5b08575671a4665568fed5b99d588b78df27a1010e Signal-Desktop-6.16.0.tar.gz
9483c8d302728d6caa123f1fb9a977c7cb3aea09ecd1d2cfb3b19f2f2c66f884c41e37642c89db4eeeb0d607fddf281ba27ba4bd0a90e43b972d0cbc607e1483 libsignal-0.22.0.tar.gz
148a6ab28e1115612144d74e2bdc70712674db19f1735343626605269eb97047feba7981dbb1269527d7779a8c2059be32adbfd65823f3fa601305f303e45b7c ringrtc-2.25.2.tar.gz
7b6c03da2c6fd33a60b56c29d35b56919aa3f0b7b02ba172010eaff29513d2f33dc434538d15caf9c39cbbd961f979bcda9de06edd98dcd794cc2c3c835ffcab webrtc-5481.tar.xz
82a95e14460bb19c7f5a6a1b1effbe34ade2edee0ef4f35a2efd1dc4d58974f1da69c81762fcfa23675f9b58dc1b50f6ca5699dfaaf79ee38bc6c93e41b70742 ringrtc-2.26.2.tar.gz
2963e70caed8d67602ca8608ea4e418af90e34fbd8ce1532b4cc914eb8799a30b3e569ff0b8953838c3c71ae130d566a8a51ad1f1d84580987d1b44ca9d11f8a webrtc-5481b.tar.xz
84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28 stokenizer-0.2.1.tar.gz
be5b4e823543b79175a12314f10c6326d9f0d59f470136962daed4665887006acc05b48b40dc1b67747396d8f6f7d23be298c1e110ccdd35ff9b09d5e6b80bab bettersqlite-use-system-sqlcipher.patch
78be44ef201d9e6e127979a496f7244c8d93e936f85ad8753fea1646e6142f8a0dbff705ba612c8c724d19e6a9e89ccae254719326021818e04cccef452fc308 libsignal-too-new-clang.patch
f2b39498192744fadb7e2b969979653a5bd84af0befcc0a9b2ac60f63a487cc2d0d90a0345c7e884c84b3759c62f07d97c576ef1e2b271bdd993893e26a45c5c libsignal-fix-build-rust-1.69.patch
60a45285d885922f5c21f64b761a10efbee9081baf3efa4c8c13abc6a43dc4d27662ed10e239b0fa2071ab9e3a0dbbb4b11d6e3d26fe2b74a19f39e72b74a5bd signal-disable-updates.patch
e50edde5a3a5b691eea4a595bd79672c207542ece710e53c26c70d7d2807335a418cfb9dc1aef6ce61ee41ee771a07534345ef4daaee8f0fdb4bab98a4034f0f signal-update-links.patch
536bca17e9ae774cd4c26e9012f628bee1273587e5b5db866de577025b0b9a36c68ec970d61605cdc3d470032adcdf53b948368b6cb4fe7f1bffe69d87371daf signal-tasje-whatever-the-fuck-is-ignore-doing-here.patch
d50eb5724502df9ea4d795db8cfc27af767c25168d7db2af512e615be7cc2ca290210a9ae78e1abb153c0198677e858ad3d74926c958099d0319295e7d9e7f1d signal-update-links.patch
ae91177b9df6bd5ac5cdbe28e6b591138d2c4b057dde84596ac89fc46e94bf713da18f652346486ebb1c88e7035d595b757b099b160aafa2c7cf103dfb2db8ab signal-tasje-whatever-the-fuck-is-ignore-doing-here.patch
646d303fe58cae3f0896ae0275a66695b902fae6ddde7c568cc9798157dee9f45ceff907bc951fadc4c511d512a73d114b4e4f7c8914e2311c63929d29e1621a signal-show-window-please.patch
354f516a74c5491727afe084ef7688b3e1359d230daa720ffc30b33d3ea7579c9f37a50fbdc5fe2e8dc5322e42a0a39e4ae3449d4cf5b77daed2229bd743028c webrtc-use-alpine-target.patch
bab56a33265b5b094f161af1462166e371913a5269fe8e7d12e9f65ec4f5b908157406b3bcbcf73db15d03470445127d27c64fd731b6ea57c631aba3f4d302cb webrtc-no-shared-deps-in-static-lib.patch
87534e7b5ad7365509eab75629e6bd1a9ed61ee92f7e358405a0abaf0df57de14623fb3894eb082f8785422e5c087e1c50f9e2e5cafbb2529591fd7bf447f7f5 signal-desktop

44
backports/signal-desktop/libsignal-fix-build-rust-1.69.patch Normal file
View file

@ -0,0 +1,44 @@
diff --git a/rust/attest/src/dcap/sgx_report_body.rs b/rust/attest/src/dcap/sgx_report_body.rs
index 056bef2b..6d3f0d5d 100644
--- a/rust/attest/src/dcap/sgx_report_body.rs
+++ b/rust/attest/src/dcap/sgx_report_body.rs
@@ -20,7 +20,7 @@ const SGX_HASH_SIZE: usize = 32;
pub type MREnclave = [u8; SGX_HASH_SIZE];
-#[derive(Debug)]
+#[derive(Copy, Clone, Debug)]
#[repr(C, packed)]
// sgx_report_body_t
pub(crate) struct SgxReportBody {
diff --git a/rust/attest/src/endian.rs b/rust/attest/src/endian.rs
index ae9351eb..2e08c711 100644
--- a/rust/attest/src/endian.rs
+++ b/rust/attest/src/endian.rs
@@ -7,7 +7,7 @@ use std::convert::{TryFrom, TryInto};
use hex::FromHex;
-#[derive(Debug)]
+#[derive(Copy, Clone, Debug)]
#[repr(C, packed)]
pub(crate) struct UInt16LE {
bytes: [u8; 2],
@@ -27,7 +27,7 @@ impl From<u16> for UInt16LE {
}
}
-#[derive(Debug)]
+#[derive(Copy, Clone, Debug)]
#[repr(C, packed)]
pub(crate) struct UInt32LE {
bytes: [u8; 4],
@@ -66,7 +66,7 @@ impl FromHex for UInt32LE {
}
}
-#[derive(Debug)]
+#[derive(Copy, Clone, Debug)]
#[repr(C, packed)]
pub(crate) struct UInt64LE {
bytes: [u8; 8],

11
backports/signal-desktop/signal-show-window-please.patch Normal file
View file

@ -0,0 +1,11 @@
--- ./app/main.ts.orig
+++ ./app/main.ts
@@ -721,7 +721,7 @@
const titleBarOverlay = await getTitleBarOverlay();
const windowOptions: Electron.BrowserWindowConstructorOptions = {
- show: false,
+ show: true,
width: DEFAULT_WIDTH,
height: DEFAULT_HEIGHT,
minWidth: MIN_WIDTH,

14
backports/signal-desktop/signal-tasje-whatever-the-fuck-is-ignore-doing-here.patch
View file

@ -1,6 +1,14 @@
--- a/package.json
+++ b/package.json
@@ -465,9 +465,7 @@
--- ./package.json.orig
+++ ./package.json
@@ -431,7 +431,6 @@
"libtextsecure/**",
"ts/**/*.js",
"ts/*.js",
- "!build",
"!ts/{storybook,test-node,test-mock,test-both,test-electron}",
"!**/{tsconfig,bower,component}.json",
"!**/.{github,husky,grenrc,npmrc,nycrc,taprc,bithoundrc}",
@@ -468,9 +467,7 @@
"!node_modules/spellchecker/vendor/hunspell/**/*",
"!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme,test,__tests__,tests,powered-test,example,examples,*.d.ts,.snyk-*.flag,benchmark}",
"!**/node_modules/.bin",

10
backports/signal-desktop/signal-update-links.patch
View file

@ -1,17 +1,17 @@
--- a/ts/components/DialogExpiredBuild.tsx
+++ b/ts/components/DialogExpiredBuild.tsx
@@ -29,9 +29,9 @@
--- ./ts/components/DialogExpiredBuild.tsx.orig
+++ ./ts/components/DialogExpiredBuild.tsx
@@ -23,9 +23,9 @@
containerWidthBreakpoint={containerWidthBreakpoint}
type="error"
onClick={() => {
- openLinkInWebBrowser('https://signal.org/download/');
+ openLinkInWebBrowser('https://pkgs.alpinelinux.org/packages?name=signal-desktop');
}}
- clickLabel={i18n('upgrade')}
- clickLabel={i18n('icu:upgrade')}
+ clickLabel={<code>apk upgrade signal-desktop</code>}
hasAction
>
{i18n('expiredWarning')}{' '}
{i18n('icu:expiredWarning')}{' '}
--- ./ts/types/support.ts.orig
+++ ./ts/types/support.ts
@@ -1,7 +1,7 @@