Github messages for voidlinux
 help / color / mirror / Atom feed
From: jcgruenhage <jcgruenhage@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] element-desktop: update to 1.8.0.
Date: Tue, 17 Aug 2021 18:24:45 +0200	[thread overview]
Message-ID: <20210817162445.RpvILhoRBxzoICBkfcjg8vVUSCnj1Fbexg_Dq2mWjcc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32520@inbox.vuxu.org>

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

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

https://github.com/jcgruenhage/void-packages element-desktop-1.8.0_1
https://github.com/void-linux/void-packages/pull/32520

element-desktop: update to 1.8.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.)
- [ ] 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/32520.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-1.8.0_1-32520.patch --]
[-- Type: text/x-diff, Size: 8269 bytes --]

From 2a33593b23feb8b9ec30e27b6381f40fd8d09178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 17 Aug 2021 00:26:25 +0200
Subject: [PATCH] element-desktop: update to 1.8.1.

---
 .../0001-support-more-architectures.patch     | 158 ++++++++++++++++++
 ...0001-support-more-architectures.patch.args |   1 +
 srcpkgs/element-desktop/template              |  14 +-
 3 files changed, 168 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/element-desktop/patches/0001-support-more-architectures.patch
 create mode 100644 srcpkgs/element-desktop/patches/0001-support-more-architectures.patch.args

