[PR PATCH] element-desktop: update to 1.7.2.

[PR PATCH] element-desktop: update to 1.7.2.

[ProjectMoon]

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

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

https://github.com/ProjectMoon/void-packages master
https://github.com/void-linux/void-packages/pull/23907

element-desktop: update to 1.7.2.


A patch file from https://github.com/void-linux/void-packages/pull/23907.patch is attached

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

From 6129f4f54e62138285c3a43526c3c64172b2b8fd Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Tue, 28 Jul 2020 20:53:42 +0200
Subject: [PATCH] element-desktop: update to 1.7.2.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 935a0ecd686..f994b122bed 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.1
+version=1.7.2
 revision=1
 archs="x86_64"
 wrksrc="riot-web-${version}"
@@ -13,8 +13,8 @@ maintainer="projectmoon <projectmoon@agnos.is>"
 license="Apache-2.0"
 homepage="https://element.io"
 distfiles="https://github.com/vector-im/riot-desktop/archive/v${version}.tar.gz>riot-desktop.tar.gz https://github.com/vector-im/riot-web/archive/v${version}.tar.gz>riot-web.tar.gz"
-checksum="6d92437d3cd3d7846a21616a98759e9d0c1cabd07bcbbedf1e933c1baf55b287
- e26ad0d5ce192de4dfe29dd0cee296dddf77c043ae6e23ffcc6fc5c5fdb959b2"
+checksum="d4717098647219e738a947cd7b4b9e223f9e542f8b0a10c82a4691adf509be3a
+ 48d096bfa263fd677afa30d8fae5439414cc4cecfdfa0054110781bb91b46856"
 nocross=yes
 nostrip=yes
 

Re: [PR PATCH] [Updated] element-desktop: update to 1.7.2.

[ProjectMoon]

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

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

https://github.com/ProjectMoon/void-packages master
https://github.com/void-linux/void-packages/pull/23907

element-desktop: update to 1.7.2.


A patch file from https://github.com/void-linux/void-packages/pull/23907.patch is attached

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

From b3bb8120ab190c71282fc8305a475a64c01d77be Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Tue, 28 Jul 2020 20:53:42 +0200
Subject: [PATCH] element-desktop: update to 1.7.3.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 935a0ecd686..ad6850b92e4 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.1
+version=1.7.3
 revision=1
 archs="x86_64"
 wrksrc="riot-web-${version}"
@@ -13,8 +13,8 @@ maintainer="projectmoon <projectmoon@agnos.is>"
 license="Apache-2.0"
 homepage="https://element.io"
 distfiles="https://github.com/vector-im/riot-desktop/archive/v${version}.tar.gz>riot-desktop.tar.gz https://github.com/vector-im/riot-web/archive/v${version}.tar.gz>riot-web.tar.gz"
-checksum="6d92437d3cd3d7846a21616a98759e9d0c1cabd07bcbbedf1e933c1baf55b287
- e26ad0d5ce192de4dfe29dd0cee296dddf77c043ae6e23ffcc6fc5c5fdb959b2"
+checksum="8737925f23c6c8e352047e6c077c1141176e18724d7f82d0456855bcfd2faab1
+ dc948f4083c549476f8c4c8b8a55dbf0ea99684ea2a355191d8dcb6861576632"
 nocross=yes
 nostrip=yes
 

Re: element-desktop: update to 1.7.3.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/23907#issuecomment-669494774

Comment:
Now updated to 1.7.3.

Re: element-desktop: update to 1.7.3.

[Chocimier]

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23907#issuecomment-670090281

Comment:
You should build and test updated version before submitting PR.

Re: element-desktop: update to 1.7.3.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/23907#issuecomment-670190454

Comment:
It seems they changed the directory name in between 1.7.2 and 1.7.3.

Re: [PR PATCH] [Updated] element-desktop: update to 1.7.3.

[ProjectMoon]

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

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

https://github.com/ProjectMoon/void-packages master
https://github.com/void-linux/void-packages/pull/23907

element-desktop: update to 1.7.3.


A patch file from https://github.com/void-linux/void-packages/pull/23907.patch is attached

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

From 28450a85f3da6cac5f04ac27a9488f32cc2baacb Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Tue, 28 Jul 2020 20:53:42 +0200
Subject: [PATCH] element-desktop: update to 1.7.3.

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

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 935a0ecd686..20aae9a25aa 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,9 +1,9 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.7.1
+version=1.7.3
 revision=1
 archs="x86_64"
-wrksrc="riot-web-${version}"
+wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
 hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl libappindicator-devel libnotify-devel pkg-config"
 makedepends="libsecret-devel"
@@ -12,9 +12,9 @@ short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="Apache-2.0"
 homepage="https://element.io"
-distfiles="https://github.com/vector-im/riot-desktop/archive/v${version}.tar.gz>riot-desktop.tar.gz https://github.com/vector-im/riot-web/archive/v${version}.tar.gz>riot-web.tar.gz"
-checksum="6d92437d3cd3d7846a21616a98759e9d0c1cabd07bcbbedf1e933c1baf55b287
- e26ad0d5ce192de4dfe29dd0cee296dddf77c043ae6e23ffcc6fc5c5fdb959b2"
+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="8737925f23c6c8e352047e6c077c1141176e18724d7f82d0456855bcfd2faab1
+ dc948f4083c549476f8c4c8b8a55dbf0ea99684ea2a355191d8dcb6861576632"
 nocross=yes
 nostrip=yes
 
@@ -22,8 +22,8 @@ pre_build() {
 	# Build dependencies for riot-web
 	yarn install
 
-	# Build dependencies and alterations for riot-desktop
-	cd ../riot-desktop-${version}
+	# Build dependencies and alterations for element-desktop
+	cd ../element-desktop-${version}
 	# Disable auto-updating
 	sed -i 's@https://packages.riot.im/desktop/update/@null@g' element.io/release/config.json
 	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
@@ -32,7 +32,7 @@ pre_build() {
 
 do_build() {
 	yarn build
-	cd ../riot-desktop-${version}
+	cd ../element-desktop-${version}
 	yarn run build:native
 	yarn run build
 }
@@ -40,7 +40,7 @@ do_build() {
 do_install() {
 	vmkdir usr/lib/element-desktop
 	vmkdir etc/element-desktop
-	vcopy ../riot-desktop-${version}/dist/linux-unpacked/* /usr/lib/element-desktop
+	vcopy ../element-desktop-${version}/dist/linux-unpacked/* /usr/lib/element-desktop
 	vinstall config.sample.json 644 /etc/element-desktop/ config.json
 	vcopy webapp /usr/lib/element-desktop/resources
 	ln -s /etc/element-desktop/config.json $DESTDIR/usr/lib/element-desktop/resources/webapp/config.json
@@ -52,7 +52,7 @@ do_install() {
 	vinstall webapp/themes/element/img/logos/element-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ element.svg
 
 	for i in 16 24 48 64 96 128 256 512; do
-		vinstall ../riot-desktop-${version}/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ element.png
+		vinstall ../element-desktop-${version}/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ element.png
 	done
 }
 

Re: element-desktop: update to 1.7.3.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/23907#issuecomment-670200352

Comment:
Should build now.

Re: element-desktop: update to 1.7.3.

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/23907#issuecomment-674808897

Comment:
I have been testing Element 1.7.3 for a week or two now, and it looks like it works fine.

Re: [PR PATCH] [Merged]: element-desktop: update to 1.7.3.

[Chocimier]

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

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

element-desktop: update to 1.7.3.
https://github.com/void-linux/void-packages/pull/23907

Description: