diff --git a/backports/signal-desktop/APKBUILD b/backports/signal-desktop/APKBUILD index d8eed12..bd23369 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.44.0 +pkgver=7.45.1 pkgrel=0 pkgdesc="A messaging app for simple private communication with friends" url="https://github.com/signalapp/Signal-Desktop/" @@ -50,6 +50,7 @@ makedepends=" mesa-dev nodejs npm + pnpm openh264-dev openssl-dev opus-dev @@ -68,8 +69,8 @@ options="net !check" # use _check_depends to validate this _libsignalver=0.66.2 -_ringrtcver=2.49.5 -_webrtcver=6834d +_ringrtcver=2.50.1 +_webrtcver=6834e _stokenizerver=0.2.1 source=" @@ -123,9 +124,9 @@ _update_depends() { # downloading tarball generated with abuild snapshot (with gclient dependencies fetched) # _stokenizerver: follow @signalapp/better-sqlite3 (on version in package.json) -> deps/download.js -> TOKENIZER_VERSION - local _libsignalver=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Desktop/v$pkgver/package-lock.json | grep "@signalapp/libsignal-client\": \"" | awk '{print $2}' | tr -d ',' | tr -d '"' | head -n 1) - local _ringrtcver=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Desktop/v$pkgver/package-lock.json | grep "@signalapp/ringrtc\": \"" | awk '{print $2}' | tr -d ',' | tr -d '"' | head -n 1) - local _bsqlitever=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Desktop/v$pkgver/package-lock.json | grep "@signalapp/better-sqlite3\": \"" | awk '{print $2}' | tr -d ',' | tr -d '"' | head -n 1) + local _libsignalver=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Desktop/v$pkgver/package.json | grep "@signalapp/libsignal-client\": \"" | awk '{print $2}' | tr -d ',' | tr -d '"' | head -n 1) + local _ringrtcver=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Desktop/v$pkgver/package.json | grep "@signalapp/ringrtc\": \"" | awk '{print $2}' | tr -d ',' | tr -d '"' | head -n 1) + local _bsqlitever=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Desktop/v$pkgver/package.json | grep "@signalapp/better-sqlite3\": \"" | awk '{print $2}' | tr -d ',' | tr -d '"' | head -n 1) local _webrtcver=$(curl --silent https://raw.githubusercontent.com/signalapp/ringrtc/v$_ringrtcver/config/version.properties | awk -F '=' '{if($1 == "webrtc.version"){print $2}}' | head -n 1) local _extensionver=$(curl --silent https://raw.githubusercontent.com/signalapp/better-sqlite3/v$_bsqlitever/deps/download.js | grep "const EXTENSION_VERSION" | awk '{print $4}' | tr -d "'" | tr -d ';' | head -n 1) local _extensionver=${_extensionver/-*} @@ -196,7 +197,7 @@ prepare() { cd "$builddir"/Signal-Desktop msg "Installing signal-desktop JS dependencies" - npm ci --ignore-scripts + pnpm install --ignore-scripts # remove shipped fonts for system-provided (part 1) rm -rf fonts/ @@ -398,21 +399,17 @@ build() { cd "$builddir"/Signal-Desktop # from package.json postinstall - npm run build:acknowledgments - npm exec patch-package + pnpm run build:acknowledgments rm -rf node_modules/dtrace-provider # get esbuild installed (needed for next step) - npm rebuild esbuild + pnpm rebuild esbuild # build front NODE_ENV=production \ SIGNAL_ENV=production \ NODE_OPTIONS=--openssl-legacy-provider \ - npm run build:dev - - # purge non-production deps - npm prune --ignore-scripts --omit=dev + pnpm run build:dev # use our libsignal rm -rf node_modules/@signalapp/libsignal-client/ @@ -426,10 +423,14 @@ build() { mv "$builddir"/Signal-FTS5-Extension/target/release/libsignal_tokenizer.a node_modules/@signalapp/better-sqlite3/tokenizer/ mv "$builddir"/Signal-FTS5-Extension/target/release/signal-tokenizer.h node_modules/@signalapp/better-sqlite3/tokenizer/ - npm rebuild \ + npm_config_nodedir=/usr/include/electron/node_headers \ + npm_config_build_from_source=true \ + pnpm rebuild \ sharp @signalapp/better-sqlite3 spellchecker websocket \ - utf-8-validate bufferutil fs-xattr \ - --nodedir=/usr/include/electron/node_headers --build-from-source + utf-8-validate bufferutil fs-xattr + + # purge non-production deps + pnpm prune --ignore-scripts --prod SIGNAL_ENV=production \ tasje pack @@ -438,7 +439,7 @@ build() { check() { cd "$builddir"/Signal-Desktop # tests run against downloaded build of electron for glibc, probably can be patched - npm run test + pnpm run test } package() { @@ -459,13 +460,13 @@ package() { } sha512sums=" -ee089f43ca96c3ac1bb35f469b28717760615c7448860829566ca34befec917e5a9d6137b82bfe5ae8b9d753e8df7a177f4fd6b99cf0f009944fc8c5984982a1 Signal-Desktop-7.44.0.tar.gz +455a6306b8a7bf86942e718d22cb343319eabdec24213ceac1fa20eb3d8fa5e9e33ff69513ea103365841ca9ab93717aafe240e628f922c480ac20786cdeb29c Signal-Desktop-7.45.1.tar.gz 776eba9bc5eb6bbb9a73f7b768e46f11bbca91f8a797e345bef2aecd583b21f4ab9c574fa6e0a239bff416502b14d1d6019ade8755964ed73e04448aab82ba48 libsignal-0.66.2.tar.gz -d5dada32132cc4742628f9ebb53c013767ac23c0dfecb70a82f6e2cbde423e08bc7caf73566f12a412d60edb1c6940fb0e8ed4ad533f4ce76189d85b8ded1f4d ringrtc-2.49.5.tar.gz -8587c3375130bedf3e995c82885fd1ffac8c61e60063734e070b3578c324bdd8cb1109bf3280c6329ba2411cc06c304e731ea11573b5b0f22880b9a9fe0d22c2 webrtc-6834d.tar.zst +fdec4a42b10ab7db87d090d759641931d85ac3e0f690311eb1f261a768953cce7e92ba7108e5a07b228ee2d8c4e25a44feaa68cd17368ae77e096f21ab5c62d9 ringrtc-2.50.1.tar.gz +f425c04160c2ea5642a8e95a9806731e25e1abb2da5db04a30a9fc77b45b51cc5ba21461bec1c34f2ea6cb91e852f7ae7ca5c83c6d8e65f8196b99b7aedefb60 webrtc-6834e.tar.zst 84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28 stokenizer-0.2.1.tar.gz 8d2d2d82c8546c2dd1fef161b61df79918f8c22235a56a46adb375a0beb4acef12c5fe53e67242a4be97f77adc522ff79b47949c352956c742a70d50f4179f7f libsignal-auditable.patch -18d5a0208d75fa910b6c0d531997402bba83290dfc7d7ce903acdcd0ce1d88bd3026ace40ecd32a88c2e429e48530b4e40f207a3d15bd9c0d6ebc8c447fa8ff9 signal-use-system-sqlcipher.patch +eed8371ccf478e6bf3ade04f93ed26b53ee141b6f786e7a2ae4483b1b962329b18034ec0bc3514eb218346e100044aeaf0fcf2b31028c87c41bd7ecc7e681848 signal-use-system-sqlcipher.patch fc2af28645364cd85c106304a26811b036f6be048c52137fbbcc112870a84132a181f532563e0569b560fde3cf8c02480666a9b01d804b0008f97c728005b1c7 signal-disable-updates.patch 853de84d636f730694f17bcec63463fa7bfbdd0a7f7a64618a8fc6bc523ce1a9854b4c651753735af735c18101295d3efbe54f83ae0bccbed83c8c1fee3e7049 signal-update-links.patch 882d6889b23a3ebc6449c8b6acec8c3853674a7e94f066d65b57bab674ba8c11d582ba2c760825cb67b9202716e6d8b7123001d1e9f9229e49a0b77e9d978265 signal-show-window-please.patch diff --git a/backports/signal-desktop/signal-use-system-sqlcipher.patch b/backports/signal-desktop/signal-use-system-sqlcipher.patch index cc00ad4..7f46d55 100644 --- a/backports/signal-desktop/signal-use-system-sqlcipher.patch +++ b/backports/signal-desktop/signal-use-system-sqlcipher.patch @@ -28,16 +28,3 @@ index c370c30b309..bf0207e6fec 100644 ], }], ], -diff --git a/Signal-Desktop/node_modules/@signalapp/better-sqlite3/package.json.orig b/Signal-Desktop/node_modules/@signalapp/better-sqlite3/package.json -index fbb9d360352..a9217039c01 100644 ---- a/Signal-Desktop/node_modules/@signalapp/better-sqlite3/package.json.orig -+++ b/Signal-Desktop/node_modules/@signalapp/better-sqlite3/package.json -@@ -35,7 +35,7 @@ - }, - "scripts": { - "format": "xcrun clang-format --style=chromium -Werror --verbose -i src/*.cpp src/*.hpp", -- "install": "npm run download && npm run build-release", -+ "install": "npm run build-release", - "build-release": "node-gyp rebuild --release", - "build-debug": "node-gyp rebuild --debug", - "test": "mocha --exit --slow=75 --timeout=5000",