From nobody Thu Jun 30 08:55:16 2022 X-Original-To: dev-commits-ports-all@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 70212870292; Thu, 30 Jun 2022 08:55:17 +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 4LYXGY07Gtz3q2R; Thu, 30 Jun 2022 08:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656579317; 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=xq0hoEpfPk00owuojveqWrqv/kWrZBCltRf6rp7F28I=; b=iFk4WbEXhv637iPW/rAEj6uUHRhr95Q5OKoMWX0Cizz0qM2HiuHNBGWnJAnPMAYP3263+z +cRB7fCPoUoR287enHJbKJZrOFBeIlpi3bK0CedyyYgg+NcjluQfkK/ftuT7N0umGenIr/ LGeNJ0OptxI5e9eu41r0LA4MjfMHiUi8QMbHLQDdtuTTXYOH1iTplrR6ynQ+Cjfm6wR+7s 6R+Nwp9j5Z24rs2vIRrJcRgTi1GaixhiQNtGK0nCvCx4itqvSd083JPgH1hpQ3ZoT38DMq 8PE3RKT95QESvKdxPSH6eJ1wiUbaBoJrrpuWIWNFsFo5TmUNnGP02cqAWvAZ6Q== 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 C034C2307E; Thu, 30 Jun 2022 08:55:16 +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 25U8tGDI019200; Thu, 30 Jun 2022 08:55:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25U8tGoh019199; Thu, 30 Jun 2022 08:55:16 GMT (envelope-from git) Date: Thu, 30 Jun 2022 08:55:16 GMT Message-Id: <202206300855.25U8tGoh019199@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: 65b9346db98e - main - net-im/signal-desktop: Update to 5.47.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 65b9346db98e69dce2b51feb65f9d2e55e84f252 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656579317; 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=xq0hoEpfPk00owuojveqWrqv/kWrZBCltRf6rp7F28I=; b=sDQwPy1gX578ExhjfWSjaV23wdvz9mP2rPjmqNBRcOC6ODv08NtnUwHTPqUJ3u/I/UXWhg ZQWpTqonThq+u9eu5p80qFJtr7085EuiFNSBQn4KjIxDu1PrwFohVQfMbiYgeV64Ngqw0Y tLZ/rYQ7f+/BopWi/LFZ//wDMXQ1fx8nAyJKeZMURCUsMdM3pROK9KIStj+AfeNK4SlL6f tXvQIKqBZEjy93nlr8tBEM6FCdTe+jJGEWk2aLbXzyya3Z8pZwkvmAwTZoO48jYoJrGYjI ZBU3AJPHOCiEG2UVrDi/omUVkQeiv9r4PtYRv3d+N6dzwBQnu/CxXpfpxA4cqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656579317; a=rsa-sha256; cv=none; b=rS69nAC0waU9QCfBV7Ji1SAJoVioeQu3ibpUcO4YirgdiZkTWA2T7qnv5lcii5VxNU0F8H WHsz0e/v+2GcjVORjlfPpX2CBRXNDd7Yjhtqbmez/3AfJypzPiksvkwmAeyuLy2cjXPZ8m SHW3iSU9e4ShmpoojBW+7J0QH/pYNxvuzktX66uR7qAi/2rbrYwredCQ/K28zMZ3i+iW7D 3+QLvSzPw3g8dw6MvHW7A6/9jrzIO+YyDC5d5GDxsfzsNHVqE61xNHGvaxPeANMsAnCV9H KYJMJUTShca1H91RCJBZilnN/Yf3DX+Eu/RdNY32z8LfJfYpRWR4az+sTNYC0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=65b9346db98e69dce2b51feb65f9d2e55e84f252 commit 65b9346db98e69dce2b51feb65f9d2e55e84f252 Author: Mikael Urankar AuthorDate: 2022-06-30 05:51:31 +0000 Commit: Mikael Urankar CommitDate: 2022-06-30 08:55:09 +0000 net-im/signal-desktop: Update to 5.47.0 Changes: https://github.com/signalapp/Signal-Desktop/releases/tag/v5.47.0 --- net-im/signal-desktop/Makefile | 24 ++++++++++---------- net-im/signal-desktop/distinfo | 18 +++++++-------- net-im/signal-desktop/files/patch-package.json | 28 ++++++++++++++++++++++++ net-im/signal-desktop/files/patch-packages.json | 20 ----------------- net-im/signal-desktop/files/patch-signal-desktop | 21 +++++++++++------- net-im/signal-desktop/files/patch-yarn.lock | 22 +++++++++---------- net-im/signal-desktop/pkg-plist | 2 -- 7 files changed, 74 insertions(+), 61 deletions(-) diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile index 9f2508ae86e9..3d2157409b95 100644 --- a/net-im/signal-desktop/Makefile +++ b/net-im/signal-desktop/Makefile @@ -1,6 +1,6 @@ PORTNAME= signal-desktop DISTVERSIONPREFIX= v -DISTVERSION= 5.46.0 +DISTVERSION= 5.47.0 CATEGORIES= net-im MASTER_SITES= LOCAL/mikael/signal-desktop/:yarn \ LOCAL/mikael/signal-desktop/:electron_gyp \ @@ -20,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/lib/libringrtc.so:multimedia/ringrtc \ ${LOCALBASE}/lib/libsignal_node.so:net-im/libsignal-node \ app-builder>0:devel/app-builder \ - electron18:devel/electron18 \ + electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \ npm:www/npm-node16 \ openssl>0:security/openssl \ vips>0:graphics/vips \ @@ -63,7 +63,7 @@ USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 libxml2 libxslt pango USE_XORG= x11 xcb xcomposite xdamage xext xfixes xi xrandr xrender xtst PACKAGE_ENV= SIGNAL_ENV=production -MAKE_ENV+= ELECTRON_OVERRIDE_DIST_PATH=${LOCALBASE}/share/electron18 \ +MAKE_ENV+= ELECTRON_OVERRIDE_DIST_PATH=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} \ HOME=${WRKDIR} \ PLAYWRIGHT_BROWSERS_PATH=${WRKDIR}/.cache \ PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=true \ @@ -79,8 +79,10 @@ MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 _BUILD_DATE= $$(date +'%s') -NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.16.0-7acba54b7ba05f513cdcf7f555efa1ccc6ce0145-integrity -NPM_RINGRTC_DIR= npm-ringrtc-2.20.8-ebd88d19b7a520f5887e5bed529db9fa5631d07e +ELECTRON_VER_MAJOR= 19 + +NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.17.0-ffe6763d80f56148b45192bca29deb16f9a0aea8-integrity +NPM_RINGRTC_DIR= npm-ringrtc-2.20.10-4450aa43e0f95e09e61cf49e970d864b19fa9d50 NPM_SQLITE3_DIR= npm-better-sqlite3-7.5.0-3c4a7eebba3d5f5d8cb88fe83be1c01b8c0dea7d NPM_PLAYWRITE_DIR= npm-playwright-core-1.17.1-a16e0f89284a0ed8ae6d77e1c905c84b8a2ba022-integrity NPM_ESBUILD_VERS= 0.14.28 @@ -93,12 +95,12 @@ post-patch: do-build: ${ECHO_CMD} 'yarn-offline-mirror "../yarn-cache"' > ${WRKSRC}/.yarnrc -# electron-builder is stupid and tries to open ${LOCALBASE}/share/electron18/electron with WRITE priv -# copy ${LOCALBASE}/share/electron18 in WRKDIR +# electron-builder is stupid and tries to open ${LOCALBASE}/share/electron19/electron with WRITE priv +# copy ${LOCALBASE}/share/electron19 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) - @${CP} -pR ${LOCALBASE}/share/electron18 ${WRKDIR}/electron18 - ${CHMOD} -R a+w ${WRKDIR}/electron18 + @${CP} -pR ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} ${WRKDIR}/electron${ELECTRON_VER_MAJOR} + ${CHMOD} -R a+w ${WRKDIR}/electron${ELECTRON_VER_MAJOR} # Install libsignal_node.so and libringrtc.so binaries in the yarn cache ${MKDIR} ${WRKDIR}/.cache/yarn/v6/${NPM_SIGNAL_DIR}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-x64 \ @@ -147,8 +149,8 @@ do-install: cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${PACKAGE_ENV} yarn run electron-builder \ --linux --dir --config.npmRebuild=false \ - --config.electronVersion=18 \ - --config.electronDist=${WRKDIR}/electron18 + --config.electronVersion=${ELECTRON_VER_MAJOR} \ + --config.electronDist=${WRKDIR}/electron${ELECTRON_VER_MAJOR} ${MKDIR} ${STAGEDIR}${DATADIR} cd ${BUILD_WRKSRC}/dist/linux-unpacked && \ diff --git a/net-im/signal-desktop/distinfo b/net-im/signal-desktop/distinfo index 67562e800d3b..5115eadca62f 100644 --- a/net-im/signal-desktop/distinfo +++ b/net-im/signal-desktop/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1655970160 -SHA256 (signal-desktop-5.46.0-yarn-cache.tar.gz) = 5d0de21f40a0b0c176078b6de8495eaca20af9f679931a013a170825ee6df000 -SIZE (signal-desktop-5.46.0-yarn-cache.tar.gz) = 935434061 -SHA256 (signal-desktop-5.46.0-electron-gyp-cache.tar.gz) = 9594b6dd908a8778d59fa421a970c0456f5bfd9582d60ab48b2a30fd860a39dc -SIZE (signal-desktop-5.46.0-electron-gyp-cache.tar.gz) = 260284 -SHA256 (signal-desktop-5.46.0-npm-cache.tar.gz) = bc17b1f363140931361d49a47cd0c38123eb86bf8d5cfa270b6fac7df19d68fe -SIZE (signal-desktop-5.46.0-npm-cache.tar.gz) = 8184368 +TIMESTAMP = 1656320908 +SHA256 (signal-desktop-5.47.0-yarn-cache.tar.gz) = b1334754082963dadda7a8a54c428e9e96187b7b00b19ac4cd9338c7c680e5f6 +SIZE (signal-desktop-5.47.0-yarn-cache.tar.gz) = 1079235353 +SHA256 (signal-desktop-5.47.0-electron-gyp-cache.tar.gz) = a751601d263a45caeb3cd7d23cddd5df0c114fb1b0577e8fadf39316220c5882 +SIZE (signal-desktop-5.47.0-electron-gyp-cache.tar.gz) = 520434 +SHA256 (signal-desktop-5.47.0-npm-cache.tar.gz) = 20f0a91ef70c52da04d8be55cb1628a3ce9f21077f64276b9827b2992f12a544 +SIZE (signal-desktop-5.47.0-npm-cache.tar.gz) = 7430740 SHA256 (sqlcipher.tar.gz) = fe8bdc5e2f182970fb63a71ec4c519c8192453800bf142f755d7ed99e79fff84 SIZE (sqlcipher.tar.gz) = 25833894 -SHA256 (signalapp-Signal-Desktop-v5.46.0_GH0.tar.gz) = f9ffce286fcf90b14a3b9f90cab3383c7a666383b5b012e27e995695322ad04b -SIZE (signalapp-Signal-Desktop-v5.46.0_GH0.tar.gz) = 37763735 +SHA256 (signalapp-Signal-Desktop-v5.47.0_GH0.tar.gz) = d563b9be5ea5690ec2579c688db5bedbba3787b9b46428fa4164fc172e0c9322 +SIZE (signalapp-Signal-Desktop-v5.47.0_GH0.tar.gz) = 37818277 diff --git a/net-im/signal-desktop/files/patch-package.json b/net-im/signal-desktop/files/patch-package.json new file mode 100644 index 000000000000..8bee8148561d --- /dev/null +++ b/net-im/signal-desktop/files/patch-package.json @@ -0,0 +1,28 @@ +--- package.json.orig 2022-06-23 21:39:35 UTC ++++ package.json +@@ -189,7 +189,6 @@ + "@babel/preset-typescript": "7.17.12", + "@electron/fuses": "1.5.0", + "@mixer/parallel-prettier": "2.0.1", +- "@signalapp/mock-server": "1.5.1", + "@storybook/addon-a11y": "6.5.6", + "@storybook/addon-actions": "6.5.6", + "@storybook/addon-controls": "6.5.6", +@@ -266,7 +265,7 @@ + "cross-env": "5.2.0", + "css-loader": "3.2.0", + "debug": "4.3.3", +- "electron": "19.0.5", ++ "electron": "19.0.6", + "electron-builder": "23.0.8", + "electron-mocha": "11.0.2", + "electron-notarize": "1.2.1", +@@ -313,7 +312,7 @@ + "sharp/color/color-string": "1.7.4" + }, + "engines": { +- "node": "16.13.2" ++ "node": "16.15.1" + }, + "build": { + "appId": "org.whispersystems.signal-desktop", diff --git a/net-im/signal-desktop/files/patch-packages.json b/net-im/signal-desktop/files/patch-packages.json deleted file mode 100644 index 98a60920159d..000000000000 --- a/net-im/signal-desktop/files/patch-packages.json +++ /dev/null @@ -1,20 +0,0 @@ ---- package.json.orig 2022-06-16 19:08:59 UTC -+++ package.json -@@ -264,7 +264,7 @@ - "cross-env": "5.2.0", - "css-loader": "3.2.0", - "debug": "4.3.3", -- "electron": "18.3.2", -+ "electron": "18.3.3", - "electron-builder": "23.0.8", - "electron-mocha": "11.0.2", - "electron-notarize": "1.2.1", -@@ -309,7 +309,7 @@ - "sharp/color/color-string": "1.7.4" - }, - "engines": { -- "node": "16.13.2" -+ "node": "16.15.1" - }, - "build": { - "appId": "org.whispersystems.signal-desktop", diff --git a/net-im/signal-desktop/files/patch-signal-desktop b/net-im/signal-desktop/files/patch-signal-desktop index 1e8b0ab804ff..1ecb066caf3f 100644 --- a/net-im/signal-desktop/files/patch-signal-desktop +++ b/net-im/signal-desktop/files/patch-signal-desktop @@ -109,17 +109,22 @@ it('returns true on Windows 7', () => { --- ts/test-node/util/getUserAgent_test.ts 2022-02-12 02:48:01.000000000 +0100 +++ ts/test-node/util/getUserAgent_test.ts 2022-02-18 20:42:25.165838000 +0100 -@@ -30,8 +30,8 @@ describe('getUserAgent', () => { - assert.strictEqual(getUserAgent('1.2.3'), 'Signal-Desktop/1.2.3 Linux'); +@@ -39,6 +39,14 @@ describe('getUserAgent', () => { + ); }); -- it('omits the platform on unsupported platforms', function test() { -+ it('returns the right User-Agent on Linux', function test() { ++ it('returns the right User-Agent on FreeBSD', function test() { ++ this.sandbox.stub(process, 'platform').get(() => 'freebsd'); ++ assert.strictEqual( ++ getUserAgent('1.2.3', '13.1'), ++ 'Signal-Desktop/1.2.3 FreeBSD 13.1' ++ ); ++ }); ++ + it('omits the platform on unsupported platforms', function test() { this.sandbox.stub(process, 'platform').get(() => 'freebsd'); -- assert.strictEqual(getUserAgent('1.2.3'), 'Signal-Desktop/1.2.3'); -+ assert.strictEqual(getUserAgent('1.2.3'), 'Signal-Desktop/1.2.3 Linux'); - }); - }); + assert.strictEqual(getUserAgent('1.2.3', '13.1'), 'Signal-Desktop/1.2.3'); + --- ts/util/getUserAgent.ts 2022-02-12 02:48:01.000000000 +0100 +++ ts/util/getUserAgent.ts 2022-02-18 20:43:07.232944000 +0100 @@ -7,6 +7,7 @@ const PLATFORM_STRINGS: { [platform: string]: string } diff --git a/net-im/signal-desktop/files/patch-yarn.lock b/net-im/signal-desktop/files/patch-yarn.lock index a3e3dcaef46c..6dbad52251af 100644 --- a/net-im/signal-desktop/files/patch-yarn.lock +++ b/net-im/signal-desktop/files/patch-yarn.lock @@ -1,17 +1,17 @@ ---- yarn.lock.orig 2022-06-16 19:08:59 UTC +--- yarn.lock.orig 2022-06-23 21:39:35 UTC +++ yarn.lock -@@ -6220,10 +6220,10 @@ electron-window@^0.8.0: +@@ -6870,10 +6870,10 @@ electron-window@^0.8.0: dependencies: is-electron-renderer "^2.0.0" --electron@18.3.2: -- version "18.3.2" -- resolved "https://registry.yarnpkg.com/electron/-/electron-18.3.2.tgz#015a8f4c92c62855d7f33206f2166d3e33b053b7" -- integrity sha512-Q1ciZ1M90L71WvyLbkD8Iwaq4YCwo8NUpBiLQUsd6M4E7i5vrzsA4g5Ylfzyela8DgRCNVknDVDfj6s+7YVWpA== -+electron@18.3.3: -+ version "18.3.3" -+ resolved "https://registry.yarnpkg.com/electron/-/electron-18.3.3.tgz#1c48273c1ad1522b8c18f19575e862c7ccd9f409" -+ integrity "sha512-LYxf3uCDc/r0klu7LL0eZLxkseoGIY/vrCfS0Qj4YTU3M7LLjOaIqrajI7icKwaI2dgxiuJJH3n4eqALFpJAFg==" +-electron@19.0.5: +- version "19.0.5" +- resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.5.tgz#852042c3f598cf2b3874cbcccc0308002c2b3fe9" +- integrity sha512-gC4kPr/Mf7QbeE5NAo1AC4Zg/SXLnW0ttlyzhVdyB2aErBspWh231UhHLJUlOdaVNqitdbnppdaXjoZHsR5QzQ== ++electron@19.0.6: ++ version "19.0.6" ++ resolved "https://registry.npmjs.org/electron/-/electron-19.0.6.tgz#7aacfa4e968f134eecc36a1b03e3f9954ed8f6a5" ++ integrity sha512-S9Yud32nKhB0iWC0lGl2JXz4FQnCiLCnP5Vehm1/CqyeICcQGmgQaZl2HYpCJ2pesKIsYL9nsgmku/10cxm/gg== dependencies: - "@electron/get" "^1.13.0" + "@electron/get" "^1.14.1" "@types/node" "^16.11.26" diff --git a/net-im/signal-desktop/pkg-plist b/net-im/signal-desktop/pkg-plist index bd891fab7afd..be1863b8bd50 100644 --- a/net-im/signal-desktop/pkg-plist +++ b/net-im/signal-desktop/pkg-plist @@ -90,7 +90,5 @@ share/pixmaps/signal-desktop.png %%DATADIR%%/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp-freebsd-x64.node @(,,755) %%DATADIR%%/signal-desktop %%DATADIR%%/snapshot_blob.bin -%%DATADIR%%/swiftshader/libEGL.so -%%DATADIR%%/swiftshader/libGLESv2.so %%DATADIR%%/v8_context_snapshot.bin %%DATADIR%%/vk_swiftshader_icd.json