Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Signal-Desktop: update to 5.0.0.
@ 2021-05-05 17:52 lane-brain
  2021-05-05 17:54 ` lane-brain
                   ` (13 more replies)
  0 siblings, 14 replies; 16+ messages in thread
From: lane-brain @ 2021-05-05 17:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/lane-brain/void-packages Signal-Desktop
https://github.com/void-linux/void-packages/pull/30696

Signal-Desktop: update to 5.0.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 7817360cf2190594434ffe1be5f96652d3617254 Mon Sep 17 00:00:00 2001
From: lane-brain <lane@mailbox.org>
Date: Wed, 5 May 2021 13:50:08 -0400
Subject: [PATCH] Signal-Desktop: update to 5.0.0.

---
 .../files/expire-from-source-date-epoch.patch | 13 +++++++++
 .../files/openssl-linking.patch               | 19 ++++++++++++
 .../patches/update-dep-versions.patch         | 29 +++++++++++++++++++
 srcpkgs/Signal-Desktop/template               | 28 +++++++++++++-----
 4 files changed, 82 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/Signal-Desktop/files/expire-from-source-date-epoch.patch
 create mode 100644 srcpkgs/Signal-Desktop/files/openssl-linking.patch
 create mode 100644 srcpkgs/Signal-Desktop/patches/update-dep-versions.patch

