From d3ea5f4f6775d499bfd3c2cf6b98f68bb5c2fffe Mon Sep 17 00:00:00 2001 From: Mikael Urankar Date: Tue, 14 Feb 2023 18:30:37 +0100 Subject: net-im/signal-desktop: Update to 6.5.1 The npm cache file is the same as the previous signal-desktop version. Changes: https://github.com/signalapp/Signal-Desktop/releases/tag/v6.5.0 https://github.com/signalapp/Signal-Desktop/releases/tag/v6.5.1 --- net-im/signal-desktop/Makefile | 11 ++++++----- net-im/signal-desktop/distinfo | 18 +++++++++--------- net-im/signal-desktop/files/package.json | 6 +++--- net-im/signal-desktop/files/sqlite3.gyp.diff | 27 ++++++++++++++------------- net-im/signal-desktop/files/yarn.lock | 24 ++++++++++++------------ 5 files changed, 44 insertions(+), 42 deletions(-) diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile index 02ce8a37047c..cc9b7caaad86 100644 --- a/net-im/signal-desktop/Makefile +++ b/net-im/signal-desktop/Makefile @@ -1,6 +1,6 @@ PORTNAME= signal-desktop DISTVERSIONPREFIX= v -DISTVERSION= 6.4.1 +DISTVERSION= 6.5.1 CATEGORIES= net-im MASTER_SITES= LOCAL/mikael/signal-desktop/:npm \ LOCAL/mikael/signal-desktop/:sqlite \ @@ -8,7 +8,7 @@ MASTER_SITES= LOCAL/mikael/signal-desktop/:npm \ https://electronjs.org/headers/v${ELECTRON_GYP_VERSION}/:electron_gyp \ https://build-artifacts.signal.org/desktop/:sqlcipher DISTFILES= signal-desktop-${DISTVERSION}-yarn-cache.tar.gz:prefetch \ - signal-desktop-${DISTVERSION}-npm-cache.tar.gz:npm \ + signal-desktop-6.4.1-npm-cache.tar.gz:npm \ node-v${NODE_VERSION}-headers.tar.gz:node \ node-v${ELECTRON_GYP_VERSION}-headers.tar.gz:electron_gyp \ ${SQLCIPHER}.tar.gz:sqlcipher @@ -26,6 +26,7 @@ FETCH_DEPENDS= yarn-node16>0:www/yarn-node16 EXTRACT_DEPENDS=yarn-node16>0:www/yarn-node16 BUILD_DEPENDS= ${LOCALBASE}/lib/libringrtc.so:multimedia/ringrtc \ ${LOCALBASE}/lib/libsignal_node.so:net-im/libsignal-node \ + ${LOCALBASE}/lib/libsignal_tokenizer.a:devel/signal-fts5-extension \ app-builder>0:devel/app-builder \ electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \ npm:www/npm-node16 \ @@ -88,13 +89,13 @@ NODE_VERSION= 16.19.0 # bump ELECTRON_GYP_VERSION when ELECTRON_VER_MAJOR is changed ELECTRON_GYP_VERSION= 22.0.0 -# ll work/.cache/yarn/v6 | egrep "@signalapp|esbuild-freebsd-64" +# ll work/.cache/yarn/v6 | egrep "@signalapp|esbuild-freebsd" NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.21.1-381d6162ae0e7719dc625780c1d6c3f9f558c33d-integrity NPM_RINGRTC_DIR= npm-@signalapp-ringrtc-2.23.0-982fb6268eab2eb35a61624149b5f9ce9af28907-integrity -NPM_SQLITE3_DIR= npm-@signalapp-better-sqlite3-8.1.1-b39b9138bc79992d5e9707b246a67a1b88a18c49-integrity +NPM_SQLITE3_DIR= npm-@signalapp-better-sqlite3-8.4.3-7ffa8d03d2a12543247936bfb7b9f74cdbc6fe9b-integrity NPM_PLAYWRITE_DIR= npm-playwright-core-1.17.1-a16e0f89284a0ed8ae6d77e1c905c84b8a2ba022-integrity NPM_ESBUILD_VERS= 0.17.2 -SQLCIPHER= sqlcipher-4.5.2--3.0.7-4587e88a4219cb76fd595a5b73f82bfd919b235d75626f40783525f4f58a7503 +SQLCIPHER= sqlcipher-4.5.3-fts--3.0.7--0.2.1-b633825cf7e0fdd39a6cdf128f2bd76552a88d325f2b9cd07bb87a457cefb986 ESBUILD_ARCH= ${ARCH:S/aarch64/arm64/:S/amd64/x64/} NODE_ARCH= ${ARCH:S/aarch64/arm64/:S/amd64/x64/} diff --git a/net-im/signal-desktop/distinfo b/net-im/signal-desktop/distinfo index 03c03cecb049..1f8a875f6f7f 100644 --- a/net-im/signal-desktop/distinfo +++ b/net-im/signal-desktop/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1675444285 -SHA256 (signal-desktop-6.4.1-yarn-cache.tar.gz) = b46dd8ef733f4248c3881de2520dd0b3e051fefd5c9a227f1741e93666e4df36 -SIZE (signal-desktop-6.4.1-yarn-cache.tar.gz) = 372614208 +TIMESTAMP = 1676318056 +SHA256 (signal-desktop-6.5.1-yarn-cache.tar.gz) = ff929319b91e416b16aa7090aaf569092a4063e089e4b7bdc3897de8b1342698 +SIZE (signal-desktop-6.5.1-yarn-cache.tar.gz) = 372615484 +SHA256 (signal-desktop-6.4.1-npm-cache.tar.gz) = 8acc503a579760faf8ea660d504f3b3ffadc495bf09584228da4cc9af20e33fe +SIZE (signal-desktop-6.4.1-npm-cache.tar.gz) = 4466353 SHA256 (node-v16.19.0-headers.tar.gz) = d0b02ce3d1198d41127daf64f204195252abff6a22da70830aaed846ba6ad864 SIZE (node-v16.19.0-headers.tar.gz) = 568145 SHA256 (node-v22.0.0-headers.tar.gz) = 190aa8035756ea448870547c8123b959031657f739843e6950013df04c0dd119 SIZE (node-v22.0.0-headers.tar.gz) = 263326 -SHA256 (signal-desktop-6.4.1-npm-cache.tar.gz) = 8acc503a579760faf8ea660d504f3b3ffadc495bf09584228da4cc9af20e33fe -SIZE (signal-desktop-6.4.1-npm-cache.tar.gz) = 4466353 -SHA256 (sqlcipher-4.5.2--3.0.7-4587e88a4219cb76fd595a5b73f82bfd919b235d75626f40783525f4f58a7503.tar.gz) = 4587e88a4219cb76fd595a5b73f82bfd919b235d75626f40783525f4f58a7503 -SIZE (sqlcipher-4.5.2--3.0.7-4587e88a4219cb76fd595a5b73f82bfd919b235d75626f40783525f4f58a7503.tar.gz) = 41118646 -SHA256 (signalapp-Signal-Desktop-v6.4.1_GH0.tar.gz) = 899af104afe358413ebba2971ddb273ee788f7ffad9fdf96ece30e527eda3475 -SIZE (signalapp-Signal-Desktop-v6.4.1_GH0.tar.gz) = 38611904 +SHA256 (sqlcipher-4.5.3-fts--3.0.7--0.2.1-b633825cf7e0fdd39a6cdf128f2bd76552a88d325f2b9cd07bb87a457cefb986.tar.gz) = b633825cf7e0fdd39a6cdf128f2bd76552a88d325f2b9cd07bb87a457cefb986 +SIZE (sqlcipher-4.5.3-fts--3.0.7--0.2.1-b633825cf7e0fdd39a6cdf128f2bd76552a88d325f2b9cd07bb87a457cefb986.tar.gz) = 74755812 +SHA256 (signalapp-Signal-Desktop-v6.5.1_GH0.tar.gz) = 553902fc571a0965538b6ade8e0bdd4056540c91165f49b5e7b826e0545302d8 +SIZE (signalapp-Signal-Desktop-v6.5.1_GH0.tar.gz) = 38651798 diff --git a/net-im/signal-desktop/files/package.json b/net-im/signal-desktop/files/package.json index 8acd91294d77..49ef11ef618a 100644 --- a/net-im/signal-desktop/files/package.json +++ b/net-im/signal-desktop/files/package.json @@ -4,7 +4,7 @@ "description": "Private messaging from your desktop", "desktopName": "signal.desktop", "repository": "https://github.com/signalapp/Signal-Desktop.git", - "version": "6.4.1", + "version": "6.5.1", "license": "AGPL-3.0-only", "author": { "name": "Signal Messenger, LLC", @@ -89,7 +89,7 @@ "@indutny/sneequals": "4.0.0", "@popperjs/core": "2.11.6", "@react-spring/web": "9.5.5", - "@signalapp/better-sqlite3": "8.1.1", + "@signalapp/better-sqlite3": "8.4.3", "@signalapp/libsignal-client": "0.21.1", "@signalapp/ringrtc": "2.23.0", "@types/fabric": "4.5.3", @@ -268,7 +268,7 @@ "css-loader": "3.2.0", "danger": "11.1.2", "debug": "4.3.3", - "electron": "22.0.0", + "electron": "22.2.0", "electron-builder": "23.0.8", "electron-mocha": "11.0.2", "electron-notarize": "1.2.1", diff --git a/net-im/signal-desktop/files/sqlite3.gyp.diff b/net-im/signal-desktop/files/sqlite3.gyp.diff index 5b24cb5562c9..5579d917a6b2 100644 --- a/net-im/signal-desktop/files/sqlite3.gyp.diff +++ b/net-im/signal-desktop/files/sqlite3.gyp.diff @@ -1,17 +1,18 @@ ---- npm-@signalapp-better-sqlite3-8.1.1-b39b9138bc79992d5e9707b246a67a1b88a18c49-integrity/node_modules/@signalapp/better-sqlite3/deps/sqlite3.gyp.orig 2022-07-02 14:34:04 UTC -+++ npm-@signalapp-better-sqlite3-8.1.1-b39b9138bc79992d5e9707b246a67a1b88a18c49-integrity/node_modules/@signalapp/better-sqlite3/deps/sqlite3.gyp -@@ -92,6 +92,14 @@ - 'libraries': [ - # This statically links libcrypto, whereas -lcrypto would dynamically link it - '<(SHARED_INTERMEDIATE_DIR)/sqlite3/OpenSSL-mac-<(target_arch)/libcrypto.a' -+ ] -+ } -+ }, +--- npm-@signalapp-better-sqlite3-8.4.3-7ffa8d03d2a12543247936bfb7b9f74cdbc6fe9b-integrity/node_modules/@signalapp/better-sqlite3/deps/sqlite3.gyp.orig 2022-07-02 14:34:04 UTC ++++ npm-@signalapp-better-sqlite3-8.4.3-7ffa8d03d2a12543247936bfb7b9f74cdbc6fe9b-integrity/node_modules/@signalapp/better-sqlite3/deps/sqlite3.gyp +@@ -100,6 +100,15 @@ + ] + } + }, + 'OS == "freebsd"', { + 'link_settings': { + 'libraries': [ + # This statically links libcrypto, whereas -lcrypto would dynamically link it -+ '/usr/local/lib/libcrypto.a' - ] - } - }, ++ '/usr/local/lib/libcrypto.a', ++ '/usr/local/lib/libsignal_tokenizer.a' ++ ] ++ } ++ }, + { # Linux + 'link_settings': { + 'libraries': [ diff --git a/net-im/signal-desktop/files/yarn.lock b/net-im/signal-desktop/files/yarn.lock index 46ef9c5c8979..7501276960a0 100644 --- a/net-im/signal-desktop/files/yarn.lock +++ b/net-im/signal-desktop/files/yarn.lock @@ -2154,10 +2154,10 @@ "@react-spring/shared" "~9.5.5" "@react-spring/types" "~9.5.5" -"@signalapp/better-sqlite3@8.1.1": - version "8.1.1" - resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.1.1.tgz#b39b9138bc79992d5e9707b246a67a1b88a18c49" - integrity sha512-k4njS/Vsr12Eow7G7TNBjJKSPU971DZQWGY4dfISdOBobAAiewstOwlqF3ZhpJznL6M3sri14MUM0iV1aZR15g== +"@signalapp/better-sqlite3@8.4.3": + version "8.4.3" + resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.4.3.tgz#7ffa8d03d2a12543247936bfb7b9f74cdbc6fe9b" + integrity sha512-6HaN8a90fWHBPIIZRRmSG7wc3BPczLx3Mb9MJ8wsatYqf8C1+2NdFae5AzII8Oe9YE9SSHzCjdPd8ST1m9+Qag== dependencies: bindings "^1.5.0" tar "^6.1.0" @@ -2178,10 +2178,10 @@ node-gyp-build "^4.2.3" uuid "^8.3.0" -"@signalapp/mock-server@2.12.1": - version "2.12.1" - resolved "https://registry.yarnpkg.com/@signalapp/mock-server/-/mock-server-2.12.1.tgz#456ee3c9458363d333bd803910f874d388f28d04" - integrity sha512-c8ndwTtDoRPRZAWjbBeVH79DQLA4UvKPztgJUqtDOqFCju1+NMKbjxrK+v1PJQvhhOMANbG6Z3qTCl4UGcm/zQ== +"@signalapp/mock-server@2.13.0": + version "2.13.0" + resolved "https://registry.yarnpkg.com/@signalapp/mock-server/-/mock-server-2.13.0.tgz#928c95a4890b21c811d29b3b0765aa3a35d28006" + integrity sha512-YZZdEYhVoWT4Ih4ZJLu1AaLtn+i8RFO/Tr55/72TvrtcWLjolik3YTnGqHnAcxNR+6mfeCfhpp7+rtexYnnefw== dependencies: "@signalapp/libsignal-client" "^0.20.0" debug "^4.3.2" @@ -8154,10 +8154,10 @@ electron-window@^0.8.0: dependencies: is-electron-renderer "^2.0.0" -electron@22.0.0: - version "22.0.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.0.tgz#ef84ab9cf23aa3f8c2f42a1e8e000ad7fd941058" - integrity sha512-cgRc4wjyM+81A0E8UGv1HNJjL1HBI5cWNh/DUIjzYvoUuiEM0SS0hAH/zaFQ18xOz2ced6Yih8SybpOiOYJhdg== +electron@22.2.0: + version "22.2.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-22.2.0.tgz#1aa321415d8b8021a4b0807641f0ad56028feaf5" + integrity sha512-puRZSF2vWJ4pz3oetL5Td8LcuivTWz3MoAk/gjImHSN1B/2VJNEQlw1jGdkte+ppid2craOswE2lmCOZ7SwF1g== dependencies: "@electron/get" "^2.0.0" "@types/node" "^16.11.26" -- cgit v1.2.3