Github messages for voidlinux
 help / color / mirror / Atom feed
From: jcgruenhage <jcgruenhage@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] element-desktop: update to 1.11.15.
Date: Tue, 22 Nov 2022 19:33:44 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40696@inbox.vuxu.org> (raw)

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

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

https://github.com/jcgruenhage/void-packages element-desktop-1.11.15_1
https://github.com/void-linux/void-packages/pull/40696

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

#### Testing the changes
- I tested the changes in this PR: **YES**


I'm a bit unhappy about the two `jq` lines. Working with `vsed` wouldn't have been any easier here, but checking that the file actually changes with something like `vjq` would make me a lot happier. Any opinions on that?

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/40696.patch is attached

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

From aae08f70ad5a03e15acaed325f7cd7cec471d2c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 22 Nov 2022 19:30:57 +0100
Subject: [PATCH] element-desktop: update to 1.11.15.

---
 srcpkgs/element-desktop/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index dde728ffedad..7ff0efdd6463 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.11.14
+version=1.11.15
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -15,10 +15,10 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://element.io"
 changelog="https://raw.githubusercontent.com/vector-im/element-desktop/develop/CHANGELOG.md"
-distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz
- https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz"
-checksum="ceda8fee7a4abc842c02db07bf7b4f4949b6663589527a26b4345d3a40e92016
- a822cba13112f1a23aacf4d801026ced6260e7c9514c44ab7453fd162839c8b1"
+distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop-v${version}.tar.gz
+ https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web-v${version}.tar.gz"
+checksum="29cf841c2a8a1ab38272fcd515c20a6c7b269f74d34ac95a00ed895c40786213
+ f39c2524cb94d75d54328ccbe995621784be96b698220e43825d445f7a5d3127"
 
 export USE_SYSTEM_APP_BUILDER=true
 
@@ -42,7 +42,7 @@ post_patch() {
 	jq '.update_base_url = ""' element.io/app/config.json | sponge element.io/app/config.json
 
 	cd ../${pkgname}
-	vsed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	jq '.build.linux.target = ["dir"]' package.json | sponge package.json
 }
 
 pre_build() {

             reply	other threads:[~2022-11-22 18:33 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-22 18:33 jcgruenhage [this message]
2022-11-24  0:33 ` classabbyamp
2022-11-24  0:33 ` [PR PATCH] [Merged]: " classabbyamp

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-40696@inbox.vuxu.org \
    --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).