Github messages for voidlinux
 help / color / mirror / Atom feed
From: selfisekai <selfisekai@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] element-desktop: update to 1.9.5
Date: Sat, 04 Dec 2021 20:50:39 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34382@inbox.vuxu.org> (raw)

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

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

https://github.com/selfisekai/void-packages element-195
https://github.com/void-linux/void-packages/pull/34382

element-desktop: update to 1.9.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** - works on x86_64 glibc, **broken on x86_64 musl** and probably any musl, help appreciated

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/34382.patch is attached

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

From 0dbce8c7ba31d5fbb1b3661e9f4e70df7c5e9d57 Mon Sep 17 00:00:00 2001
From: Lauren Liberda <laura@selfisekai.rocks>
Date: Wed, 1 Dec 2021 01:25:20 +0100
Subject: [PATCH] element-desktop: update to 1.9.5

---
 .../patches/0001-support-more-architectures.patch   | 13 ++++++++-----
 srcpkgs/element-desktop/template                    |  6 +++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/element-desktop/patches/0001-support-more-architectures.patch b/srcpkgs/element-desktop/patches/0001-support-more-architectures.patch
index 2482b46ffd7b..e5d7cb6de8f1 100644
--- a/srcpkgs/element-desktop/patches/0001-support-more-architectures.patch
+++ b/srcpkgs/element-desktop/patches/0001-support-more-architectures.patch
@@ -8,16 +8,19 @@ Date:   Tue Aug 17 17:33:02 2021 +0200
     patch directly. Instead, the original source has received a PR over at
     https://github.com/vector-im/element-builder/pull/58.
 
+    Co-authored-By: Lauren N. Liberda <laura@selfisekai.rocks>
+    2021-12-01: modified by to work with element-desktop 1.9.5
+
 diff --git a/package.json b/package.json
-index 4dd59aa..141705b 100644
+index d00efd5..4cd5de1 100644
 --- a/package.json
 +++ b/package.json
 @@ -57,6 +57,7 @@
-     "allchange": "^1.0.0",
+     "allchange": "^1.0.5",
      "asar": "^2.0.1",
      "chokidar": "^3.5.2",
 +    "detect-libc": "^1.0.3",
-     "electron": "^13.1.9",
+     "electron": "13.5",
      "electron-builder": "22.11.4",
      "electron-builder-squirrel-windows": "22.11.4",
 diff --git a/scripts/hak/target.js b/scripts/hak/target.js
@@ -144,10 +147,10 @@ index 0a965fc..07349fc 100644
  exports.getHost = getHost;
  function isHostId(id) {
 diff --git a/yarn.lock b/yarn.lock
-index 37690bb..7e112a8 100644
+index a506286..9a2b26c 100644
 --- a/yarn.lock
 +++ b/yarn.lock
-@@ -1775,7 +1775,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
+@@ -1778,7 +1778,7 @@ deprecation@^2.0.0, deprecation@^2.3.1:
    resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
    integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
  
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 40d06208f9d2..a04bfe07d471 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.8.4
+version=1.9.5
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
@@ -18,8 +18,8 @@ _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="3a972531c40da5de922824667ea048f16ee407800b26327542cac1d81357b44f
- 2752b88227c17dfcd3b207db88aba08375f9751851f2ea549115fac7a517a18a"
+checksum="3d6773fc5803f839fc8031195c072f0eaff050f1173a6590fb2188cc67d5128a
+ c03c2a556852d20c609cfcfd1fad65e13cc17bfed499968f2fea9a5e1c70e068"
 
 patch_args="-Np1 -d ../${pkgname}-${version}"
 

             reply	other threads:[~2021-12-04 19:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-04 19:50 selfisekai [this message]
2021-12-11  3:07 ` ericonr
2021-12-11  3:07 ` [PR PATCH] [Closed]: " ericonr

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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34382@inbox.vuxu.org \
    --to=selfisekai@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).