git: 1eb4648e90dc - main - net-im/signal-desktop: Update to 6.20.0

From: Mikael Urankar <mikael_at_FreeBSD.org>
Date: Sun, 04 Jun 2023 16:11:03 UTC
The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1eb4648e90dc0d5f8935cc2cae219069ad10a347

commit 1eb4648e90dc0d5f8935cc2cae219069ad10a347
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2023-06-04 10:23:52 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2023-06-04 16:10:58 +0000

    net-im/signal-desktop: Update to 6.20.0
    
    Changes:
      https://github.com/signalapp/Signal-Desktop/releases/tag/v6.18.0
      https://github.com/signalapp/Signal-Desktop/releases/tag/v6.18.1
      https://github.com/signalapp/Signal-Desktop/releases/tag/v6.19.0
      https://github.com/signalapp/Signal-Desktop/releases/tag/v6.20.0
---
 net-im/signal-desktop/Makefile                   | 12 ++++++------
 net-im/signal-desktop/distinfo                   | 10 +++++-----
 net-im/signal-desktop/files/patch-signal-desktop |  9 ---------
 net-im/signal-desktop/get_deps.sh                |  4 ++--
 net-im/signal-desktop/pkg-plist                  |  3 +--
 5 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile
index 06eebaa22975..5fe3350ea2f7 100644
--- a/net-im/signal-desktop/Makefile
+++ b/net-im/signal-desktop/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	signal-desktop
 DISTVERSIONPREFIX=	v
-DISTVERSION=	6.17.1
+DISTVERSION=	6.20.0
 CATEGORIES=	net-im
 MASTER_SITES=	LOCAL/mikael/signal-desktop/:npm \
 		LOCAL/mikael/signal-desktop/:sqlite \
@@ -82,11 +82,11 @@ MAKE_ENV+=	ESBUILD_BINARY_PATH=${WRKDIR}/esbuild-freebsd-64/package/bin/esbuild
 
 _BUILD_DATE=	$$(date +'%s')
 
-ELECTRON_VER_MAJOR=	22
+ELECTRON_VER_MAJOR=	24
 
 # sh get_deps.sh
 NPM_SIGNAL_DIR=		npm-@signalapp-libsignal-client-0.22.0-d57441612df46f90df68fc5d9ad45b857b9d2c44-integrity
-NPM_RINGRTC_DIR=	npm-@signalapp-ringrtc-2.26.4-0d0e4ee9f7afc93d951a27ab3d23b53a4b9ab76a-integrity
+NPM_RINGRTC_DIR=	npm-@signalapp-ringrtc-2.27.0-f9fd646b3e9ea5e4b9ecee76c73a8cceddda2965-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
@@ -141,10 +141,10 @@ 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
+	${ECHO_CMD} 'nodedir "${LOCALBASE}/share/electron24/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
+# electron-builder is stupid and tries to open ${LOCALBASE}/share/electron24/electron with WRITE priv
+# copy ${LOCALBASE}/share/electron24 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}
diff --git a/net-im/signal-desktop/distinfo b/net-im/signal-desktop/distinfo
index 11b548824a67..20e7db7a1db5 100644
--- a/net-im/signal-desktop/distinfo
+++ b/net-im/signal-desktop/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1683906146
-SHA256 (signal-desktop-6.17.1-yarn-cache.tar.gz) = e0ba41e624c8d59c09a9378f993186640de19b34b19ef53021b6869901da6085
-SIZE (signal-desktop-6.17.1-yarn-cache.tar.gz) = 356982672
+TIMESTAMP = 1685861182
+SHA256 (signal-desktop-6.20.0-yarn-cache.tar.gz) = a045b44a79804ec128fbf62c117cbdee6f810bc241f0bddb9d31bdf7ed2f4fe7
+SIZE (signal-desktop-6.20.0-yarn-cache.tar.gz) = 357227912
 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.17.1_GH0.tar.gz) = 37625d977bbf0e64494662e4d9cd45fa7ff04cca68f7ea53a3e13d7b23cc7fdd
