[PR PATCH] Signal-Desktop: update to 7.23.0.

[PR PATCH] Signal-Desktop: update to 7.23.0.

[MouadCharradi]

[-- Attachment #1: Type: text/plain, Size: 914 bytes --]

There is a new pull request by MouadCharradi against master on the void-packages repository

https://github.com/MouadCharradi/void-packages Signal-Desktop
https://github.com/void-linux/void-packages/pull/52141

Signal-Desktop: update to 7.23.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


Using `yarn` to build the package resulted in many errors, so I decided to use `npm` instead (I copied the commands from the way Arch Linux does it). I also added a desktop that I copied from `/usr/share/applications`, since I got a build error saying that it was not found without it.

This still needs some testing,
People who might know about this more than me, any suggestions are welcome. Thanks

A patch file from https://github.com/void-linux/void-packages/pull/52141.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-Signal-Desktop-52141.patch --]
[-- Type: text/x-diff, Size: 3000 bytes --]

From 246a8fa8a39b2eb779d401e793306714c77f5a19 Mon Sep 17 00:00:00 2001
From: Mouad Charradi <charradimouad58@gmail.com>
Date: Sun, 8 Sep 2024 00:01:12 +0100
Subject: [PATCH] Signal-Desktop: update to 7.23.0.

---
 .../files/signal-desktop.desktop              | 10 ++++++++
 srcpkgs/Signal-Desktop/template               | 23 ++++++++++---------
 2 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/Signal-Desktop/files/signal-desktop.desktop

diff --git a/srcpkgs/Signal-Desktop/files/signal-desktop.desktop b/srcpkgs/Signal-Desktop/files/signal-desktop.desktop
new file mode 100644
index 00000000000000..037b39f212fb77
--- /dev/null
+++ b/srcpkgs/Signal-Desktop/files/signal-desktop.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Signal
+Exec=signal-desktop --no-sandbox %U
+Terminal=false
+Type=Application
+Icon=signal-desktop
+StartupWMClass=Signal
+Comment=Private messaging from your desktop
+MimeType=x-scheme-handler/sgnl;x-scheme-handler/signalcaptcha;
+Categories=Network;InstantMessaging;Chat;
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index be7236daea620a..535e000a8fe9e5 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=7.21.0
+version=7.23.0
 revision=1
 # Signal officially only supports x86_64
 # x86_64-musl could potentially work based on the Alpine port:
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=4506a3639685dd191f713d70ed3c6624a77cafe8fd6ff3f113b340d2cd337526
+checksum=00b3d03050545cc5f6d3fc9c729627ca7068d75476fc33c791c171530689ed5d
 nostrip_files="signal-desktop"
 
 post_extract() {
@@ -23,18 +23,19 @@ post_extract() {
 
 	vsed 's/"node": ".*"/"node": ">=20.0.0"/' -i package.json
 
-	npm install -g yarn
-	# Dependencies have to be installed before applying patch
-	yarn install --ignore-engines --frozen-lockfile
+	# Install dependencies for sticker-creator
+	npm --prefix ./sticker-creator/ install
+
+	# Install dependencies for signal-desktop
+	npm install --ignore-engines
 }
 
 do_build() {
-	yarn generate
-	yarn build-release
+	# Build the sticker creator
+	npm --prefix ./sticker-creator/ run build
 
-	bsdtar xOf release/signal-desktop_*.deb data.tar.xz | \
-		bsdtar xO ./usr/share/applications/signal-desktop.desktop > signal-desktop.desktop
-	vsed -i -e 's/\/opt\/Signal\///' signal-desktop.desktop
+	# Build signal-desktop
+	npm run build
 }
 
 do_install() {
@@ -51,7 +52,7 @@ do_install() {
 	vmkdir usr/bin
 	ln -s /usr/lib/signal-desktop/signal-desktop ${DESTDIR}/usr/bin/
 
-	vinstall signal-desktop.desktop 644 usr/share/applications
+	vinstall ${FILESDIR}/signal-desktop.desktop 644 usr/share/applications
 
 	vmkdir usr/share/icons/hicolor
 	for size in 16 32 256; do

Re: Signal-Desktop: update to 7.23.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52141#issuecomment-2351704481

Comment:
7.24.1 is available

Re: [PR REVIEW] Signal-Desktop: update to 7.23.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52141#discussion_r1760206641

Comment:
do not vendor desktop files like this (#49164). there is a script somewhere in the source that will generate it

Re: Signal-Desktop: update to 7.23.0.

[lawmanuk]

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

New comment by lawmanuk on void-packages repository

https://github.com/void-linux/void-packages/pull/52141#issuecomment-2351746084

Comment:
> 7.24.1 is available

i couldn't find this via xbps?

Please advise how to install latest version.  (super beginner question).

thx

Re: Signal-Desktop: update to 7.23.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 271 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52141#issuecomment-2351751606

Comment:
i was talking to the author of the PR about available upstream versions. this isn't available with xbps until this is merged

Re: [PR PATCH] [Updated] Signal-Desktop: update to 7.23.0.

[MouadCharradi]

[-- Attachment #1: Type: text/plain, Size: 919 bytes --]

There is an updated pull request by MouadCharradi against master on the void-packages repository

https://github.com/MouadCharradi/void-packages Signal-Desktop
https://github.com/void-linux/void-packages/pull/52141

Signal-Desktop: update to 7.23.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


Using `yarn` to build the package resulted in many errors, so I decided to use `npm` instead (I copied the commands from the way Arch Linux does it). I also added a desktop that I copied from `/usr/share/applications`, since I got a build error saying that it was not found without it.

This still needs some testing,
People who might know about this more than me, any suggestions are welcome. Thanks

A patch file from https://github.com/void-linux/void-packages/pull/52141.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-Signal-Desktop-52141.patch --]
[-- Type: text/x-diff, Size: 3000 bytes --]

From 6fea8abcd14d5cbd79dc497c8a537381b5e8127f Mon Sep 17 00:00:00 2001
From: Mouad Charradi <charradimouad58@gmail.com>
Date: Sun, 8 Sep 2024 00:01:12 +0100
Subject: [PATCH] Signal-Desktop: update to 7.24.1.

---
 .../files/signal-desktop.desktop              | 10 ++++++++
 srcpkgs/Signal-Desktop/template               | 23 ++++++++++---------
 2 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/Signal-Desktop/files/signal-desktop.desktop

diff --git a/srcpkgs/Signal-Desktop/files/signal-desktop.desktop b/srcpkgs/Signal-Desktop/files/signal-desktop.desktop
new file mode 100644
index 00000000000000..037b39f212fb77
--- /dev/null
+++ b/srcpkgs/Signal-Desktop/files/signal-desktop.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Signal
+Exec=signal-desktop --no-sandbox %U
+Terminal=false
+Type=Application
+Icon=signal-desktop
+StartupWMClass=Signal
+Comment=Private messaging from your desktop
+MimeType=x-scheme-handler/sgnl;x-scheme-handler/signalcaptcha;
+Categories=Network;InstantMessaging;Chat;
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index be7236daea620a..535e000a8fe9e5 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=7.21.0
+version=7.23.0
 revision=1
 # Signal officially only supports x86_64
 # x86_64-musl could potentially work based on the Alpine port:
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=4506a3639685dd191f713d70ed3c6624a77cafe8fd6ff3f113b340d2cd337526
+checksum=00b3d03050545cc5f6d3fc9c729627ca7068d75476fc33c791c171530689ed5d
 nostrip_files="signal-desktop"
 
 post_extract() {
@@ -23,18 +23,19 @@ post_extract() {
 
 	vsed 's/"node": ".*"/"node": ">=20.0.0"/' -i package.json
 
-	npm install -g yarn
-	# Dependencies have to be installed before applying patch
-	yarn install --ignore-engines --frozen-lockfile
+	# Install dependencies for sticker-creator
+	npm --prefix ./sticker-creator/ install
+
+	# Install dependencies for signal-desktop
+	npm install --ignore-engines
 }
 
 do_build() {
-	yarn generate
-	yarn build-release
+	# Build the sticker creator
+	npm --prefix ./sticker-creator/ run build
 
-	bsdtar xOf release/signal-desktop_*.deb data.tar.xz | \
-		bsdtar xO ./usr/share/applications/signal-desktop.desktop > signal-desktop.desktop
-	vsed -i -e 's/\/opt\/Signal\///' signal-desktop.desktop
+	# Build signal-desktop
+	npm run build
 }
 
 do_install() {
@@ -51,7 +52,7 @@ do_install() {
 	vmkdir usr/bin
 	ln -s /usr/lib/signal-desktop/signal-desktop ${DESTDIR}/usr/bin/
 
-	vinstall signal-desktop.desktop 644 usr/share/applications
+	vinstall ${FILESDIR}/signal-desktop.desktop 644 usr/share/applications
 
 	vmkdir usr/share/icons/hicolor
 	for size in 16 32 256; do

Re: [PR REVIEW] Signal-Desktop: update to 7.23.0.

[MouadCharradi]

[-- Attachment #1: Type: text/plain, Size: 335 bytes --]

New review comment by MouadCharradi on void-packages repository

https://github.com/void-linux/void-packages/pull/52141#discussion_r1760540637

Comment:
Thank you for point that out, I managed to make the script use the upstream `.desktop` file.
Also the package is now at the latest version, so hopefully the build passes.

Thanks

Re: [PR PATCH] [Updated] Signal-Desktop: update to 7.23.0.

[MouadCharradi]

[-- Attachment #1: Type: text/plain, Size: 919 bytes --]

There is an updated pull request by MouadCharradi against master on the void-packages repository

https://github.com/MouadCharradi/void-packages Signal-Desktop
https://github.com/void-linux/void-packages/pull/52141

Signal-Desktop: update to 7.23.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


Using `yarn` to build the package resulted in many errors, so I decided to use `npm` instead (I copied the commands from the way Arch Linux does it). I also added a desktop that I copied from `/usr/share/applications`, since I got a build error saying that it was not found without it.

This still needs some testing,
People who might know about this more than me, any suggestions are welcome. Thanks

A patch file from https://github.com/void-linux/void-packages/pull/52141.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-Signal-Desktop-52141.patch --]
[-- Type: text/x-diff, Size: 1994 bytes --]

From 4aa043d4b6b4fb503b75b6a6e374385e935e1af6 Mon Sep 17 00:00:00 2001
From: Mouad Charradi <charradimouad58@gmail.com>
Date: Sun, 8 Sep 2024 00:01:12 +0100
Subject: [PATCH] Signal-Desktop: update to 7.24.1.

---
 srcpkgs/Signal-Desktop/template | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index be7236daea620a..159562c0fbac1e 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=7.21.0
+version=7.24.1
 revision=1
 # Signal officially only supports x86_64
 # x86_64-musl could potentially work based on the Alpine port:
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=4506a3639685dd191f713d70ed3c6624a77cafe8fd6ff3f113b340d2cd337526
+checksum=e71ef8d89b79fc7322053c6511dfc2bef7a1160bd4214326961f964e5de2350d
 nostrip_files="signal-desktop"
 
 post_extract() {
@@ -23,15 +23,21 @@ post_extract() {
 
 	vsed 's/"node": ".*"/"node": ">=20.0.0"/' -i package.json
 
-	npm install -g yarn
-	# Dependencies have to be installed before applying patch
-	yarn install --ignore-engines --frozen-lockfile
+	# Install dependencies for sticker-creator
+	npm --prefix ./sticker-creator/ install
+
+	# Install dependencies for signal-desktop
+	npm install --ignore-engines
 }
 
 do_build() {
-	yarn generate
-	yarn build-release
+	# Build the sticker creator
+	npm --prefix ./sticker-creator/ run build
+
+	# Build signal-desktop
+	npm run build
 
+	# Extract the generated .desktop file
 	bsdtar xOf release/signal-desktop_*.deb data.tar.xz | \
 		bsdtar xO ./usr/share/applications/signal-desktop.desktop > signal-desktop.desktop
 	vsed -i -e 's/\/opt\/Signal\///' signal-desktop.desktop

Re: [PR PATCH] [Merged]: Signal-Desktop: update to 7.24.1.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 744 bytes --]

There's a merged pull request on the void-packages repository

Signal-Desktop: update to 7.24.1.
https://github.com/void-linux/void-packages/pull/52141

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


Using `yarn` to build the package resulted in many errors, so I decided to use `npm` instead (I copied the commands from the way Arch Linux does it). I also added a desktop that I copied from `/usr/share/applications`, since I got a build error saying that it was not found without it.

This still needs some testing,
People who might know about this more than me, any suggestions are welcome. Thanks