diff --git a/srcpkgs/element-desktop/patches/0001-support-more-architectures.patch b/srcpkgs/element-desktop/patches/0001-support-more-architectures.patch
new file mode 100644
index 000000000000..11f156a20670
--- /dev/null
+++ b/srcpkgs/element-desktop/patches/0001-support-more-architectures.patch
@@ -0,0 +1,158 @@
+commit 6253d67b13db2bd075fb6f17e8fffc92efd7fdee
+Author: Jan Christian Grünhage <jan.christian@gruenhage.xyz>
+Date:   Tue Aug 17 17:33:02 2021 +0200
+
+    Fixes compilation on a bunch of targets
+    
+    Considering that this changes generated files, I've not submitted this
+    patch directly. Instead, the original source has received a PR over at
+    https://github.com/vector-im/element-builder/pull/58.
+
+diff --git a/package.json b/package.json
+index 4dd59aa..141705b 100644
+--- a/package.json
++++ b/package.json
+@@ -57,6 +57,7 @@
+     "allchange": "^1.0.0",
+     "asar": "^2.0.1",
+     "chokidar": "^3.5.2",
++    "detect-libc": "^1.0.3",
+     "electron": "^13.1.7",
+     "electron-builder": "22.11.4",
+     "electron-builder-squirrel-windows": "22.11.4",
+diff --git a/scripts/hak/target.js b/scripts/hak/target.js
+index 0a965fc..07349fc 100644
+--- a/scripts/hak/target.js
++++ b/scripts/hak/target.js
+@@ -25,11 +25,26 @@ limitations under the License.
+ 
+ Object.defineProperty(exports, "__esModule", { value: true });
+ exports.isHost = exports.isHostId = exports.getHost = exports.ENABLED_TARGETS = exports.TARGETS = void 0;
++const detect_libc_1 = require("detect-libc");
+ const aarch64AppleDarwin = {
+     id: 'aarch64-apple-darwin',
+     platform: 'darwin',
+     arch: 'arm64',
+ };
++const x8664AppleDarwin = {
++    id: 'x86_64-apple-darwin',
++    platform: 'darwin',
++    arch: 'x64',
++};
++const universalAppleDarwin = {
++    id: 'universal-apple-darwin',
++    platform: 'darwin',
++    arch: 'universal',
++    subtargets: [
++        aarch64AppleDarwin,
++        x8664AppleDarwin,
++    ],
++};
+ const i686PcWindowsMsvc = {
+     id: 'i686-pc-windows-msvc',
+     platform: 'win32',
+@@ -42,34 +57,81 @@ const x8664PcWindowsMsvc = {
+     arch: 'x64',
+     vcVarsArch: 'amd64',
+ };
+-const x8664AppleDarwin = {
+-    id: 'x86_64-apple-darwin',
+-    platform: 'darwin',
+-    arch: 'x64',
+-};
+ const x8664UnknownLinuxGnu = {
+     id: 'x86_64-unknown-linux-gnu',
+     platform: 'linux',
+     arch: 'x64',
++    libC: 'glibc',
++};
++const x8664UnknownLinuxMusl = {
++    id: 'x86_64-unknown-linux-musl',
++    platform: 'linux',
++    arch: 'x64',
++    libC: 'musl',
++};
++const i686UnknownLinuxGnu = {
++    id: 'i686-unknown-linux-gnu',
++    platform: 'linux',
++    arch: 'ia32',
++    libC: 'glibc',
++};
++const i686UnknownLinuxMusl = {
++    id: 'i686-unknown-linux-musl',
++    platform: 'linux',
++    arch: 'ia32',
++    libC: 'musl',
++};
++const aarch64UnknownLinuxGnu = {
++    id: 'aarch64-unknown-linux-gnu',
++    platform: 'linux',
++    arch: 'arm64',
++    libC: 'glibc',
++};
++const aarch64UnknownLinuxMusl = {
++    id: 'aarch64-unknown-linux-musl',
++    platform: 'linux',
++    arch: 'arm64',
++    libC: 'musl',
++};
++const powerpc64leUnknownLinuxGnu = {
++    id: 'powerpc64le-unknown-linux-gnu',
++    platform: 'linux',
++    arch: 'ppc64',
++    libC: 'glibc',
++};
++const powerpc64leUnknownLinuxMusl = {
++    id: 'powerpc64le-unknown-linux-musl',
++    platform: 'linux',
++    arch: 'ppc64',
++    libC: 'musl',
+ };
+ exports.TARGETS = {
+     'aarch64-apple-darwin': aarch64AppleDarwin,
++    'x86_64-apple-darwin': x8664AppleDarwin,
++    'universal-apple-darwin': universalAppleDarwin,
+     'i686-pc-windows-msvc': i686PcWindowsMsvc,
+     'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
+-    'x86_64-apple-darwin': x8664AppleDarwin,
++    'i686-unknown-linux-musl': i686UnknownLinuxMusl,
++    'i686-unknown-linux-gnu': i686UnknownLinuxGnu,
++    'x86_64-unknown-linux-musl': x8664UnknownLinuxMusl,
+     'x86_64-unknown-linux-gnu': x8664UnknownLinuxGnu,
++    'aarch64-unknown-linux-musl': aarch64UnknownLinuxMusl,
++    'aarch64-unknown-linux-gnu': aarch64UnknownLinuxGnu,
++    'powerpc64le-unknown-linux-musl': powerpc64leUnknownLinuxMusl,
++    'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
+ };
+ // The set of targets we build by default, sorted by increasing complexity so
+ // that we fail fast when the native host target fails.
+ exports.ENABLED_TARGETS = [
+-    exports.TARGETS['x86_64-apple-darwin'],
+-    exports.TARGETS['aarch64-apple-darwin'],
++    exports.TARGETS['universal-apple-darwin'],
+     exports.TARGETS['x86_64-unknown-linux-gnu'],
+-    exports.TARGETS['i686-pc-windows-msvc'],
++    exports.TARGETS['x86_64-pc-windows-msvc'],
+ ];
+ function getHost() {
+     return Object.values(exports.TARGETS).find(target => (target.platform === process.platform &&
+-        target.arch === process.arch));
++        target.arch === process.arch &&
++        (process.platform !== 'linux' ||
++            target.libC === detect_libc_1.family)));
+ }
+ exports.getHost = getHost;
+ function isHostId(id) {
+diff --git a/yarn.lock b/yarn.lock
+index 37690bb..7e112a8 100644
+--- a/yarn.lock
++++ b/yarn.lock
+@@ -1775,7 +1775,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
+   resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
+   integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
+ 
+-detect-libc@^1.0.2:
++detect-libc@^1.0.2, detect-libc@^1.0.3:
+   version "1.0.3"
+   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
diff --git a/srcpkgs/element-desktop/patches/0001-support-more-architectures.patch.args b/srcpkgs/element-desktop/patches/0001-support-more-architectures.patch.args
new file mode 100644
index 000000000000..9dccd44b91cd
--- /dev/null
+++ b/srcpkgs/element-desktop/patches/0001-support-more-architectures.patch.args
@@ -0,0 +1 @@
+-Np1 -d ../element-desktop-1.8.1
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 70841f8e2424..c745798a6863 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.7.30
+version=1.8.1
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
@@ -18,11 +18,15 @@ _ghpage="https://github.com/vector-im"
 _archive="archive/v${version}.tar.gz"
 distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
  ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="dfa46e98b52c20b431dc62be3c7dc3c960b1aba6d98af7e2aa0c06ce4e076c9e
- 86b07a8510cda86ce489b376b2069415579a3576100ddddd8ddcd1f2c29ac025"
+checksum="99dfd12a252cb64b71d60d7166957e17b91869b8cfd6e4133f00b31cf532d718
+ a84215361507c9e3e0612f44e509f5fe50dca8cbc18bd7a34b564e77fc611ac9"
 
 export USE_SYSTEM_APP_BUILDER=true
 
+pre_patch() {
+	ln -s ../element-web-${version}/0001-support-more-architectures.patch ../element-desktop-${version}/
+}
+
 pre_build() {
 	# Build dependencies for element-web
 	yarn install
@@ -44,8 +48,8 @@ do_build() {
 	# we need to force x86_64 arch as electron-builder does not support
 	# ppc64 and fails on arch detection; ARM is supported so just use build
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|ppc64*) yarn run build64 ;;
-		i686*) yarn run build32 ;;
+		x86_64*|ppc64*) yarn run build:64 ;;
+		i686*) yarn run build:32 ;;
 		*) yarn run build ;;
 	esac
 }

  parent reply	other threads:[~2021-08-17 16:24 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-16 22:27 [PR PATCH] " jcgruenhage
2021-08-17 16:01 ` [PR PATCH] [Updated] " jcgruenhage
2021-08-17 16:24 ` jcgruenhage [this message]
2021-08-17 16:48 ` [PR PATCH] [Updated] element-desktop: update to 1.8.1 jcgruenhage
2021-08-27  0:14 ` jcgruenhage
2021-09-13 21:47 ` [PR PATCH] [Closed]: " q66

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=20210817162445.RpvILhoRBxzoICBkfcjg8vVUSCnj1Fbexg_Dq2mWjcc@z \
    --to=jcgruenhage@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).