-SIZE (signalapp-Signal-Desktop-v6.17.1_GH0.tar.gz) = 43747369
+SHA256 (signalapp-Signal-Desktop-v6.20.0_GH0.tar.gz) = fc92011c51da6792215eb92d48afc17f1967caeade1307daaa13884244d7a3b0
+SIZE (signalapp-Signal-Desktop-v6.20.0_GH0.tar.gz) = 43817361
diff --git a/net-im/signal-desktop/files/patch-signal-desktop b/net-im/signal-desktop/files/patch-signal-desktop
index a19bfa4869ed..9461e6cbe434 100644
--- a/net-im/signal-desktop/files/patch-signal-desktop
+++ b/net-im/signal-desktop/files/patch-signal-desktop
@@ -41,15 +41,6 @@
  export function getUserAgent(appVersion: string): string {
 --- ts/types/Settings.ts.orig	2022-02-16 16:11:39.000000000 +0100
 +++ ts/types/Settings.ts	2022-02-19 22:18:16.945135000 +0100
-@@ -19,7 +19,7 @@ export function getAudioNotificationSupport(): AudioNo
-   if (OS.isWindows(MIN_WINDOWS_VERSION) || OS.isMacOS()) {
-     return AudioNotificationSupport.Native;
-   }
--  if (OS.isLinux()) {
-+  if (OS.isLinux() || OS.isFreeBSD) {
-     return AudioNotificationSupport.Custom;
-   }
-   return AudioNotificationSupport.None;
 @@ -60,7 +60,7 @@ export const getTitleBarVisibility = (): TitleBarVisib
   */
  export const isSystemTraySupported = (appVersion: string): boolean =>
diff --git a/net-im/signal-desktop/get_deps.sh b/net-im/signal-desktop/get_deps.sh
index 7fbc105aff82..316dc844c7b6 100644
--- a/net-im/signal-desktop/get_deps.sh
+++ b/net-im/signal-desktop/get_deps.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-SIGNAL_VERS=v6.17.1
+SIGNAL_VERS=v6.20.0
 
 fetch -qo /tmp/package.json https://raw.githubusercontent.com/signalapp/Signal-Desktop/${SIGNAL_VERS}/package.json
 ringrtc_version=$(grep '@signalapp/ringrtc"' /tmp/package.json | awk -F ":" '{print $2}' | sed -E 's#("|,| )##g')
@@ -31,7 +31,7 @@ echo "Signal-FTS5-Extension= ${TOKENIZER_VERSION}"
 echo "SQLCIPHER=sqlcipher-${TAG}-${HASH}" | portedit merge -i Makefile
 
 fetch -qo /tmp/yarn.lock https://raw.githubusercontent.com/signalapp/Signal-Desktop/${SIGNAL_VERS}/yarn.lock
-npm_signal_hash=$(grep libsignal-client /tmp/yarn.lock | awk -F '#' /resolved/'{print $2}' | sed 's/"//g')
+npm_signal_hash=$(egrep "libsignal-client.*${libsignalclient_version}" /tmp/yarn.lock | awk -F '#' /resolved/'{print $2}' | sed 's/"//g')
 echo "NPM_SIGNAL_DIR=npm-@signalapp-libsignal-client-${libsignalclient_version}-${npm_signal_hash}-integrity" | portedit merge -i Makefile
 
 npm_ringrtc_hash=$(grep ringrtc /tmp/yarn.lock | awk -F '#' /resolved/'{print $2}' | sed 's/"//g')
diff --git a/net-im/signal-desktop/pkg-plist b/net-im/signal-desktop/pkg-plist
index 59a21e979fb4..292f604dcb70 100644
--- a/net-im/signal-desktop/pkg-plist
+++ b/net-im/signal-desktop/pkg-plist
@@ -82,8 +82,6 @@ share/pixmaps/signal-desktop.png
 %%DATADIR%%/locales/sl-SI.pak
 %%DATADIR%%/locales/sl.pak
 %%DATADIR%%/locales/sq-AL.pak
-%%DATADIR%%/locales/sr-RS.pak
-%%DATADIR%%/locales/sr-YR.pak
 %%DATADIR%%/locales/sr.pak
 %%DATADIR%%/locales/sv.pak
 %%DATADIR%%/locales/sw.pak
@@ -102,6 +100,7 @@ share/pixmaps/signal-desktop.png
 %%DATADIR%%/locales/yue.pak
 %%DATADIR%%/locales/zh-CN.pak
 %%DATADIR%%/locales/zh-HK.pak
+%%DATADIR%%/locales/zh-Hant.pak
 %%DATADIR%%/locales/zh-TW.pak
 %%DATADIR%%/resources.pak
 %%DATADIR%%/resources/app.asar