diff options
| author | Mikael Urankar <mikael@FreeBSD.org> | 2024-05-07 12:45:40 +0200 |
|---|---|---|
| committer | Mikael Urankar <mikael@FreeBSD.org> | 2024-05-07 12:45:40 +0200 |
| commit | a8e4e4587529ce8aeaf6003ece97c507ed4e94a4 (patch) | |
| tree | a257cd73a588dd0fed7b13d566dbe0c51122e10d | |
| parent | www/firefox-esr: update to 115.11.0 (rc1) (diff) | |
net-im/libsignal-node: Fix yarn version in BUILD_DEPENDS
While here pet portlint.
Reported by: jhibbits
| -rw-r--r-- | net-im/libsignal-node/Makefile | 9 | ||||
| -rw-r--r-- | net-im/libsignal-node/files/patch-boring_boring-sys_main.rs | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/net-im/libsignal-node/Makefile b/net-im/libsignal-node/Makefile index 72f8046563b4..62c77be4514c 100644 --- a/net-im/libsignal-node/Makefile +++ b/net-im/libsignal-node/Makefile @@ -14,11 +14,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 -FETCH_DEPENDS= yarn-node20>0:www/yarn-node20 -EXTRACT_DEPENDS=yarn-node20>0:www/yarn-node20 +FETCH_DEPENDS= yarn-node${NODEJS_VERSION}>0:www/yarn-node${NODEJS_VERSION} +EXTRACT_DEPENDS=yarn-node${NODEJS_VERSION}>0:www/yarn-node${NODEJS_VERSION} BUILD_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ protoc:devel/protobuf \ - yarn:www/yarn-node18 + yarn:www/yarn-node${NODEJS_VERSION} USES= cargo gmake python:build USE_GITHUB= yes @@ -28,7 +28,7 @@ GH_ACCOUNT= signalapp # cd boring # git checkout correct_tag (grep boring Makefile.crates) # git submodule update --init --recursive -# the hash for boringssl and fips should be printed on screen +# the hash for boringssl and fips should be printed on screen GH_TUPLE= google:boringssl:44b3df6f03d85c901767250329c571db405122d5:boringssl \ google:boringssl:853ca1ea1168dff08011e5d42d94609cc0ca2e27:boringssl_fips @@ -46,6 +46,7 @@ USE_LDCONFIG= yes PLIST_FILES= lib/libsignal_node.so +NODEJS_VERSION= 20 NODE_ARCH= ${ARCH:S/aarch64/arm64/:S/amd64/x64/:S/i386/ia32/:C/powerpc64.*/ppc64/} NPM_RINGRTC_DIR= npm-@signalapp-ringrtc-2.36.0-67d1b48bd4c1ea31c155ea14a0bd28f04e46eff5-integrity NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.39.1-15b41f15c516ae3eecf8a098a9c9c7aac00444d7-integrity diff --git a/net-im/libsignal-node/files/patch-boring_boring-sys_main.rs b/net-im/libsignal-node/files/patch-boring_boring-sys_main.rs index f351053d5a9a..9ada79929d49 100644 --- a/net-im/libsignal-node/files/patch-boring_boring-sys_main.rs +++ b/net-im/libsignal-node/files/patch-boring_boring-sys_main.rs @@ -1,5 +1,5 @@ ---- ../boring-signal-v4.6.0/boring-sys/build/main.rs.orig 2024-04-27 16:40:34.000626000 +0200 -+++ ../boring-signal-v4.6.0/boring-sys/build/main.rs 2024-04-27 17:41:33.228588000 +0200 +--- ../boring-signal-v4.6.0/boring-sys/build/main.rs.orig 2024-04-27 16:40:34 UTC ++++ ../boring-signal-v4.6.0/boring-sys/build/main.rs @@ -477,9 +477,9 @@ fn ensure_patches_applied(config: &Config) -> io::Resu lock_file.lock()?; |