Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Signal-Desktop: update to 5.0.0
@ 2021-04-26  3:21 ScrelliCopter
  2021-04-26 19:20 ` [PR REVIEW] " ericonr
                   ` (8 more replies)
  0 siblings, 9 replies; 11+ messages in thread
From: ScrelliCopter @ 2021-04-26  3:21 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ScrelliCopter/void-packages signal
https://github.com/void-linux/void-packages/pull/30505

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/30505.patch is attached

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

From 58df6e1d3055583e3af24efd677a3f55af4c1a7f Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Mon, 26 Apr 2021 13:03:23 +1000
Subject: [PATCH] Signal-Desktop: update to 5.0.0

---
 .../Signal-Desktop/patches/build-from-tarball.patch  |  9 ---------
 srcpkgs/Signal-Desktop/template                      | 12 +++++++++---
 2 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 srcpkgs/Signal-Desktop/patches/build-from-tarball.patch

diff --git a/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch b/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch
deleted file mode 100644
index e8c3db0e087e..000000000000
--- a/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- Gruntfile.js.orig	2020-04-26 23:32:09.861789510 +0200
-+++ Gruntfile.js	2020-04-26 23:32:21.424734031 +0200
-@@ -452,6 +452,5 @@
-     'concat',
-     'copy:deps',
-     'sass',
--    'date',
-   ]);
- };
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 8999b6e483ff..e5784104c9f2 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,22 +1,28 @@
 # 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"
+hostmakedepends="git git-lfs nodejs python tar yarn"
 depends="libnotify libappindicator"
 short_desc="Signal Private Messenger for Linux"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="GPL-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() {
+	git lfs install
+
+	# allow higher Node version
 	vsed -e 's/"node": "/&>=/' -i package.json
+
+	# allow tarball build
+	vsed "/'date',\$/d" -i Gruntfile.js
 }
 
 do_build() {

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [PR PATCH] Signal-Desktop: update to 5.0.0.
@ 2021-05-05 17:52 lane-brain
  2021-05-05 22:43 ` [PR PATCH] [Updated] " lane-brain
  0 siblings, 1 reply; 11+ 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] 11+ messages in thread
end of thread, other threads:[~2021-06-24 22:34 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-26  3:21 [PR PATCH] Signal-Desktop: update to 5.0.0 ScrelliCopter
2021-04-26 19:20 ` [PR REVIEW] " ericonr
2021-04-26 23:56 ` ScrelliCopter
2021-04-27  2:23 ` ericonr
2021-04-27  2:23 ` ericonr
2021-04-27  2:41 ` q66
2021-04-27  5:28 ` [PR PATCH] [Updated] " ScrelliCopter
2021-05-02 23:13 ` kwshi
2021-06-24 22:34 ` ScrelliCopter
2021-06-24 22:34 ` [PR PATCH] [Closed]: " ScrelliCopter
2021-05-05 17:52 [PR PATCH] " lane-brain
2021-05-05 22:43 ` [PR PATCH] [Updated] " lane-brain

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).