git: eff09f94cc6b - main - net-im/signal-desktop: Update to 7.34.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Mikael Urankar <mikael_at_FreeBSD.org>
Date: Fri, 22 Nov 2024 15:00:01 UTC
The branch main has been updated by mikael:

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

commit eff09f94cc6bb12caf70293ef61234cf7d190694
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-11-22 10:18:27 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2024-11-22 14:59:10 +0000

    net-im/signal-desktop: Update to 7.34.0
---
 net-im/signal-desktop/Makefile               | 12 ++++++------
 net-im/signal-desktop/distinfo               | 14 +++++++-------
 net-im/signal-desktop/files/sqlite3.gyp.diff |  6 ++----
 net-im/signal-desktop/get_deps.sh            | 14 ++++++--------
 4 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile
index da6b86dd779e..25a4fd99682c 100644
--- a/net-im/signal-desktop/Makefile
+++ b/net-im/signal-desktop/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	signal-desktop
 DISTVERSIONPREFIX=	v
-DISTVERSION=	7.31.0
+DISTVERSION=	7.34.0
 CATEGORIES=	net-im
 MASTER_SITES=	LOCAL/mikael/signal-desktop/:npm \
 		https://build-artifacts.signal.org/desktop/:sqlcipher
@@ -23,7 +23,7 @@ EXTRACT_DEPENDS=jq:textproc/jq \
 BUILD_DEPENDS=	${LOCALBASE}/lib/libcrypto.a:security/openssl \
 		${LOCALBASE}/lib/libringrtc.so:multimedia/ringrtc \
 		${LOCALBASE}/lib/libsignal_node.so:net-im/libsignal-node \
-		${LOCALBASE}/lib/libsignal_tokenizer.a:devel/signal-fts5-extension \
+		${LOCALBASE}/lib/libsignal_sqlcipher_extension.a:devel/signal-sqlcipher-extension \
 		app-builder>0:devel/app-builder \
 		electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		esbuild:devel/esbuild \
@@ -86,10 +86,10 @@ MAKE_ENV+=	ESBUILD_BINARY_PATH=${LOCALBASE}/bin/esbuild
 
 _BUILD_DATE=	$$(date +'%s')
 
-ELECTRON_VER_MAJOR=	30
+ELECTRON_VER_MAJOR=	32
 ESBUILD_VERSION=	0.21.2
 
-SQLCIPHER=	sqlcipher-4.6.1--3.0.7--0.2.1-7c30de8bcb5d21127803f5ab19a097e1b508d05744aca3ac6166352506b5f451
+SQLCIPHER=	sqlcipher-v2-4.6.1-signal-patch2--0.2.0-b0dbebe5b2d81879984bfa2318ba364fb4d436669ddc1668d2406eaaaee40b7e
 
 NODE_ARCH=	${ARCH:S/aarch64/arm64/:S/amd64/x64/}
 APP_OUT_DIR=	linux-${ARCH:S/aarch64/arm64-/:S/amd64//}unpacked
@@ -125,8 +125,8 @@ post-extract:
 		${SETENV} ${MAKE_ENV} npm install --ignore-optional --ignore-scripts --offline || ${TRUE}
 
 do-build:
-# electron-builder is stupid and tries to open ${LOCALBASE}/share/electron30/electron with WRITE priv
-# copy ${LOCALBASE}/share/electron30 in WRKDIR
+# electron-builder is stupid and tries to open ${LOCALBASE}/share/electron32/electron with WRITE priv
+# copy ${LOCALBASE}/share/electron32 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 a4f0b84b5cb0..360c1ebaae7b 100644
--- a/net-im/signal-desktop/distinfo
+++ b/net-im/signal-desktop/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1730490880
-SHA256 (signal-desktop-7.31.0-npm-cache.tar.gz) = a7dd02f582b20f4e64458f9493020a7af1064a242e8449dd897995d918bad433
-SIZE (signal-desktop-7.31.0-npm-cache.tar.gz) = 322228663
-SHA256 (sqlcipher-4.6.1--3.0.7--0.2.1-7c30de8bcb5d21127803f5ab19a097e1b508d05744aca3ac6166352506b5f451.tar.gz) = 7c30de8bcb5d21127803f5ab19a097e1b508d05744aca3ac6166352506b5f451
-SIZE (sqlcipher-4.6.1--3.0.7--0.2.1-7c30de8bcb5d21127803f5ab19a097e1b508d05744aca3ac6166352506b5f451.tar.gz) = 75824751
-SHA256 (signalapp-Signal-Desktop-v7.31.0_GH0.tar.gz) = ab1309ace701936fbb0666cc0de77ecf987f85fa5bd356bcde770c2145e63b45
-SIZE (signalapp-Signal-Desktop-v7.31.0_GH0.tar.gz) = 42462900
+TIMESTAMP = 1732269526
+SHA256 (signal-desktop-7.34.0-npm-cache.tar.gz) = 039e800779acc92d280ed6ff6d7fbcb91d8e601d7998dc2f588b1bfc3a345d6f
+SIZE (signal-desktop-7.34.0-npm-cache.tar.gz) = 326055586
+SHA256 (sqlcipher-v2-4.6.1-signal-patch2--0.2.0-b0dbebe5b2d81879984bfa2318ba364fb4d436669ddc1668d2406eaaaee40b7e.tar.gz) = b0dbebe5b2d81879984bfa2318ba364fb4d436669ddc1668d2406eaaaee40b7e
+SIZE (sqlcipher-v2-4.6.1-signal-patch2--0.2.0-b0dbebe5b2d81879984bfa2318ba364fb4d436669ddc1668d2406eaaaee40b7e.tar.gz) = 9422094
+SHA256 (signalapp-Signal-Desktop-v7.34.0_GH0.tar.gz) = 0119578e90afc4e3421682beef0cc6cbe373f13126fad40568a08492d4088a28
+SIZE (signalapp-Signal-Desktop-v7.34.0_GH0.tar.gz) = 43070491
diff --git a/net-im/signal-desktop/files/sqlite3.gyp.diff b/net-im/signal-desktop/files/sqlite3.gyp.diff
index b10d294bd1b7..d7bcecede93b 100644
--- a/net-im/signal-desktop/files/sqlite3.gyp.diff
+++ b/net-im/signal-desktop/files/sqlite3.gyp.diff
@@ -1,15 +1,13 @@
 --- node_modules/@signalapp/better-sqlite3/deps/sqlite3.gyp.orig	2022-07-02 14:34:04 UTC
 +++ node_modules/@signalapp/better-sqlite3/deps/sqlite3.gyp
-@@ -100,6 +100,15 @@
+@@ -90,6 +90,13 @@
              ]
            }
          },
 +        'OS == "freebsd"', {
 +          'link_settings': {
 +            'libraries': [
-+              # This statically links libcrypto, whereas -lcrypto would dynamically link it
-+              '/usr/local/lib/libcrypto.a',
-+              '/usr/local/lib/libsignal_tokenizer.a'
++              '/usr/local/lib/libsignal_sqlcipher_extension.a',
 +             ]
 +           }
 +         },
