From nobody Tue May 09 17:33:29 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG4y203nmz49FJ2; Tue, 9 May 2023 17:33:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QG4y16W5pz4Cq2; Tue, 9 May 2023 17:33:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683653609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DwBg7kJuqBR+5tW4nz6Wl5QMbn9h0gMz1KKaKHH2LO0=; b=lkw4JtRAEd01hRzWwJ80K7v26XhIEqZKWoaEm5jY3W8pCiQZNaccMEpHSva4YKIU2YYI/V m6L+SAJDC03wRPMZbg4UubRXR4fJYD3nv13efSJ9psxmk0RGwqYInQNJ9eE7OssgzFzunE kyIoUX/cLLSFXTba2bN5t704j+j+tD1Xz3g2ffAdmkX92Bk/x+nUTxS3tDOQk89NSGMJDw F98jpnp1T+1dG6jHtwDKXVOiWdMsZ7dweOcJyGxvd+fWX9R19s/YjNpLBoe4eE2EE+z+EY Qyxtb/feKfIegMAdc0GscmS63OvTYjDiHi1NMbJddn5rVR3tNy5sdJPWNbWmIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683653609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DwBg7kJuqBR+5tW4nz6Wl5QMbn9h0gMz1KKaKHH2LO0=; b=RpMNFzwQr2L6BDZS03kDzMhWbNzgUaWrH+ZB71wm37KC0amK+3MernV7AdPcF6TZnAnkO+ AGj+k7fg4iyZfT5o6uR5fpn3LsShp7ICw9dvk/whgagRDsCg41q/KnQtajIlS9er1yq4VL NqvUOmAnAuGCJNtypP0NT4tCnDwIXXTxa0gEaAtS4IGgXqd0B0XWkNAZJPmrwzszNXWNqP 02WPY9oPzQ5ZFaz1rnV/pqWLlWqS+L9nqGOv4D3xYc0iT0ZTdf2wC8EoTyLR9DzH1j/5+U CwPPfyn06l1iATYPuSs9eVoQLQfJ/ZwLhDX4EzEMk09CWkdCU8xCrAVMA7OjCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683653609; a=rsa-sha256; cv=none; b=LtdEGETh5KuJhxtR9DZFStq685RDLu4P/ZC8hKeHFYJWk+VwYSkUtDDl0HeHzy31t5zO5Z WVxCa87FUy77XuPxSDd9X4HP86ApESTVO7/OwebBtMgpy4K3aIEx+izAieiFZs9pOvcsyq fNTfdkJMdMWVGAOaWnk2GgMzzoyk1it4yN8l72w+LldJW2WQKBTRa+PeL4/ELBdFRlIy8w hX+7Pdwe199c7XpmLBiyu6KXjTmbQq+azU0RveQjmvoTgv9hE/8nHZ0GzMTX0ggwsbgir0 GJQCie7O65QQXyYjxLcXcYDndGB0rz9ahTD00sZj7aFz9ZNRzLn3+FKksXcqpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG4y15KTyzcjl; Tue, 9 May 2023 17:33:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 349HXTxk028719; Tue, 9 May 2023 17:33:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349HXTXj028718; Tue, 9 May 2023 17:33:29 GMT (envelope-from git) Date: Tue, 9 May 2023 17:33:29 GMT Message-Id: <202305091733.349HXTXj028718@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: da0540fa457e - main - net-im/signal-desktop: Use nodedir to point to the node headers List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da0540fa457e9f59530218a7a9e9ed47218c4dc4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=da0540fa457e9f59530218a7a9e9ed47218c4dc4 commit da0540fa457e9f59530218a7a9e9ed47218c4dc4 Author: Mikael Urankar AuthorDate: 2023-05-01 17:46:54 +0000 Commit: Mikael Urankar CommitDate: 2023-05-09 17:33:00 +0000 net-im/signal-desktop: Use nodedir to point to the node headers We can drop the node distfiles as it's not used anymore. --- net-im/signal-desktop/Makefile | 17 ++--------------- net-im/signal-desktop/distinfo | 6 +----- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile index 6f07619a0aef..6d3fdb11a2ab 100644 --- a/net-im/signal-desktop/Makefile +++ b/net-im/signal-desktop/Makefile @@ -6,13 +6,9 @@ CATEGORIES= net-im MASTER_SITES= LOCAL/mikael/signal-desktop/:npm \ LOCAL/mikael/signal-desktop/:sqlite \ LOCAL/mikael/signal-desktop/:yarn \ - https://nodejs.org/download/release/v${NODE_VERSION}/:node \ - 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:yarn \ 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 MAINTAINER= mikael@FreeBSD.org @@ -84,10 +80,6 @@ MAKE_ENV+= ESBUILD_BINARY_PATH=${WRKDIR}/esbuild-freebsd-64/package/bin/esbuild _BUILD_DATE= $$(date +'%s') ELECTRON_VER_MAJOR= 22 -# keep NODE_VERSION in sync with www/node16 DISTVERSION -NODE_VERSION= 16.20.0 -# bump ELECTRON_GYP_VERSION when ELECTRON_VER_MAJOR is changed -ELECTRON_GYP_VERSION= 22.3.5 # sh get_deps.sh NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.22.0-d57441612df46f90df68fc5d9ad45b857b9d2c44-integrity @@ -132,15 +124,9 @@ post-patch: ${WRKSRC}/ts/scripts/get-expire-time.ts post-extract: - ${MKDIR} ${WRKDIR}/.cache/node-gyp/${NODE_VERSION} \ - ${WRKDIR}/.electron-gyp/${ELECTRON_GYP_VERSION} - ${MV} ${WRKDIR}/node-v${NODE_VERSION}/include ${WRKDIR}/.cache/node-gyp/${NODE_VERSION} - ${MV} ${WRKDIR}/node_headers/include ${WRKDIR}/.electron-gyp/${ELECTRON_GYP_VERSION} - ${ECHO_CMD} '9' > ${WRKDIR}/.cache/node-gyp/${NODE_VERSION}/installVersion - ${ECHO_CMD} '9' > ${WRKDIR}/.electron-gyp/${ELECTRON_GYP_VERSION}/installVersion - # install yarn modules and fail silently ${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 ${MV} ${WRKSRC}/package.json.tmp ${WRKSRC}/package.json @@ -152,6 +138,7 @@ post-extract: do-build: ${ECHO_CMD} 'yarn-offline-mirror "../yarn-offline-cache"' > ${WRKSRC}/.yarnrc + ${ECHO_CMD} 'nodedir "/usr/local/share/electron22/node_headers"' >> ${WRKSRC}/.yarnrc # electron-builder is stupid and tries to open ${LOCALBASE}/share/electron22/electron with WRITE priv # copy ${LOCALBASE}/share/electron22 in WRKDIR diff --git a/net-im/signal-desktop/distinfo b/net-im/signal-desktop/distinfo index 77099c2e54be..4c648485b3df 100644 --- a/net-im/signal-desktop/distinfo +++ b/net-im/signal-desktop/distinfo @@ -1,12 +1,8 @@ -TIMESTAMP = 1682081842 +TIMESTAMP = 1683650577 SHA256 (signal-desktop-6.15.0-yarn-cache.tar.gz) = d61d4177e2d71e19c941831b109018c274f64fa4b48b1a5f64c9c8404d163224 SIZE (signal-desktop-6.15.0-yarn-cache.tar.gz) = 356106776 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.20.0-headers.tar.gz) = 4ab673791303ba8284c6230a401b4e6054acfbbde05f4b4937769692cb3e80ed -SIZE (node-v16.20.0-headers.tar.gz) = 568323 -SHA256 (node-v22.3.5-headers.tar.gz) = a500a44d7bdb1b1747fedbc254385afd1730a4707e645757e30c6cac9c8d41a8 -SIZE (node-v22.3.5-headers.tar.gz) = 263704 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.15.0_GH0.tar.gz) = 7c3426a3829e0856940650423043711ad15c53dab554f1084c18ac81e828013e