From nobody Fri May 12 16:13:36 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 4QHv2S3TyZz4BBKD; Fri, 12 May 2023 16:13:36 +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 4QHv2S2nk8z4HhS; Fri, 12 May 2023 16:13:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683908016; 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=Pje5s634PST2eemP3WEkzYOf+joIaYIKxGMRMqPbj0s=; b=bVSXNKu9WU0UZapkpQY7VpOp51xdPUFlEYHM1+F+x8JkFU9GQW7Ftv8GUHAcSR0rnIst8d ADcmw/zclztw1HcjUL/67+C67BAWQcNn5sHjnoCtvLNRTZ1egcKOH6enkpegIkbTtNAgVh 867mMSFE/64zTJ4VNO5YkvW7jvT3dVjOAvddAZG6ps14mnUqnQnuhK2NANxMc6zB9fHBWg viXGT64EpQ3hq5p+IFOdo8y8CuzOv5lNSWhgYMM1T3VSy5RYeasM85N7sxPKcuzzLzIw8i Zv4WYstrqmH2zPElZz4qn00QdC0XbygSEP6OcBJhU1cNHxTfx+YxpAsW3vZnvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683908016; 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=Pje5s634PST2eemP3WEkzYOf+joIaYIKxGMRMqPbj0s=; b=AKhMgKiywtYCJK4Tw1qchm84lQHf2LzZfxYDkpeC3qYj9GLaXV3M4P5tuKRMmushFLDvrn AykhV72i4O93d7KcLsSaCaRhnHmXm6fqH1id1oH0ZDgcCNRDI7y0MbuSnLsqumc9ns/uWg A/JHSpbs2Yp8sIVcbGFYypFsHkyaPjxBHWX/Qjo9ZYGkdBYwn1Rxk+Q4IsBgyxeGcKU7MN fhGNu8oFKeuI/ZAHEem5yZnwnjYQlNjvp3q8rbCkNPxINuRBpOOMe9/hQiGHY0PIb4I96D BaZ672kbIl8ILhwzF2x/rr+N5aEelmck/HLFDl0VfJS93YHk5sPGVkWA3qp9yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683908016; a=rsa-sha256; cv=none; b=pUpiKF2QDCOlM7LdMIpIwoayfltbeR1jeA+Ms1gsevx2/ke5JTB9exyYB/P1uKl47PBymX nqMDaMhekNc08yTg6c0ESlayay4+JkVE7a0U8V6Xnppo+EeQ0XT0phqLPka9FOMHd0ZN49 1ngWHTFt7bwlu88ItD42Wsc444U9zEwXTlCXzxeTwVqzIvz8bYMqVxON/Xelo2du9b6pXD ZYjM2uoEQKkqqn48OCTrw1bAq2BSeb44TLFo2b1tM78Q/9VQPy9hF/n8WvAWgZ9w04CUJf kvG6kNbdsXkOqXRpoeqAFClata07oo86HoQuNw5YBFzjhUPsppZqGn7yPfjrLw== 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 4QHv2S1vRlzhBy; Fri, 12 May 2023 16:13:36 +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 34CGDasg012548; Fri, 12 May 2023 16:13:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CGDalC012547; Fri, 12 May 2023 16:13:36 GMT (envelope-from git) Date: Fri, 12 May 2023 16:13:36 GMT Message-Id: <202305121613.34CGDalC012547@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: 48fb0f8eb21f - main - net-im/signal-desktop: Update to 6.17.1 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: 48fb0f8eb21f26cf4f97e1f6057348ce767e2434 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=48fb0f8eb21f26cf4f97e1f6057348ce767e2434 commit 48fb0f8eb21f26cf4f97e1f6057348ce767e2434 Author: Mikael Urankar AuthorDate: 2023-05-11 09:18:14 +0000 Commit: Mikael Urankar CommitDate: 2023-05-12 16:13:32 +0000 net-im/signal-desktop: Update to 6.17.1 Changes: https://github.com/signalapp/Signal-Desktop/releases/tag/v6.17.0 https://github.com/signalapp/Signal-Desktop/releases/tag/v6.17.1 --- net-im/signal-desktop/Makefile | 4 +- net-im/signal-desktop/distinfo | 10 ++--- net-im/signal-desktop/files/patch-signal-desktop | 57 +++++++++++++++--------- net-im/signal-desktop/get_deps.sh | 2 +- 4 files changed, 45 insertions(+), 28 deletions(-) diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile index 35db6d84e423..06eebaa22975 100644 --- a/net-im/signal-desktop/Makefile +++ b/net-im/signal-desktop/Makefile @@ -1,6 +1,6 @@ PORTNAME= signal-desktop DISTVERSIONPREFIX= v -DISTVERSION= 6.16.0 +DISTVERSION= 6.17.1 CATEGORIES= net-im MASTER_SITES= LOCAL/mikael/signal-desktop/:npm \ LOCAL/mikael/signal-desktop/:sqlite \ @@ -86,7 +86,7 @@ ELECTRON_VER_MAJOR= 22 # sh get_deps.sh NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.22.0-d57441612df46f90df68fc5d9ad45b857b9d2c44-integrity -NPM_RINGRTC_DIR= npm-@signalapp-ringrtc-2.26.2-6ca91cd4b2d3ed545eb87c4aaddcb3f8735ad85a-integrity +NPM_RINGRTC_DIR= npm-@signalapp-ringrtc-2.26.4-0d0e4ee9f7afc93d951a27ab3d23b53a4b9ab76a-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 diff --git a/net-im/signal-desktop/distinfo b/net-im/signal-desktop/distinfo index cf0550ec7871..11b548824a67 100644 --- a/net-im/signal-desktop/distinfo +++ b/net-im/signal-desktop/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1683650911 -SHA256 (signal-desktop-6.16.0-yarn-cache.tar.gz) = d61d4177e2d71e19c941831b109018c274f64fa4b48b1a5f64c9c8404d163224 -SIZE (signal-desktop-6.16.0-yarn-cache.tar.gz) = 356106776 +TIMESTAMP = 1683906146 +SHA256 (signal-desktop-6.17.1-yarn-cache.tar.gz) = e0ba41e624c8d59c09a9378f993186640de19b34b19ef53021b6869901da6085 +SIZE (signal-desktop-6.17.1-yarn-cache.tar.gz) = 356982672 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.16.0_GH0.tar.gz) = cfd68731007b41f72026a1cb32fb8f25c7131eb6e61edb0db4f9ebfd4878300c -SIZE (signalapp-Signal-Desktop-v6.16.0_GH0.tar.gz) = 40416690 +SHA256 (signalapp-Signal-Desktop-v6.17.1_GH0.tar.gz) = 37625d977bbf0e64494662e4d9cd45fa7ff04cca68f7ea53a3e13d7b23cc7fdd +SIZE (signalapp-Signal-Desktop-v6.17.1_GH0.tar.gz) = 43747369 diff --git a/net-im/signal-desktop/files/patch-signal-desktop b/net-im/signal-desktop/files/patch-signal-desktop index 848ea806949d..a19bfa4869ed 100644 --- a/net-im/signal-desktop/files/patch-signal-desktop +++ b/net-im/signal-desktop/files/patch-signal-desktop @@ -18,26 +18,6 @@ if (shouldIncludeEmoji) { return window.i18n('message--getNotificationText--text-with-emoji', { text: modifiedText, ---- ts/OS.ts.orig 2023-02-02 21:51:07.000000000 +0100 -+++ ts/OS.ts 2023-02-03 18:15:27.645364000 +0100 -@@ -22,6 +22,7 @@ export const isWindows = createIsPlatform('win32'); - export const isMacOS = createIsPlatform('darwin'); - export const isLinux = createIsPlatform('linux'); - export const isWindows = createIsPlatform('win32'); -+export const isFreeBSD = createIsPlatform('freebsd'); - - // Windows 10 and above - export const hasCustomTitleBar = (): boolean => -@@ -33,6 +34,9 @@ export const getName = (): string => { - } - if (isWindows()) { - return 'Windows'; -+ } -+ if (isFreeBSD()) { -+ return 'FreeBSD'; - } - return 'Linux'; - }; --- ts/services/notifications.ts 2022-02-12 02:48:01.000000000 +0100 +++ ts/services/notifications.ts 2022-02-18 20:39:11.725928000 +0100 @@ -143,7 +143,7 @@ class NotificationService extends EventEmitter { @@ -150,3 +130,40 @@ } return { +--- ts/util/os/shared.ts.orig 2023-05-11 11:10:27.504955000 +0200 ++++ ts/util/os/shared.ts 2023-05-11 11:11:17.326542000 +0200 +@@ -32,6 +32,7 @@ export function getOSFunctions(osRelease: string): OST + const isMacOS = createIsPlatform('darwin', osRelease); + const isLinux = createIsPlatform('linux', osRelease); + const isWindows = createIsPlatform('win32', osRelease); ++ const isFreeBSD = createIsPlatform('freebsd', osRelease); + + // Windows 10 and above + const hasCustomTitleBar = (): boolean => +@@ -44,6 +45,9 @@ export function getOSFunctions(osRelease: string): OST + if (isWindows()) { + return 'Windows'; + } ++ if (isFreeBSD()) { ++ return 'FreeBSD'; ++ } + return 'Linux'; + }; + +@@ -54,6 +58,9 @@ export function getOSFunctions(osRelease: string): OST + if (isWindows()) { + return 'os-windows'; + } ++ if (isFreeBSD()) { ++ return 'os-freebsd'; ++ } + return 'os-linux'; + }; + +@@ -64,5 +71,6 @@ export function getOSFunctions(osRelease: string): OST + isLinux, + isMacOS, + isWindows, ++ isFreeBSD, + }; + } diff --git a/net-im/signal-desktop/get_deps.sh b/net-im/signal-desktop/get_deps.sh index 609ae930d087..7fbc105aff82 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.16.0 +SIGNAL_VERS=v6.17.1 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')