diff --git a/net-im/signal-desktop/get_deps.sh b/net-im/signal-desktop/get_deps.sh
index 5a62a466320a..7cf85dcaaabd 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=v7.31.0
+SIGNAL_VERS=v7.34.0
 
 fetch -qo /tmp/package.json https://raw.githubusercontent.com/signalapp/Signal-Desktop/${SIGNAL_VERS}/package.json
 node_version=$(awk /'"node":'/'{print $2}' /tmp/package.json | sed 's/"//g')
@@ -23,10 +23,8 @@ fetch -qo /tmp/download.js https://raw.githubusercontent.com/signalapp/better-sq
 BASE_URI=https://build-artifacts.signal.org/desktop
 HASH=$(awk /"HASH ="/'{print $4}' /tmp/download.js | sed -e 's#;##g' -e "s#'##g")
 SQLCIPHER_VERSION=$(awk /"SQLCIPHER_VERSION ="/'{print $4}' /tmp/download.js | sed -e 's#;##g' -e "s#'##g")
-OPENSSL_VERSION=$(awk /"OPENSSL_VERSION ="/'{print $4}' /tmp/download.js | sed -e 's#;##g' -e "s#'##g")
-TOKENIZER_VERSION=$(awk /"TOKENIZER_VERSION ="/'{print $4}' /tmp/download.js | sed -e 's#;##g' -e "s#'##g")
-TAG="${SQLCIPHER_VERSION}--${OPENSSL_VERSION}--${TOKENIZER_VERSION}"
-echo "Signal-FTS5-Extension= ${TOKENIZER_VERSION}"
-echo "SQLCIPHER=sqlcipher-${TAG}-${HASH}" | portedit merge -i Makefile
-
-echo "fetch https://build-artifacts.signal.org/desktop/sqlcipher-${TAG}-${HASH}.tar.gz"
+SQLCIPHER_VERSION=$(awk /"SQLCIPHER_VERSION ="/'{print $4}' /tmp/download.js | sed -e 's#;##g' -e "s#'##g")
+EXTENSION_VERSION=$(awk /"EXTENSION_VERSION ="/'{print $4}' /tmp/download.js | sed -e 's#;##g' -e "s#'##g")
+TAG="${SQLCIPHER_VERSION}--${EXTENSION_VERSION}"
+echo "SQLCIPHER=sqlcipher-v2-${TAG}-${HASH}" | portedit merge -i Makefile
+echo "SQLCIPHER=sqlcipher-v2-${TAG}-${HASH}" | portedit merge -i Makefile.online