From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] wire-desktop: use System electron
Date: Tue, 06 Apr 2021 19:14:27 +0200 [thread overview]
Message-ID: <20210406171427.jCNsyDoJj5tI5N7M9i3VwRCxohaHrBpJPYmtZajROD0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30051@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2021-04-06 17:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-06 17:13 [PR PATCH] " Johnnynator
2021-04-06 17:14 ` Johnnynator [this message]
2021-04-06 17:29 ` [PR REVIEW] " Gottox
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210406171427.jCNsyDoJj5tI5N7M9i3VwRCxohaHrBpJPYmtZajROD0@z \
--to=johnnynator@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).