Date: Fri, 18 Aug 2023 06:13:58 GMT From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 25bf95dec342 - main - net-im/signal-desktop: Update to 6.28.0 Message-ID: <202308180613.37I6Dwv0016444@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=25bf95dec342b321031c8da54d1de452d5b8e975 commit 25bf95dec342b321031c8da54d1de452d5b8e975 Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2023-08-18 06:12:27 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2023-08-18 06:13:54 +0000 net-im/signal-desktop: Update to 6.28.0 Changes: https://github.com/signalapp/Signal-Desktop/releases/tag/v6.27.0 https://github.com/signalapp/Signal-Desktop/releases/tag/v6.27.1 https://github.com/signalapp/Signal-Desktop/releases/tag/v6.28.0 --- net-im/signal-desktop/Makefile | 26 ++++++++------------------ net-im/signal-desktop/distinfo | 10 +++++----- net-im/signal-desktop/get_deps.sh | 7 ++++++- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile index 37fdc26f50b7..4997d5f833e9 100644 --- a/net-im/signal-desktop/Makefile +++ b/net-im/signal-desktop/Makefile @@ -1,7 +1,6 @@ PORTNAME= signal-desktop DISTVERSIONPREFIX= v -DISTVERSION= 6.26.0 -PORTREVISION= 1 +DISTVERSION= 6.28.0 CATEGORIES= net-im MASTER_SITES= LOCAL/mikael/signal-desktop/:npm \ LOCAL/mikael/signal-desktop/:sqlite \ @@ -21,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 EXTRACT_DEPENDS=jq:textproc/jq \ - yarn-node16>0:www/yarn-node16 + yarn-node18>0:www/yarn-node18 BUILD_DEPENDS= ${LOCALBASE}/lib/libcrypto.a:security/openssl30 \ ${LOCALBASE}/lib/libringrtc.so:multimedia/ringrtc \ ${LOCALBASE}/lib/libsignal_node.so:net-im/libsignal-node \ @@ -29,9 +28,9 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libcrypto.a:security/openssl30 \ app-builder>0:devel/app-builder \ electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \ jq:textproc/jq \ - npm:www/npm-node16 \ + npm:www/npm-node18 \ vips>0:graphics/vips \ - yarn:www/yarn-node16 + yarn:www/yarn-node18 LIB_DEPENDS= libasound.so:audio/alsa-lib \ libatk-bridge-2.0.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \ @@ -87,8 +86,8 @@ _BUILD_DATE= $$(date +'%s') ELECTRON_VER_MAJOR= 25 # sh get_deps.sh -NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.22.0-d57441612df46f90df68fc5d9ad45b857b9d2c44-integrity -NPM_RINGRTC_DIR= npm-@signalapp-ringrtc-2.28.1-15785854f986c9a7a52b4dec2cc9145b8c5fbf00-integrity +NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.29.1-e45e5136f932ad994ac9f3090867abda1a0b8bd7-integrity +NPM_RINGRTC_DIR= npm-@signalapp-ringrtc-2.29.1-db5ccc6ee975c75091933e60bde536fe80b550fd-integrity NPM_SQLITE3_DIR= npm-@signalapp-better-sqlite3-8.4.3-7ffa8d03d2a12543247936bfb7b9f74cdbc6fe9b-integrity NPM_ESBUILD_VERS= 0.17.11 SQLCIPHER= sqlcipher-4.5.3-fts--3.0.7--0.2.1-b633825cf7e0fdd39a6cdf128f2bd76552a88d325f2b9cd07bb87a457cefb986 @@ -106,7 +105,7 @@ fetch-yarn: if [ ! -f ${DISTDIR}/signal-desktop-${DISTVERSION}-yarn-cache.tar.gz ]; then \ ${MKDIR} /tmp/signal-desktop; \ ${FETCH_CMD} -o - https://raw.githubusercontent.com/signalapp/Signal-Desktop/v${DISTVERSION}/package.json | \ - ${PREFIX}/bin/jq '.engines.node = "${NODE_VERSION}"' > /tmp/signal-desktop/package.json; \ + ${PREFIX}/bin/jq '.engines.node = ""' > /tmp/signal-desktop/package.json; \ ${FETCH_CMD} -o /tmp/signal-desktop/yarn.lock https://raw.githubusercontent.com/signalapp/Signal-Desktop/v${DISTVERSION}/yarn.lock; \ ${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \ /tmp/signal-desktop/.yarnrc; \ @@ -133,7 +132,7 @@ post-extract: ${ECHO_CMD} 'yarn-offline-mirror "../yarn-offline-cache"' > ${WRKSRC}/.yarnrc ${ECHO_CMD} 'nodedir "${LOCALBASE}"' >> ${WRKSRC}/.yarnrc # Update node engine - ${PREFIX}/bin/jq '.engines.node = "${NODE_VERSION}"' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp + ${PREFIX}/bin/jq '.engines.node = ""' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp ${MV} ${WRKSRC}/package.json.tmp ${WRKSRC}/package.json # remove mock-server as it doesn't build and is useless ${PREFIX}/bin/jq 'del(.devDependencies."@signalapp/mock-server")' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp @@ -176,15 +175,6 @@ do-build: ${MKDIR} ${WRKDIR}/esbuild-freebsd-64 ${TAR} -xf ${WRKDIR}/yarn-offline-cache/@esbuild-freebsd-${ESBUILD_ARCH}-${NPM_ESBUILD_VERS}.tgz -C ${WRKDIR}/esbuild-freebsd-64 -# # For online build -# ${RM} ${WRKDIR}/.npmrc -# cd ${WRKSRC} && \ -# ${SETENV} ${MAKE_ENV} yarn install --frozen-lockfile --ignore-optional -# cd ${WRKSRC} && \ -# ${SETENV} ${MAKE_ENV} yarn generate -# cd ${WRKSRC} && \ -# ${SETENV} ${MAKE_ENV} yarn build:esbuild:prod - # For offline build ${ECHO_CMD} offline=true > ${WRKDIR}/.npmrc cd ${WRKSRC} && \ diff --git a/net-im/signal-desktop/distinfo b/net-im/signal-desktop/distinfo index a47f95dd1d41..7a3c504699d3 100644 --- a/net-im/signal-desktop/distinfo +++ b/net-im/signal-desktop/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1689843016 -SHA256 (signal-desktop-6.26.0-yarn-cache.tar.gz) = 6a55b06be5e2d808e684effb67fea56d9be88030d138a44f1f5dd6f3849ace19 -SIZE (signal-desktop-6.26.0-yarn-cache.tar.gz) = 353616816 +TIMESTAMP = 1692030296 +SHA256 (signal-desktop-6.28.0-yarn-cache.tar.gz) = dfbb622862047d5bc52f37f8a920f228e3c8e49df8ab50d64b6afef9d7c736db +SIZE (signal-desktop-6.28.0-yarn-cache.tar.gz) = 359528832 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.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.26.0_GH0.tar.gz) = 4c9fbe43c4e6727dc4a4c10507346b4f210f3b70373cc2641617c09d7bc8bb15 -SIZE (signalapp-Signal-Desktop-v6.26.0_GH0.tar.gz) = 42183063 +SHA256 (signalapp-Signal-Desktop-v6.28.0_GH0.tar.gz) = 57e9af3e6740a7d6006c7fbb01c21c57ebe3dd8290a2428b1b0e5e7577fd214f +SIZE (signalapp-Signal-Desktop-v6.28.0_GH0.tar.gz) = 42313780 diff --git a/net-im/signal-desktop/get_deps.sh b/net-im/signal-desktop/get_deps.sh index 3e4914db95d1..24be87d65578 100644 --- a/net-im/signal-desktop/get_deps.sh +++ b/net-im/signal-desktop/get_deps.sh @@ -1,7 +1,12 @@ #!/bin/sh -SIGNAL_VERS=v6.26.0 +# XXX node + +SIGNAL_VERS=v6.28.0 fetch -qo /tmp/package.json https://raw.githubusercontent.com/signalapp/Signal-Desktop/${SIGNAL_VERS}/package.json +node_version=$(awk /'"node":'/'{print $2}' package.json | sed 's/"//g') +echo "NODE_VERSION= ${node_version}" + ringrtc_version=$(grep '@signalapp/ringrtc"' /tmp/package.json | awk -F ":" '{print $2}' | sed -E 's#("|,| )##g') echo "RINGRTC_VERSION= ${ringrtc_version}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308180613.37I6Dwv0016444>