diff --git a/srcpkgs/Signal-Desktop/files/expire-from-source-date-epoch.patch b/srcpkgs/Signal-Desktop/files/expire-from-source-date-epoch.patch
new file mode 100644
index 000000000000..d29c79835179
--- /dev/null
+++ b/srcpkgs/Signal-Desktop/files/expire-from-source-date-epoch.patch
@@ -0,0 +1,13 @@
+--- a/Gruntfile.js
++++ b/Gruntfile.js
+@@ -203,9 +203,7 @@ module.exports = grunt => {
+   });
+ 
+   grunt.registerTask('getExpireTime', () => {
+-    grunt.task.requires('gitinfo');
+-    const gitinfo = grunt.config.get('gitinfo');
+-    const committed = gitinfo.local.branch.current.lastCommitTime;
++    const committed = parseInt(process.env.SOURCE_DATE_EPOCH, 10) * 1000;
+     const time = Date.parse(committed) + 1000 * 60 * 60 * 24 * 90;
+     grunt.file.write(
+       'config/local-production.json',
diff --git a/srcpkgs/Signal-Desktop/files/openssl-linking.patch b/srcpkgs/Signal-Desktop/files/openssl-linking.patch
new file mode 100644
index 000000000000..7745f4f2b20e
--- /dev/null
+++ b/srcpkgs/Signal-Desktop/files/openssl-linking.patch
@@ -0,0 +1,19 @@
+--- a/node_modules/@journeyapps/sqlcipher/deps/sqlite3.gyp	2019-10-27 01:53:29.860275405 -0400
++++ b/node_modules/@journeyapps/sqlcipher/deps/sqlite3.gyp	2019-10-27 01:51:32.001730882 -0400
+@@ -73,7 +73,7 @@
+         'link_settings': {
+           'libraries': [
+             # This statically links libcrypto, whereas -lcrypto would dynamically link it
+-            '<(SHARED_INTERMEDIATE_DIR)/sqlcipher-amalgamation-<@(sqlite_version)/OpenSSL-Linux/libcrypto.a'
++            '-lcrypto'
+           ]
+         }
+       }]
+@@ -141,7 +141,6 @@
+         { # linux
+           'include_dirs': [
+             '<(SHARED_INTERMEDIATE_DIR)/sqlcipher-amalgamation-<@(sqlite_version)/',
+-            '<(SHARED_INTERMEDIATE_DIR)/sqlcipher-amalgamation-<@(sqlite_version)/openssl-include/'
+           ]
+         }]
+       ],
diff --git a/srcpkgs/Signal-Desktop/patches/update-dep-versions.patch b/srcpkgs/Signal-Desktop/patches/update-dep-versions.patch
new file mode 100644
index 000000000000..de9c5cd52de0
--- /dev/null
+++ b/srcpkgs/Signal-Desktop/patches/update-dep-versions.patch
@@ -0,0 +1,29 @@
+# * Set node to accept newer versions to fulfill dep
+# * Select node-gyp versions with python3 support
+#     - https://github.com/sass/node-sass/pull/2841
+#     - https://github.com/sass/node-sass/issues/2716
+--- package.json.orig	2021-04-15 21:50:37.757593564 -0400
++++ package.json	2021-04-15 21:51:37.819672207 -0400
+@@ -251,7 +251,7 @@
+     "jsdoc": "3.6.2",
+     "mocha": "4.1.0",
+     "mocha-testcheck": "1.0.0-rc.0",
+-    "node-gyp": "5.0.3",
++    "node-gyp": "6.1.0",
+     "node-sass": "4.14.1",
+     "node-sass-import-once": "1.2.0",
+     "npm-run-all": "4.1.5",
+@@ -273,11 +273,11 @@
+     "webpack-cli": "3.3.7",
+     "webpack-dev-server": "3.8.0"
+   },
+-  "resolutions": {
++  "resolutions": {"node-sass/node-gyp": "^6.0.0",
+     "@storybook/react/@storybook/core/node-fetch": "2.6.1"
+   },
+   "engines": {
+-    "node": "12.18.3"
++    "node": ">=12.18.3"
+   },
+   "build": {
+     "appId": "org.whispersystems.signal-desktop",
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 8999b6e483ff..ca66f97f6b21 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,26 +1,40 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=1.39.5
+version=5.0.0
 revision=1
 # Due to electron
 # 32-bit is not supported https://github.com/signalapp/Signal-Desktop/issues/1661
 archs="x86_64"
-hostmakedepends="git nodejs python tar yarn"
-depends="libnotify libappindicator"
+hostmakedepends="git git-lfs nodejs python3 tar yarn openssl"
+depends="gtk+3 libnotify libappindicator libvips"
 short_desc="Signal Private Messenger for Linux"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"
-license="GPL-3.0-only"
+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=f9f55c0195579b43712bf370b753337432eda4bcf89809d1c8f3deb0b4ee4400
+checksum=4ff58f5ab5f4de6477dd92069d8c2e9a830513acca527b51e0ee1c7cbe7d8627
 nostrip_files="signal-desktop"
 
 pre_build() {
-	vsed -e 's/"node": "/&>=/' -i package.json
+	# git-lfs hook needs to be installed for sqlcipher dependency 
+	git-lfs install
+
+	# `yarn cache clean` needed for sqlcipher dependency to install.
+	# Unfortunately, because we build from tarball we can't do this
+	# step at the beginning but only after we generate node_modules
+	# See: https://github.com/signalapp/Signal-Desktop/issues/5032
+	yarn install --ignore-engines || rm -r node_modules; yarn cache clean
+	yarn install --frozen-lockfile
+
+	# Have SQLCipher dynamically link from OpenSSL
+	# See https://github.com/signalapp/Signal-Desktop/issues/2634
+	patch --forward --strip=1 --input="${FILESDIR}/openssl-linking.patch"
+
+	# We can't read the release date from git so we use SOURCE_DATE_EPOCH instead
+	patch --forward --strip=1 --input="${FILESDIR}/expire-from-source-date-epoch.patch"
 }
 
 do_build() {
-	yarn install --ignore-engines
 	yarn grunt
 	yarn build-release --dir
 }

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Signal-Desktop: update to 5.0.0.
  2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
@ 2021-05-05 17:54 ` lane-brain
  2021-05-05 17:55 ` ericonr
                   ` (12 subsequent siblings)
  13 siblings, 0 replies; 16+ messages in thread
From: lane-brain @ 2021-05-05 17:54 UTC (permalink / raw)
  To: ml

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

New comment by lane-brain on void-packages repository

https://github.com/void-linux/void-packages/pull/30696#issuecomment-832890547

Comment:
Checked in with the maintainer @julio641742, they gave the go ahead to submit update PR

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Signal-Desktop: update to 5.0.0.
  2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
  2021-05-05 17:54 ` lane-brain
@ 2021-05-05 17:55 ` ericonr
  2021-05-05 18:03 ` ericonr
                   ` (11 subsequent siblings)
  13 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-05-05 17:55 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30696#issuecomment-832891205

Comment:
There's also #30505 

We need to figure out how to work with `git-lfs` here.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Signal-Desktop: update to 5.0.0.
  2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
  2021-05-05 17:54 ` lane-brain
  2021-05-05 17:55 ` ericonr
@ 2021-05-05 18:03 ` ericonr
  2021-05-05 18:45 ` lane-brain
                   ` (10 subsequent siblings)
  13 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-05-05 18:03 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30696#issuecomment-832896410

Comment:
Are these patches imported from arch's packaging? https://github.com/archlinux/svntogit-community/tree/packages/signal-desktop/trunk

I think changing git config would be bad, but could you do `export HOME=$(mktemp -d)` in `pre_configure` and `rm -rf $HOME` in `post_install` ? I think it would work around the current hang up.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Signal-Desktop: update to 5.0.0.
  2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
                   ` (2 preceding siblings ...)
  2021-05-05 18:03 ` ericonr
@ 2021-05-05 18:45 ` lane-brain
  2021-05-05 19:13 ` [PR REVIEW] " ericonr
                   ` (9 subsequent siblings)
  13 siblings, 0 replies; 16+ messages in thread
From: lane-brain @ 2021-05-05 18:45 UTC (permalink / raw)
  To: ml

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

New comment by lane-brain on void-packages repository

https://github.com/void-linux/void-packages/pull/30696#issuecomment-832924054

Comment:
The openssl linking and epoch source date patch yes. The former seemed justified because now we use openssl, the other one seemed necessitated by using tarballs instead of git. As far as I know about git-lfs, the documentation from Signal's github indicate that it's necessary for one of the yarn dependencies. 

As an aside, I fixed the linting error (vlicense).

And now the build has concluded but I ran into an error at post_install:

```
...
rm: cannot remove '/tmp/go/pkg/mod/golang.org/x/exp@v0.0.0-20200513190911-00229845015e/utf8string/string_test.go': Permission denied
rm: cannot remove '/tmp/go/pkg/mod/golang.org/x/exp@v0.0.0-20200513190911-00229845015e/winfsnotify/winfsnotify.go': Permission denied
rm: cannot remove '/tmp/go/pkg/mod/golang.org/x/exp@v0.0.0-20200513190911-00229845015e/winfsnotify/winfsnotify_test.go': Permission denied
=> ERROR: Signal-Desktop-5.0.0_1: post_install: 'rm -rf $HOME' exited with 1
=> ERROR:   in post_install() at srcpkgs/Signal-Desktop/template:65
```

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Signal-Desktop: update to 5.0.0.
  2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
                   ` (3 preceding siblings ...)
  2021-05-05 18:45 ` lane-brain
@ 2021-05-05 19:13 ` ericonr
  2021-05-05 19:14 ` ericonr
                   ` (8 subsequent siblings)
  13 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-05-05 19:13 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30696#discussion_r626831162

Comment:
The patches should go in `patches` and left to be applied automatically. This is an arch artifact.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Signal-Desktop: update to 5.0.0.
  2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
                   ` (4 preceding siblings ...)
  2021-05-05 19:13 ` [PR REVIEW] " ericonr
@ 2021-05-05 19:14 ` ericonr
  2021-05-05 19:27 ` [PR REVIEW] " lane-brain
                   ` (7 subsequent siblings)
  13 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-05-05 19:14 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30696#issuecomment-832942851

Comment:
`chmod -R +wX $HOME` works, but that's starting to sound like they build Go stuff in the middle of the build process??? Where do they even get the Go executable?

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Signal-Desktop: update to 5.0.0.
  2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
                   ` (5 preceding siblings ...)
  2021-05-05 19:14 ` ericonr
@ 2021-05-05 19:27 ` lane-brain
  2021-05-05 19:46 ` lane-brain
                   ` (6 subsequent siblings)
  13 siblings, 0 replies; 16+ messages in thread
From: lane-brain @ 2021-05-05 19:27 UTC (permalink / raw)
  To: ml

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

New review comment by lane-brain on void-packages repository

https://github.com/void-linux/void-packages/pull/30696#discussion_r626839534

Comment:
believe me, I thought so too! but actually the files to be patched don't yet exist just after the extract, they need to be patched at this point

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR REVIEW] Signal-Desktop: update to 5.0.0.
  2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
                   ` (6 preceding siblings ...)
  2021-05-05 19:27 ` [PR REVIEW] " lane-brain
@ 2021-05-05 19:46 ` lane-brain
  2021-05-05 19:58 ` lane-brain
                   ` (5 subsequent siblings)
  13 siblings, 0 replies; 16+ messages in thread
From: lane-brain @ 2021-05-05 19:46 UTC (permalink / raw)
  To: ml

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

New review comment by lane-brain on void-packages repository

https://github.com/void-linux/void-packages/pull/30696#discussion_r626850850

Comment:
I was able to leave out the epoch source date patch

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Signal-Desktop: update to 5.0.0.
  2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
                   ` (7 preceding siblings ...)
  2021-05-05 19:46 ` lane-brain
@ 2021-05-05 19:58 ` lane-brain
  2021-05-05 20:14 ` lane-brain
                   ` (4 subsequent siblings)
  13 siblings, 0 replies; 16+ messages in thread
From: lane-brain @ 2021-05-05 19:58 UTC (permalink / raw)
  To: ml

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

New comment by lane-brain on void-packages repository

https://github.com/void-linux/void-packages/pull/30696#issuecomment-832968054

Comment:
> There's also #30505
> 
> We need to figure out how to work with `git-lfs` here.

by the way, here is the build error if we don't install git-lfs
```
gyp info spawn args [ 'BUILDTYPE=Release', '-C', 'build' ]
make: Entering directory '/builddir/Signal-Desktop-5.0.0/node_modules/@journeyapps/sqlcipher/build'
  CC(target) Release/obj.target/nothing/../../node-addon-api/nothing.o
  AR(target) Release/obj.target/../../node-addon-api/nothing.a
  COPY Release/nothing.a
  ACTION deps_sqlite3_gyp_action_before_build_target_unpack_sqlite_dep Release/obj/gen/sqlcipher-amalgamation-3033000/sqlite3.c
Traceback (most recent call last):
  File "/usr/lib/python3.9/tarfile.py", line 1682, in gzopen
    t = cls.taropen(name, mode, fileobj, **kwargs)
  File "/usr/lib/python3.9/tarfile.py", line 1659, in taropen
    return cls(name, mode, fileobj, **kwargs)
  File "/usr/lib/python3.9/tarfile.py", line 1522, in __init__
    self.firstmember = self.next()
  File "/usr/lib/python3.9/tarfile.py", line 2327, in next
    tarinfo = self.tarinfo.fromtarfile(self)
  File "/usr/lib/python3.9/tarfile.py", line 1112, in fromtarfile
    buf = tarfile.fileobj.read(BLOCKSIZE)
  File "/usr/lib/python3.9/gzip.py", line 300, in read
    return self._buffer.read(size)
  File "/usr/lib/python3.9/_compression.py", line 68, in readinto
    data = self.read(len(byte_view))
  File "/usr/lib/python3.9/gzip.py", line 487, in read
    if not self._read_gzip_header():
  File "/usr/lib/python3.9/gzip.py", line 435, in _read_gzip_header
    raise BadGzipFile('Not a gzipped file (%r)' % magic)
gzip.BadGzipFile: Not a gzipped file (b've')

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/builddir/Signal-Desktop-5.0.0/node_modules/@journeyapps/sqlcipher/deps/./extract.py", line 7, in <module>
    tfile = tarfile.open(tarball,'r:gz');
  File "/usr/lib/python3.9/tarfile.py", line 1629, in open
    return func(name, filemode, fileobj, **kwargs)
  File "/usr/lib/python3.9/tarfile.py", line 1686, in gzopen
    raise ReadError("not a gzip file")
tarfile.ReadError: not a gzip file
make: *** [deps/action_before_build.target.mk:13: Release/obj/gen/sqlcipher-amalgamation-3033000/sqlite3.c] Error 1
make: Leaving directory '/builddir/Signal-Desktop-5.0.0/node_modules/@journeyapps/sqlcipher/build'
gyp ERR! build error 
gyp ERR! stack Error: `make` failed with exit code: 2
gyp ERR! stack     at ChildProcess.onExit (/builddir/Signal-Desktop-5.0.0/node_modules/node-gyp/lib/build.js:194:23)
gyp ERR! stack     at ChildProcess.emit (events.js:315:20)
gyp ERR! stack     at Process.ChildProcess._handle.onexit (internal/child_process.js:277:12)
gyp ERR! System Linux 5.11.18_1
gyp ERR! command "/usr/bin/node" "/builddir/Signal-Desktop-5.0.0/node_modules/node-gyp/bin/node-gyp.js" "build" "--build-from-source" "--module=/builddir/Signal-Desktop-5.0.0/node_modules/@journeyapps/sqlcipher/lib/binding/napi-v6-linux-x64/node_sqlite3.node" "--module_name=node_sqlite3" "--module_path=/builddir/Signal-Desktop-5.0.0/node_modules/@journeyapps/sqlcipher/lib/binding/napi-v6-linux-x64" "--napi_version=7" "--node_abi_napi=napi" "--napi_build_version=6" "--node_napi_label=napi-v6"
gyp ERR! cwd /builddir/Signal-Desktop-5.0.0/node_modules/@journeyapps/sqlcipher
gyp ERR! node -v v14.16.0
gyp ERR! node-gyp -v v6.1.0
gyp ERR! not ok 
node-pre-gyp ERR! build error 
node-pre-gyp ERR! stack Error: Failed to execute '/usr/bin/node /builddir/Signal-Desktop-5.0.0/node_modules/node-gyp/bin/node-gyp.js build --build-from-source --module=/builddir/Signal-Desktop-5.0.0/node_modules/@journeyapps/sqlcipher/lib/binding/napi-v6-linux-x64/node_sqlite3.node --module_name=node_sqlite3 --module_path=/builddir/Signal-Desktop-5.0.0/node_modules/@journeyapps/sqlcipher/lib/binding/napi-v6-linux-x64 --napi_version=7 --node_abi_napi=napi --napi_build_version=6 --node_napi_label=napi-v6' (1)
node-pre-gyp ERR! stack     at ChildProcess.<anonymous> (/builddir/Signal-Desktop-5.0.0/node_modules/node-pre-gyp/lib/util/compile.js:83:29)
node-pre-gyp ERR! stack     at ChildProcess.emit (events.js:315:20)
node-pre-gyp ERR! stack     at maybeClose (internal/child_process.js:1048:16)
node-pre-gyp ERR! stack     at Process.ChildProcess._handle.onexit (internal/child_process.js:288:5)
node-pre-gyp ERR! System Linux 5.11.18_1
node-pre-gyp ERR! command "/usr/bin/node" "/builddir/Signal-Desktop-5.0.0/node_modules/@journeyapps/sqlcipher/node_modules/.bin/node-pre-gyp" "install" "--build-from-source"
node-pre-gyp ERR! cwd /builddir/Signal-Desktop-5.0.0/node_modules/@journeyapps/sqlcipher
node-pre-gyp ERR! node -v v14.16.0
node-pre-gyp ERR! node-pre-gyp -v v0.15.0
node-pre-gyp ERR! not ok 
Failed to execute '/usr/bin/node /builddir/Signal-Desktop-5.0.0/node_modules/node-gyp/bin/node-gyp.js build --build-from-source --module=/builddir/Signal-Desktop-5.0.0/node_modules/@journeyapps/sqlcipher/lib/binding/napi-v6-linux-x64/node_sqlite3.node --module_name=node_sqlite3 --module_path=/builddir/Signal-Desktop-5.0.0/node_modules/@journeyapps/sqlcipher/lib/binding/napi-v6-linux-x64 --napi_version=7 --node_abi_napi=napi --napi_build_version=6 --node_napi_label=napi-v6' (1)
info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command.
=> ERROR: Signal-Desktop-5.0.0_1: pre_build: 'yarn install --ignore-engines' exited with 1
=> ERROR:   in pre_build() at srcpkgs/Signal-Desktop/template:31
```

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Signal-Desktop: update to 5.0.0.
  2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
                   ` (8 preceding siblings ...)
  2021-05-05 19:58 ` lane-brain
@ 2021-05-05 20:14 ` lane-brain
  2021-05-05 22:43 ` [PR PATCH] [Updated] " lane-brain
                   ` (3 subsequent siblings)
  13 siblings, 0 replies; 16+ messages in thread
From: lane-brain @ 2021-05-05 20:14 UTC (permalink / raw)
  To: ml

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

New comment by lane-brain on void-packages repository

https://github.com/void-linux/void-packages/pull/30696#issuecomment-832976856

Comment:
> `chmod -R +wX $HOME` works, but that's starting to sound like they build Go stuff in the middle of the build process??? Where do they even get the Go executable?

No idea here. But unfortunately no this mktemp method runs into another issue:
```
=> Signal-Desktop-5.0.0_1: skipping check (XBPS_CHECK_PKGS is disabled) ...
=> Signal-Desktop-5.0.0_1: running pre-install hook: 00-libdir ...
=> Signal-Desktop-5.0.0_1: running pre-install hook: 02-script-wrapper ...
=> Signal-Desktop-5.0.0_1: running pre-install hook: 98-fixup-gir-path ...
=> Signal-Desktop-5.0.0_1: running do_install ...
=> Signal-Desktop-5.0.0_1: running post_install ...
=> Signal-Desktop-5.0.0_1: running post-install hook: 00-compress-info-files ...
=> Signal-Desktop-5.0.0_1: running post-install hook: 00-fixup-gir-path ...
=> Signal-Desktop-5.0.0_1: running post-install hook: 00-libdir ...
=> Signal-Desktop-5.0.0_1: running post-install hook: 00-uncompress-manpages ...
=> Signal-Desktop-5.0.0_1: running post-install hook: 01-remove-misc ...
=> Signal-Desktop-5.0.0_1: running post-install hook: 02-remove-libtool-archives ...
=> Signal-Desktop-5.0.0_1: running post-install hook: 02-remove-perl-files ...
=> Signal-Desktop-5.0.0_1: running post-install hook: 02-remove-python-bytecode-files ...
=> Signal-Desktop-5.0.0_1: running post-install hook: 03-remove-empty-dirs ...
=> Signal-Desktop-5.0.0_1: running post-install hook: 04-create-xbps-metadata-scripts ...
mktemp: failed to create file via template ‘/tmp/tmp.XXXXXXXXXX’: No such file or directory
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 27: $tmpf: ambiguous redirect
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 203: $tmpf: ambiguous redirect
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 307: $tmpf: ambiguous redirect
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 314: $tmpf: ambiguous redirect
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 315: $tmpf: ambiguous redirect
   Added trigger 'gtk-icon-cache' for the 'INSTALL' script.
   Added trigger 'update-desktopdb' for the 'INSTALL' script.
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 333: $tmpf: ambiguous redirect
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 334: $tmpf: ambiguous redirect
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 341: $tmpf: ambiguous redirect
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 342: $tmpf: ambiguous redirect
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 341: $tmpf: ambiguous redirect
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 342: $tmpf: ambiguous redirect
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 345: $tmpf: ambiguous redirect
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 346: $tmpf: ambiguous redirect
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 347: $tmpf: ambiguous redirect
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 361: $tmpf: ambiguous redirect
/void-packages/common/hooks/post-install/04-create-xbps-metadata-scripts.sh: line 362: $tmpf: ambiguous redirect
mv: missing destination file operand after '/destdir//Signal-Desktop-5.0.0/INSTALL'
Try 'mv --help' for more information.
=> ERROR: Signal-Desktop-5.0.0_1: failed to write INSTALL metadata file!
```

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] Signal-Desktop: update to 5.0.0.
  2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
                   ` (9 preceding siblings ...)
  2021-05-05 20:14 ` lane-brain
@ 2021-05-05 22:43 ` lane-brain
  2021-08-01 13:03 ` notthewave
                   ` (2 subsequent siblings)
  13 siblings, 0 replies; 16+ messages in thread
From: lane-brain @ 2021-05-05 22:43 UTC (permalink / raw)
  To: ml

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

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

https://github.com/lane-brain/void-packages Signal-Desktop
https://github.com/void-linux/void-packages/pull/30696

Signal-Desktop: update to 5.0.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From ca832a0c769939ab918bd63b21fe01dea4f2597c Mon Sep 17 00:00:00 2001
From: lane-brain <lane@mailbox.org>
Date: Wed, 5 May 2021 18:42:00 -0400
Subject: [PATCH] Signal-Desktop: update to 5.0.0.

---
 .../files/openssl-linking.patch               | 19 ++++++++++++
 .../patches/update-dep-versions.patch         | 29 +++++++++++++++++++
 srcpkgs/Signal-Desktop/template               | 29 ++++++++++++++-----
 3 files changed, 70 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/Signal-Desktop/files/openssl-linking.patch
 create mode 100644 srcpkgs/Signal-Desktop/patches/update-dep-versions.patch

diff --git a/srcpkgs/Signal-Desktop/files/openssl-linking.patch b/srcpkgs/Signal-Desktop/files/openssl-linking.patch
new file mode 100644
index 000000000000..7745f4f2b20e
--- /dev/null
+++ b/srcpkgs/Signal-Desktop/files/openssl-linking.patch
@@ -0,0 +1,19 @@
+--- a/node_modules/@journeyapps/sqlcipher/deps/sqlite3.gyp	2019-10-27 01:53:29.860275405 -0400
++++ b/node_modules/@journeyapps/sqlcipher/deps/sqlite3.gyp	2019-10-27 01:51:32.001730882 -0400
+@@ -73,7 +73,7 @@
+         'link_settings': {
+           'libraries': [
+             # This statically links libcrypto, whereas -lcrypto would dynamically link it
+-            '<(SHARED_INTERMEDIATE_DIR)/sqlcipher-amalgamation-<@(sqlite_version)/OpenSSL-Linux/libcrypto.a'
++            '-lcrypto'
+           ]
+         }
+       }]
+@@ -141,7 +141,6 @@
+         { # linux
+           'include_dirs': [
+             '<(SHARED_INTERMEDIATE_DIR)/sqlcipher-amalgamation-<@(sqlite_version)/',
+-            '<(SHARED_INTERMEDIATE_DIR)/sqlcipher-amalgamation-<@(sqlite_version)/openssl-include/'
+           ]
+         }]
+       ],
diff --git a/srcpkgs/Signal-Desktop/patches/update-dep-versions.patch b/srcpkgs/Signal-Desktop/patches/update-dep-versions.patch
new file mode 100644
index 000000000000..de9c5cd52de0
--- /dev/null
+++ b/srcpkgs/Signal-Desktop/patches/update-dep-versions.patch
@@ -0,0 +1,29 @@
+# * Set node to accept newer versions to fulfill dep
+# * Select node-gyp versions with python3 support
+#     - https://github.com/sass/node-sass/pull/2841
+#     - https://github.com/sass/node-sass/issues/2716
+--- package.json.orig	2021-04-15 21:50:37.757593564 -0400
++++ package.json	2021-04-15 21:51:37.819672207 -0400
+@@ -251,7 +251,7 @@
+     "jsdoc": "3.6.2",
+     "mocha": "4.1.0",
+     "mocha-testcheck": "1.0.0-rc.0",
+-    "node-gyp": "5.0.3",
++    "node-gyp": "6.1.0",
+     "node-sass": "4.14.1",
+     "node-sass-import-once": "1.2.0",
+     "npm-run-all": "4.1.5",
+@@ -273,11 +273,11 @@
+     "webpack-cli": "3.3.7",
+     "webpack-dev-server": "3.8.0"
+   },
+-  "resolutions": {
++  "resolutions": {"node-sass/node-gyp": "^6.0.0",
+     "@storybook/react/@storybook/core/node-fetch": "2.6.1"
+   },
+   "engines": {
+-    "node": "12.18.3"
++    "node": ">=12.18.3"
+   },
+   "build": {
+     "appId": "org.whispersystems.signal-desktop",
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 8999b6e483ff..a9cf87c29540 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,26 +1,37 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=1.39.5
+version=5.0.0
 revision=1
 # Due to electron
 # 32-bit is not supported https://github.com/signalapp/Signal-Desktop/issues/1661
 archs="x86_64"
-hostmakedepends="git nodejs python tar yarn"
-depends="libnotify libappindicator"
+hostmakedepends="git git-lfs nodejs python3 tar yarn openssl"
+depends="gtk+3 libnotify libappindicator libvips"
 short_desc="Signal Private Messenger for Linux"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"
-license="GPL-3.0-only"
+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=f9f55c0195579b43712bf370b753337432eda4bcf89809d1c8f3deb0b4ee4400
+checksum=4ff58f5ab5f4de6477dd92069d8c2e9a830513acca527b51e0ee1c7cbe7d8627
 nostrip_files="signal-desktop"
 
 pre_build() {
-	vsed -e 's/"node": "/&>=/' -i package.json
+	# git-lfs hook needs to be installed for sqlcipher dependency 
+	git-lfs install
+
+	# `yarn cache clean` needed for sqlcipher dependency to install.
+	# Unfortunately, because we build from tarball we can't do this
+	# step at the beginning but only after we generate node_modules
+	# See: https://github.com/signalapp/Signal-Desktop/issues/5032
+	yarn install --ignore-engines || rm -r node_modules; yarn cache clean
+	yarn install --ignore-engines
+
+	# Have SQLCipher dynamically link from OpenSSL
+	# See https://github.com/signalapp/Signal-Desktop/issues/2634
+	patch --forward --strip=1 --input="${FILESDIR}/openssl-linking.patch"
 }
 
 do_build() {
-	yarn install --ignore-engines
 	yarn grunt
 	yarn build-release --dir
 }
@@ -41,3 +52,7 @@ do_install() {
 		vinstall images/icon_${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps/ signal.png
 	done
 }
+
+post_install() {
+	vlicense LICENSE
+}

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Signal-Desktop: update to 5.0.0.
  2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
                   ` (10 preceding siblings ...)
  2021-05-05 22:43 ` [PR PATCH] [Updated] " lane-brain
@ 2021-08-01 13:03 ` notthewave
  2021-08-27 17:33 ` [PR PATCH] [Closed]: " ericonr
  2021-08-27 17:33 ` ericonr
  13 siblings, 0 replies; 16+ messages in thread
From: notthewave @ 2021-08-01 13:03 UTC (permalink / raw)
  To: ml

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

New comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/30696#issuecomment-890516881

Comment:
this can be closed

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Signal-Desktop: update to 5.0.0.
  2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
                   ` (12 preceding siblings ...)
  2021-08-27 17:33 ` [PR PATCH] [Closed]: " ericonr
@ 2021-08-27 17:33 ` ericonr
  13 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-08-27 17:33 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30696#issuecomment-907362146

Comment:
Merged in https://github.com/void-linux/void-packages/pull/31521

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Closed]: Signal-Desktop: update to 5.0.0.
  2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
                   ` (11 preceding siblings ...)
  2021-08-01 13:03 ` notthewave
@ 2021-08-27 17:33 ` ericonr
  2021-08-27 17:33 ` ericonr
  13 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-08-27 17:33 UTC (permalink / raw)
  To: ml

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

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

Signal-Desktop: update to 5.0.0.
https://github.com/void-linux/void-packages/pull/30696

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Closed]: Signal-Desktop: update to 5.0.0
  2021-04-26  3:21 [PR PATCH] " ScrelliCopter
@ 2021-06-24 22:34 ` ScrelliCopter
  0 siblings, 0 replies; 16+ messages in thread
From: ScrelliCopter @ 2021-06-24 22:34 UTC (permalink / raw)
  To: ml

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

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

Signal-Desktop: update to 5.0.0
https://github.com/void-linux/void-packages/pull/30505

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2021-08-27 17:33 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-05 17:52 [PR PATCH] Signal-Desktop: update to 5.0.0 lane-brain
2021-05-05 17:54 ` lane-brain
2021-05-05 17:55 ` ericonr
2021-05-05 18:03 ` ericonr
2021-05-05 18:45 ` lane-brain
2021-05-05 19:13 ` [PR REVIEW] " ericonr
2021-05-05 19:14 ` ericonr
2021-05-05 19:27 ` [PR REVIEW] " lane-brain
2021-05-05 19:46 ` lane-brain
2021-05-05 19:58 ` lane-brain
2021-05-05 20:14 ` lane-brain
2021-05-05 22:43 ` [PR PATCH] [Updated] " lane-brain
2021-08-01 13:03 ` notthewave
2021-08-27 17:33 ` [PR PATCH] [Closed]: " ericonr
2021-08-27 17:33 ` ericonr
  -- strict thread matches above, loose matches on Subject: below --
2021-04-26  3:21 [PR PATCH] " ScrelliCopter
2021-06-24 22:34 ` [PR PATCH] [Closed]: " ScrelliCopter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).