Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Sep 2024 07:04:53 GMT
From:      Mikael Urankar <mikael@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 8e41b84f9b1a - main - net-im/signal-desktop: Fix build
Message-ID:  <202409110704.48B74rJj037106@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael:

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

commit 8e41b84f9b1a341035ece81ec08ff4db1acdedd8
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-09-11 07:04:18 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2024-09-11 07:04:18 +0000

    net-im/signal-desktop: Fix build
    
    Bump better-sqlite3 to the required version.
    
    PR:             281430
---
 net-im/signal-desktop/Makefile    |  2 +-
 net-im/signal-desktop/distinfo    |  6 +++---
 net-im/signal-desktop/get_deps.sh | 12 ++++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile
index 39ed8c0e4d1b..ac013fffb2eb 100644
--- a/net-im/signal-desktop/Makefile
+++ b/net-im/signal-desktop/Makefile
@@ -89,7 +89,7 @@ _BUILD_DATE=	$$(date +'%s')
 ELECTRON_VER_MAJOR=	30
 ESBUILD_VERSION=	0.21.2
 
-SQLCIPHER=	sqlcipher-4.5.5-fts5-fix--3.0.7--0.2.1-ef53ea45ed92b928ecfd33c552d8d405263e86e63dec38e1ec63e1b0193b630b
+SQLCIPHER=	sqlcipher-4.6.1--3.0.7--0.2.1-7c30de8bcb5d21127803f5ab19a097e1b508d05744aca3ac6166352506b5f451
 
 NODE_ARCH=	${ARCH:S/aarch64/arm64/:S/amd64/x64/}
 APP_OUT_DIR=	linux-${ARCH:S/aarch64/arm64-/:S/amd64//}unpacked
diff --git a/net-im/signal-desktop/distinfo b/net-im/signal-desktop/distinfo
index e39c808be547..5df0b7d74d9b 100644
--- a/net-im/signal-desktop/distinfo
+++ b/net-im/signal-desktop/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1725883102
+TIMESTAMP = 1726037877
 SHA256 (signal-desktop-7.23.0-npm-cache.tar.gz) = 1c2f8c03c4676c73ba368e919a3005e0ce1bfd773b3e329fe0c042f977a53123
 SIZE (signal-desktop-7.23.0-npm-cache.tar.gz) = 324496050
-SHA256 (sqlcipher-4.5.5-fts5-fix--3.0.7--0.2.1-ef53ea45ed92b928ecfd33c552d8d405263e86e63dec38e1ec63e1b0193b630b.tar.gz) = ef53ea45ed92b928ecfd33c552d8d405263e86e63dec38e1ec63e1b0193b630b
-SIZE (sqlcipher-4.5.5-fts5-fix--3.0.7--0.2.1-ef53ea45ed92b928ecfd33c552d8d405263e86e63dec38e1ec63e1b0193b630b.tar.gz) = 75708533
+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.23.0_GH0.tar.gz) = 00b3d03050545cc5f6d3fc9c729627ca7068d75476fc33c791c171530689ed5d
 SIZE (signalapp-Signal-Desktop-v7.23.0_GH0.tar.gz) = 42326613
diff --git a/net-im/signal-desktop/get_deps.sh b/net-im/signal-desktop/get_deps.sh
index cccc2a4c122a..284303f8693a 100644
--- a/net-im/signal-desktop/get_deps.sh
+++ b/net-im/signal-desktop/get_deps.sh
@@ -18,3 +18,15 @@ electron_version=$(grep '"electron":' /tmp/package.json | awk -F ":" '{print $2}
 echo "ELECTRON_VERSION= ${electron_version}"
 
 bsqlite3_version=$(grep '@signalapp/better-sqlite3' /tmp/package.json | awk -F ":" '{print $2}' | sed -E 's#("|,| )##g')
+
+fetch -qo /tmp/download.js https://raw.githubusercontent.com/signalapp/better-sqlite3/v${bsqlite3_version}/deps/download.js
+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"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409110704.48B74rJj037106>