* Re: [PR PATCH] [Updated] wire-desktop: use System electron
2021-04-06 17:13 [PR PATCH] wire-desktop: use System electron Johnnynator
@ 2021-04-06 17:14 ` Johnnynator
2021-04-06 17:29 ` [PR REVIEW] " Gottox
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Johnnynator @ 2021-04-06 17:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages wire-desktop
https://github.com/void-linux/void-packages/pull/30051
wire-desktop: use System electron
<!-- 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?
- [ ] 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.)
- [ ] 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/30051.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wire-desktop-30051.patch --]
[-- Type: text/x-diff, Size: 1860 bytes --]
From 4c06acae1ebf62358e5f75bff211b5a946109052 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:08:31 +0200
Subject: [PATCH] wire-desktop: use System electron
---
srcpkgs/wire-desktop/template | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index edb4bb21be61..cff962d8585d 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -1,21 +1,19 @@
# Template file for 'wire-desktop'
pkgname=wire-desktop
version=3.24.2939
-revision=1
+revision=2
wrksrc="${pkgname}-linux-${version}"
hostmakedepends="nodejs yarn git"
+depends="electron10"
short_desc="Wire for desktop"
maintainer="Young Jin Park <youngjinpark20@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://wire.com"
distfiles="https://github.com/wireapp/wire-desktop/archive/linux/${version}.tar.gz"
checksum=69e70d39286f29b2fb186da30ec828be0a30329c457e829111b863223ed64127
-nocross=yes
case "$XBPS_TARGET_MACHINE" in
- *-musl) broken="glibc artefacts are installed" ;;
- i686*) broken="yarn" ;;
- ppc*) broken="electron" ;;
+ x86_64-musl) broken="Electron on musl is unreliable" ;;
esac
pre_build() {
@@ -28,9 +26,13 @@ do_build() {
do_install() {
vmkdir usr/lib/wire-desktop
- vcopy wrap/dist/linux-unpacked/* usr/lib/wire-desktop
+ vinstall wrap/dist/linux-unpacked/resources/app.asar 644 usr/lib/wire-desktop
vmkdir usr/bin
- ln -sf /usr/lib/wire-desktop/wire-desktop ${DESTDIR}/usr/bin/
+ cat << EOF > "wire-desktop.sh"
+#!/usr/bin/env sh
+electron10 "/usr/lib/wire-desktop/app.asar" "\$@"
+EOF
+ vbin wire-desktop.sh wire-desktop
vmkdir usr/share/icons/hicolor/256x256/apps
vcopy resources/icons/256x256.png usr/share/icons/hicolor/256x256/apps/wire-desktop.png
vmkdir usr/share/icons/hicolor/32x32/apps
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] wire-desktop: use System electron
2021-04-06 17:13 [PR PATCH] wire-desktop: use System electron Johnnynator
2021-04-06 17:14 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-04-06 17:29 ` Gottox
2021-04-06 17:29 ` Gottox
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Gottox @ 2021-04-06 17:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
New review comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/30051#discussion_r608046191
Comment:
Something wrong with /bin/sh?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] wire-desktop: use System electron
2021-04-06 17:13 [PR PATCH] wire-desktop: use System electron Johnnynator
2021-04-06 17:14 ` [PR PATCH] [Updated] " Johnnynator
2021-04-06 17:29 ` [PR REVIEW] " Gottox
@ 2021-04-06 17:29 ` Gottox
2021-04-06 17:37 ` ericonr
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Gottox @ 2021-04-06 17:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New review comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/30051#discussion_r608047152
Comment:
```suggestion
exec electron10 "/usr/lib/wire-desktop/app.asar" "\$@"
```
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] wire-desktop: use System electron
2021-04-06 17:13 [PR PATCH] wire-desktop: use System electron Johnnynator
` (2 preceding siblings ...)
2021-04-06 17:29 ` Gottox
@ 2021-04-06 17:37 ` ericonr
2021-04-06 17:41 ` [PR PATCH] [Updated] " Johnnynator
2021-04-07 16:36 ` [PR PATCH] [Merged]: " Johnnynator
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-04-06 17:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30051#discussion_r608052655
Comment:
IMO, not necessary. Element works nearly perfectly for me, and anything electron working on musl is a bonus already, so we should leave people the option of trying their luck.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] wire-desktop: use System electron
2021-04-06 17:13 [PR PATCH] wire-desktop: use System electron Johnnynator
` (3 preceding siblings ...)
2021-04-06 17:37 ` ericonr
@ 2021-04-06 17:41 ` Johnnynator
2021-04-07 16:36 ` [PR PATCH] [Merged]: " Johnnynator
5 siblings, 0 replies; 7+ messages in thread
From: Johnnynator @ 2021-04-06 17:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages wire-desktop
https://github.com/void-linux/void-packages/pull/30051
wire-desktop: use System electron
<!-- 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?
- [ ] 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.)
- [ ] 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/30051.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wire-desktop-30051.patch --]
[-- Type: text/x-diff, Size: 1809 bytes --]
From d6bafa1fa53bec855a4abc2ba71f2c5f0e9c8584 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:08:31 +0200
Subject: [PATCH] wire-desktop: use System electron
---
srcpkgs/wire-desktop/template | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index edb4bb21be61..27054cc542d7 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -1,22 +1,16 @@
# Template file for 'wire-desktop'
pkgname=wire-desktop
version=3.24.2939
-revision=1
+revision=2
wrksrc="${pkgname}-linux-${version}"
hostmakedepends="nodejs yarn git"
+depends="electron10"
short_desc="Wire for desktop"
maintainer="Young Jin Park <youngjinpark20@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://wire.com"
distfiles="https://github.com/wireapp/wire-desktop/archive/linux/${version}.tar.gz"
checksum=69e70d39286f29b2fb186da30ec828be0a30329c457e829111b863223ed64127
-nocross=yes
-
-case "$XBPS_TARGET_MACHINE" in
- *-musl) broken="glibc artefacts are installed" ;;
- i686*) broken="yarn" ;;
- ppc*) broken="electron" ;;
-esac
pre_build() {
yarn
@@ -28,9 +22,13 @@ do_build() {
do_install() {
vmkdir usr/lib/wire-desktop
- vcopy wrap/dist/linux-unpacked/* usr/lib/wire-desktop
+ vinstall wrap/dist/linux-unpacked/resources/app.asar 644 usr/lib/wire-desktop
vmkdir usr/bin
- ln -sf /usr/lib/wire-desktop/wire-desktop ${DESTDIR}/usr/bin/
+ cat << EOF > "wire-desktop.sh"
+#!/bin/sh
+exec electron10 "/usr/lib/wire-desktop/app.asar" "\$@"
+EOF
+ vbin wire-desktop.sh wire-desktop
vmkdir usr/share/icons/hicolor/256x256/apps
vcopy resources/icons/256x256.png usr/share/icons/hicolor/256x256/apps/wire-desktop.png
vmkdir usr/share/icons/hicolor/32x32/apps
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: wire-desktop: use System electron
2021-04-06 17:13 [PR PATCH] wire-desktop: use System electron Johnnynator
` (4 preceding siblings ...)
2021-04-06 17:41 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-04-07 16:36 ` Johnnynator
5 siblings, 0 replies; 7+ messages in thread
From: Johnnynator @ 2021-04-07 16:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]
There's a merged pull request on the void-packages repository
wire-desktop: use System electron
https://github.com/void-linux/void-packages/pull/30051
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?
- [ ] 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.)
- [ ] 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] 7+ messages in thread