Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] element-desktop: update to 1.11.8.
@ 2022-09-28 16:34 jcgruenhage
  2022-09-28 16:50 ` [PR PATCH] [Merged]: " classabbyamp
  0 siblings, 1 reply; 2+ messages in thread
From: jcgruenhage @ 2022-09-28 16:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1248 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.8_1
https://github.com/void-linux/void-packages/pull/39507

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

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

<!--
#### 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/39507.patch is attached

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

From 56d75375cea6890db773ae723a5cf193833737ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 28 Sep 2022 18:18:07 +0200
Subject: [PATCH] element-desktop: update to 1.11.8.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 7dd3f717b7de..0231586c65f7 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.5
+version=1.11.8
 revision=1
 create_wrksrc=yes
 conf_files="/etc/${pkgname}/config.json"
@@ -17,8 +17,8 @@ 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="549540c80d26f1f8951a8e9b82e431a9db8686124c4f0b13e50e46a62b5388f2
- 08cd5542f7c9e9bb479b27fcf16247e75dfc80cdee5b0e3ee7c11a7fbe27d4a7"
+checksum="541c01fdac38db2a4e7c058be5d2196ace0cd987c37f58a79631ec43c260182f
+ 9d9bb42a3d004ab4659d2945e6752aa278c59bc3b7f75919ce076bf3fb2b5f73"
 
 export USE_SYSTEM_APP_BUILDER=true
 
@@ -36,6 +36,15 @@ pre_patch() {
 	done
 }
 
+post_patch() {
+	cd ${pkgname/desktop/web}
+	# Disable auto-updating
+	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
+}
+
 pre_build() {
 	# since element 1.8.x it's necessary to force the npm arch
 	# to x86, otherwise it will fail in electron js stuff on
@@ -46,15 +55,12 @@ pre_build() {
 	esac
 
 	cd ${pkgname/desktop/web}
-	# Disable auto-updating
-	jq '.update_base_url = ""' element.io/app/config.json | sponge element.io/app/config.json
 
 	# Build dependencies for element-web
 	npm_config_arch=$carch yarn install
 
 	# Build dependencies and alterations for element-desktop
 	cd ../${pkgname}
-	vsed -i 's/"target": "deb"/"target": "dir"/g' package.json
 	npm_config_arch=$carch yarn install
 }
 

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: element-desktop: update to 1.11.8.
  2022-09-28 16:34 [PR PATCH] element-desktop: update to 1.11.8 jcgruenhage
@ 2022-09-28 16:50 ` classabbyamp
  0 siblings, 0 replies; 2+ messages in thread
From: classabbyamp @ 2022-09-28 16:50 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

element-desktop: update to 1.11.8.
https://github.com/void-linux/void-packages/pull/39507

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-09-28 16:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-28 16:34 [PR PATCH] element-desktop: update to 1.11.8 jcgruenhage
2022-09-28 16:50 ` [PR PATCH] [Merged]: " classabbyamp

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).