From nobody Sat Dec 17 10:10:05 2022 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 4NZ1tQ216Czsyd3; Sat, 17 Dec 2022 10:10:06 +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 4NZ1tP70NPz4J7R; Sat, 17 Dec 2022 10:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671271806; 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=Qn7v+Zo4b3U77pCxOO43wFJHhXlpMDIq9rg4B4FYU4o=; b=frQQDQCxacD+xQHvfqIfT1gecMiZ6os2IH8Mj3dDOeKpg1SImv4QtwpJ833ZpaS80L+/WH 5+pIIau52/JU5ZHMoUDk67NvPIRSh/mHF+NQYs8lqD/yLQcPJYQ0VKeDxTd4nMpMMEom8f yvois7rzewP5sEZVwEw1VMA2DGkq2vo6dO8myZlfYLNvhyti6nPc2D/gYrhvuWZAlFWewk 6WNnrroKcClV+FNdoBqVZrpdu+qY8+4U/lbOoCIiOl+66dRl3toh8eKFAQwGHf7NBonCyY dgpAkDyJxEc3CPM1fMnuREBjFv7nkjBPc0oIbuAgjKhxX/kj5vEgSDKKvjcm7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671271806; 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=Qn7v+Zo4b3U77pCxOO43wFJHhXlpMDIq9rg4B4FYU4o=; b=S+GHjVag9debt23miYA2b1UBqXX/bAC+8mSeSYm3410245SrpVDHmZW7NgBe88egN0UXv5 qbCP4OlCYQLhr5AQsWUtFYiJNwdzs6SJlul533E0ZZ+9eVblvjVVwAPEF/pglbm4ZWB60w gWRZDC1JgAGN29I8NtNHIqkanMXZI0y1P/411hrJdA7X8tUNyEaOoMiq6sSu9kpmuHBytO 8kFT0Yi2waf/i00gdPKimRinZXhgQHReLQc0vqCL0sUS5oMvKiFrSHQxNttv2DbgfNgKVv rNLnxh2OjGOL1biZFGJ/H9tRRBkos45YOF8igDOrXP2JBt0CluuxSKUYp3hXDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671271806; a=rsa-sha256; cv=none; b=wNNyfTvedQ8+ILsS4VDb78VX5l3uCJCHAfQZ+YFmPle5Ya8HB1qRTu5a1gSircnyc3GRvU gvTGPxbjwk/rv8d4DIVL+xjawkuDynkWf4WQLc83ZokeBAjHfDDw6cbnDbe40+fOECUupC 5CrDLxXGERMwfYpqKNVxCR7e6fiqUnfGeXkK0FMo4rvr23RcPM7/yFXAR4q3GhRIfy8xcW ILda7Crv38e4Ned5qU7Baf3N+5bPRvirxujdyp2AoVRydFwO1NjlnNarkgMseJSasyM5yo 91LO3Q/1Nzayj3c/3Pfj8ID3DOHwyPGirRHUkA2bvQ97ZbeM62ZskixQZEH8qw== 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 4NZ1tP51yfznbZ; Sat, 17 Dec 2022 10:10:05 +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 2BHAA5ji089369; Sat, 17 Dec 2022 10:10:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BHAA5Kd089366; Sat, 17 Dec 2022 10:10:05 GMT (envelope-from git) Date: Sat, 17 Dec 2022 10:10:05 GMT Message-Id: <202212171010.2BHAA5Kd089366@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: 273abb319ffc - main - net-im/signal-desktop: Update to 6.1.0 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: 273abb319ffcc05f59b2725480c49d40bd576fa5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=273abb319ffcc05f59b2725480c49d40bd576fa5 commit 273abb319ffcc05f59b2725480c49d40bd576fa5 Author: Mikael Urankar AuthorDate: 2022-12-17 10:04:26 +0000 Commit: Mikael Urankar CommitDate: 2022-12-17 10:09:36 +0000 net-im/signal-desktop: Update to 6.1.0 Changes: https://github.com/signalapp/Signal-Desktop/releases/tag/v5.57.0 https://github.com/signalapp/Signal-Desktop/releases/tag/v5.61.0 https://github.com/signalapp/Signal-Desktop/releases/tag/v5.61.1 https://github.com/signalapp/Signal-Desktop/releases/tag/v5.62.0 https://github.com/signalapp/Signal-Desktop/releases/tag/v6.0.0 https://github.com/signalapp/Signal-Desktop/releases/tag/v6.1.0 --- net-im/signal-desktop/Makefile | 20 ++++---- net-im/signal-desktop/distinfo | 18 +++---- net-im/signal-desktop/files/patch-package.json | 10 ++-- .../files/patch-ts_components_SearchInput.tsx | 11 +++++ .../files/patch-ts_scripts_copy-language-packs.ts | 10 ++++ .../signal-desktop/files/patch-ts_updater_index.ts | 10 ++++ net-im/signal-desktop/files/sqlite3.gyp.diff | 4 +- net-im/signal-desktop/get_deps.sh | 2 +- net-im/signal-desktop/pkg-plist | 57 +++++++++++++--------- 9 files changed, 92 insertions(+), 50 deletions(-) diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile index 49432b0769c0..19be85ba8bd5 100644 --- a/net-im/signal-desktop/Makefile +++ b/net-im/signal-desktop/Makefile @@ -1,7 +1,6 @@ PORTNAME= signal-desktop DISTVERSIONPREFIX= v -DISTVERSION= 5.56.0 -PORTREVISION= 1 +DISTVERSION= 6.1.0 CATEGORIES= net-im MASTER_SITES= LOCAL/mikael/signal-desktop/:yarn \ LOCAL/mikael/signal-desktop/:electron_gyp \ @@ -78,13 +77,14 @@ MAKE_ENV+= ESBUILD_BINARY_PATH=${WRKDIR}/esbuild-freebsd-64/package/bin/esbuild _BUILD_DATE= $$(date +'%s') -ELECTRON_VER_MAJOR= 19 +ELECTRON_VER_MAJOR= 21 -NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.19.2-319da45eac91fe0809bd602528f841346050b7f4-integrity -NPM_RINGRTC_DIR= npm-ringrtc-2.20.14-928dae72e8009c5cc4dfb218d3007e2808acf5ab -NPM_SQLITE3_DIR= npm-better-sqlite3-7.5.0-3c4a7eebba3d5f5d8cb88fe83be1c01b8c0dea7d +# ll work/.cache/yarn/v6 | egrep "ringrtc|signal-client|npm-better-sqlite3|esbuild-freebsd-64" +NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.21.1-381d6162ae0e7719dc625780c1d6c3f9f558c33d-integrity +NPM_RINGRTC_DIR= npm-ringrtc-2.22.0-9a9d9fbc1ca43e7a0707a960ce9642dbf82dc64a/ +NPM_SQLITE3_DIR= npm-better-sqlite3-7.5.1-afdbd49cf18d0046d7385ca4d23da20c66f00d50/ NPM_PLAYWRITE_DIR= npm-playwright-core-1.17.1-a16e0f89284a0ed8ae6d77e1c905c84b8a2ba022-integrity -NPM_ESBUILD_VERS= 0.14.28 +NPM_ESBUILD_VERS= 0.15.8 ESBUILD_ARCH= ${ARCH:S/aarch64/arm/:S/amd64//} NODE_ARCH= ${ARCH:S/aarch64/arm64/:S/amd64/x64/} @@ -100,8 +100,8 @@ post-patch: do-build: ${ECHO_CMD} 'yarn-offline-mirror "../yarn-cache"' > ${WRKSRC}/.yarnrc -# electron-builder is stupid and tries to open ${LOCALBASE}/share/electron19/electron with WRITE priv -# copy ${LOCALBASE}/share/electron19 in WRKDIR +# electron-builder is stupid and tries to open ${LOCALBASE}/share/electron21/electron with WRITE priv +# copy ${LOCALBASE}/share/electron21 in WRKDIR # it's needed for the do-install phase, it's here because of this issue # https://github.com/MikaelUrankar/signal-desktop/issues/6 (I don't know why it fails though) @${RM} -r ${WRKDIR}/electron${ELECTRON_VER_MAJOR} @@ -141,7 +141,7 @@ do-build: # cd ${WRKSRC} && \ # ${SETENV} ${MAKE_ENV} yarn build:webpack - # For offline build + # For offline build ${ECHO_CMD} offline=true > ${WRKDIR}/.npmrc cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} yarn install --frozen-lockfile --ignore-optional --offline diff --git a/net-im/signal-desktop/distinfo b/net-im/signal-desktop/distinfo index 01ec0a6b0ec7..cc8233d55117 100644 --- a/net-im/signal-desktop/distinfo +++ b/net-im/signal-desktop/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1668368500 -SHA256 (signal-desktop-5.56.0-yarn-cache.tar.gz) = bccabce101a998f26c45f2c21d6af2c00ba26f37c18678504c8017ec3b77f256 -SIZE (signal-desktop-5.56.0-yarn-cache.tar.gz) = 1008120275 -SHA256 (signal-desktop-5.56.0-electron-gyp-cache.tar.gz) = 25894bac4eb7fddf3e83325d14f5ce9fa236f8b11454a7c71350988914a66cda -SIZE (signal-desktop-5.56.0-electron-gyp-cache.tar.gz) = 259813 -SHA256 (signal-desktop-5.56.0-npm-cache.tar.gz) = 43e30865913f241e16e704a124c685f42b81ad992188ee0611454724a7a13aa8 -SIZE (signal-desktop-5.56.0-npm-cache.tar.gz) = 4396873 +TIMESTAMP = 1671199606 +SHA256 (signal-desktop-6.1.0-yarn-cache.tar.gz) = 377cc4aef808c0dbdd939e5f6b101d67b41af36240f6153e83c4ea1242d933e5 +SIZE (signal-desktop-6.1.0-yarn-cache.tar.gz) = 1084112692 +SHA256 (signal-desktop-6.1.0-electron-gyp-cache.tar.gz) = 0cf1ecdb87c699e99ce3af4a2378d95e5440c7e532c209222ddd122deb1d3a4e +SIZE (signal-desktop-6.1.0-electron-gyp-cache.tar.gz) = 267010 +SHA256 (signal-desktop-6.1.0-npm-cache.tar.gz) = 7695f2e5c39eb6aa36a704ba77f34925e5e1e54f65b8b2d8e1f2905730ee512a +SIZE (signal-desktop-6.1.0-npm-cache.tar.gz) = 4429759 SHA256 (sqlcipher.tar.gz) = fe8bdc5e2f182970fb63a71ec4c519c8192453800bf142f755d7ed99e79fff84 SIZE (sqlcipher.tar.gz) = 25833894 -SHA256 (signalapp-Signal-Desktop-v5.56.0_GH0.tar.gz) = ddec149fcb53253a26e8436fd1157e28ccf32673663d3b6a51753af31efa883b -SIZE (signalapp-Signal-Desktop-v5.56.0_GH0.tar.gz) = 38520711 +SHA256 (signalapp-Signal-Desktop-v6.1.0_GH0.tar.gz) = f981ca229651826dcf2b511499612217719827ab98edac46f931fe2751eccd6f +SIZE (signalapp-Signal-Desktop-v6.1.0_GH0.tar.gz) = 38301590 diff --git a/net-im/signal-desktop/files/patch-package.json b/net-im/signal-desktop/files/patch-package.json index 24e938ebe703..df02f10d522d 100644 --- a/net-im/signal-desktop/files/patch-package.json +++ b/net-im/signal-desktop/files/patch-package.json @@ -1,19 +1,19 @@ --- package.json.orig 2022-08-05 12:53:58 UTC +++ package.json -@@ -191,7 +191,6 @@ +@@ -192,7 +192,6 @@ "@babel/preset-typescript": "7.17.12", "@electron/fuses": "1.5.0", "@mixer/parallel-prettier": "2.0.1", -- "@signalapp/mock-server": "2.8.0", +- "@signalapp/mock-server": "2.11.0", "@storybook/addon-a11y": "6.5.6", "@storybook/addon-actions": "6.5.6", "@storybook/addon-controls": "6.5.6", @@ -319,7 +318,7 @@ - "sharp/color/color-string": "1.9.0" + "read-last-lines/mz/thenify-all/thenify": "3.3.1" }, "engines": { -- "node": "16.13.2" -+ "node": "16.18.1" +- "node": "16.16.0" ++ "node": "16.19.0" }, "build": { "appId": "org.whispersystems.signal-desktop", diff --git a/net-im/signal-desktop/files/patch-ts_components_SearchInput.tsx b/net-im/signal-desktop/files/patch-ts_components_SearchInput.tsx new file mode 100644 index 000000000000..fe49c84b6323 --- /dev/null +++ b/net-im/signal-desktop/files/patch-ts_components_SearchInput.tsx @@ -0,0 +1,11 @@ +--- ts/components/SearchInput.tsx.orig 2022-12-04 09:59:26 UTC ++++ ts/components/SearchInput.tsx +@@ -67,7 +67,7 @@ export const SearchInput = forwardRef