* [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop.
@ 2020-07-15 14:03 dawidpotocki
2020-07-15 14:29 ` ericonr
` (28 more replies)
0 siblings, 29 replies; 30+ messages in thread
From: dawidpotocki @ 2020-07-15 14:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 403 bytes --]
There is a new pull request by dawidpotocki against master on the void-packages repository
https://github.com/dawidpotocki/void-packages element-desktop
https://github.com/void-linux/void-packages/pull/23587
riot-desktop: update to 1.7.0, rename to element-desktop.
https://element.io/blog/welcome-to-element/
A patch file from https://github.com/void-linux/void-packages/pull/23587.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-23587.patch --]
[-- Type: text/x-diff, Size: 5730 bytes --]
From e34593a3cad9640f931228c4dc4827a2045d17b8 Mon Sep 17 00:00:00 2001
From: Dawid Potocki <dawid@dawidpotocki.com>
Date: Thu, 16 Jul 2020 01:59:45 +1200
Subject: [PATCH] riot-desktop: update to 1.7.0, rename to element-desktop.
---
.../INSTALL.msg | 0
.../files/element-desktop.desktop} | 8 ++--
.../template | 44 +++++++++++--------
srcpkgs/riot-desktop | 1 +
4 files changed, 30 insertions(+), 23 deletions(-)
rename srcpkgs/{riot-desktop => element-desktop}/INSTALL.msg (100%)
rename srcpkgs/{riot-desktop/files/riot-desktop.desktop => element-desktop/files/element-desktop.desktop} (66%)
rename srcpkgs/{riot-desktop => element-desktop}/template (50%)
create mode 120000 srcpkgs/riot-desktop
diff --git a/srcpkgs/riot-desktop/INSTALL.msg b/srcpkgs/element-desktop/INSTALL.msg
similarity index 100%
rename from srcpkgs/riot-desktop/INSTALL.msg
rename to srcpkgs/element-desktop/INSTALL.msg
diff --git a/srcpkgs/riot-desktop/files/riot-desktop.desktop b/srcpkgs/element-desktop/files/element-desktop.desktop
similarity index 66%
rename from srcpkgs/riot-desktop/files/riot-desktop.desktop
rename to srcpkgs/element-desktop/files/element-desktop.desktop
index 9aba3fb6c25..3c2fc581df8 100644
--- a/srcpkgs/riot-desktop/files/riot-desktop.desktop
+++ b/srcpkgs/element-desktop/files/element-desktop.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
-Name=Riot
+Name=Element
Comment=A feature-rich client for Matrix.org
-Exec=riot-desktop
+Exec=element-desktop
Terminal=false
Type=Application
-Icon=riot
-StartupWMClass="Riot"
+Icon=element
+StartupWMClass="Element"
Categories=Network;InstantMessaging;Chat;IRCClient
diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/element-desktop/template
similarity index 50%
rename from srcpkgs/riot-desktop/template
rename to srcpkgs/element-desktop/template
index f551dfd7e64..5e5f4f66292 100644
--- a/srcpkgs/riot-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
-# Template file for 'riot-desktop'
-pkgname=riot-desktop
-version=1.6.8
+# Template file for 'element-desktop'
+pkgname=element-desktop
+version=1.7.0
revision=1
archs="i686 x86_64"
wrksrc="riot-web-${version}"
@@ -11,15 +11,15 @@ depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy
short_desc="Glossy Matrix collaboration client, desktop version"
maintainer="projectmoon <projectmoon@agnos.is>"
license="Apache-2.0"
-homepage="https://riot.im"
+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="fecf357e5326a4cf059b99c4478230d427686ae02072b8f8810ddfc623d69e85
- c0481954e1dc523f78b25552017f8adbb192c1f869f62f8a4cc655dab32ee721"
+checksum="838b9b423623aa57554603bbb5d663923c1b1c6efab0c6a8ad73d81ae834c9b3
+ 48aeef17ca703876f72ca3d3bd110ebb247ec92dd048342edc756ccca23035e3"
nocross=yes
nostrip=yes
case "$XBPS_TARGET_MACHINE" in
- i686*) broken="/void-packages/srcpkgs/riot-desktop/template: line 20: 390 Segmentation fault" ;;
+ i686*) broken="/void-packages/srcpkgs/element-desktop/template: line 20: 390 Segmentation fault" ;;
esac
pre_build() {
@@ -28,8 +28,8 @@ pre_build() {
# Build dependencies and alterations for riot-desktop
cd ../riot-desktop-${version}
- # Disable auto-updating.
- sed -i 's@https://packages.riot.im/desktop/update/@null@g' riot.im/release/config.json
+ # 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
yarn install
}
@@ -42,19 +42,25 @@ do_build() {
}
do_install() {
- vmkdir usr/lib/riot-desktop
- vmkdir etc/riot-desktop
- vcopy ../riot-desktop-${version}/dist/linux-unpacked/* /usr/lib/riot-desktop
- vinstall config.sample.json 644 /etc/riot-desktop/ config.json
- vcopy webapp /usr/lib/riot-desktop/resources
- ln -s /etc/riot-desktop/config.json $DESTDIR/usr/lib/riot-desktop/resources/webapp/config.json
+ vmkdir usr/lib/element-desktop
+ vmkdir etc/element-desktop
+ vcopy ../riot-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
vmkdir usr/bin
- ln -s /usr/lib/riot-desktop/riot-desktop $DESTDIR/usr/bin/riot-desktop
- vinstall ${FILESDIR}/riot-desktop.desktop 644 /usr/share/applications/ riot-desktop.desktop
- vinstall webapp/themes/riot/img/logos/riot-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ riot.svg
+ ln -s /usr/lib/element-desktop/element-desktop $DESTDIR/usr/bin/element-desktop
+ vinstall ${FILESDIR}/element-desktop.desktop 644 /usr/share/applications/ element-desktop.desktop
+ 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/ riot.png
+ vinstall ../riot-desktop-${version}/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ element.png
done
}
+
+riot-desktop_package() {
+ depends="element-desktop"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
diff --git a/srcpkgs/riot-desktop b/srcpkgs/riot-desktop
new file mode 120000
index 00000000000..b58491091cd
--- /dev/null
+++ b/srcpkgs/riot-desktop
@@ -0,0 +1 @@
+element-desktop
\ No newline at end of file
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
@ 2020-07-15 14:29 ` ericonr
2020-07-15 14:36 ` dawidpotocki
` (27 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: ericonr @ 2020-07-15 14:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658802431
Comment:
Is the segmentation fault problem still happening for i686?
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
2020-07-15 14:29 ` ericonr
@ 2020-07-15 14:36 ` dawidpotocki
2020-07-15 14:40 ` ericonr
` (26 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: dawidpotocki @ 2020-07-15 14:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New comment by dawidpotocki on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658807002
Comment:
Well… I don't think that Electron even supports 32bit Linux?
https://www.electronjs.org/blog/linux-32bit-support
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
2020-07-15 14:29 ` ericonr
2020-07-15 14:36 ` dawidpotocki
@ 2020-07-15 14:40 ` ericonr
2020-07-15 14:40 ` ericonr
` (25 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: ericonr @ 2020-07-15 14:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658809173
Comment:
So I guess the `arch` line should be updated, and the broken `case` for `i686*` removed, since it's not going to get support any time soon.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (2 preceding siblings ...)
2020-07-15 14:40 ` ericonr
@ 2020-07-15 14:40 ` ericonr
2020-07-15 14:41 ` [PR PATCH] [Updated] " dawidpotocki
` (24 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: ericonr @ 2020-07-15 14:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658809173
Comment:
So I guess the `arch` line should be updated, and the broken `case` for `i686*` removed, since it's never going to get support.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Updated] riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (3 preceding siblings ...)
2020-07-15 14:40 ` ericonr
@ 2020-07-15 14:41 ` dawidpotocki
2020-07-15 14:45 ` jeffverk
` (23 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: dawidpotocki @ 2020-07-15 14:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 408 bytes --]
There is an updated pull request by dawidpotocki against master on the void-packages repository
https://github.com/dawidpotocki/void-packages element-desktop
https://github.com/void-linux/void-packages/pull/23587
riot-desktop: update to 1.7.0, rename to element-desktop.
https://element.io/blog/welcome-to-element/
A patch file from https://github.com/void-linux/void-packages/pull/23587.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-23587.patch --]
[-- Type: text/x-diff, Size: 5826 bytes --]
From a425f98fa169ff7706303f0cb09514a6e5b43b63 Mon Sep 17 00:00:00 2001
From: Dawid Potocki <dawid@dawidpotocki.com>
Date: Thu, 16 Jul 2020 01:59:45 +1200
Subject: [PATCH] riot-desktop: update to 1.7.0, rename to element-desktop.
---
.../INSTALL.msg | 0
.../files/element-desktop.desktop} | 8 ++--
.../template | 48 ++++++++++---------
srcpkgs/riot-desktop | 1 +
4 files changed, 30 insertions(+), 27 deletions(-)
rename srcpkgs/{riot-desktop => element-desktop}/INSTALL.msg (100%)
rename srcpkgs/{riot-desktop/files/riot-desktop.desktop => element-desktop/files/element-desktop.desktop} (66%)
rename srcpkgs/{riot-desktop => element-desktop}/template (51%)
create mode 120000 srcpkgs/riot-desktop
diff --git a/srcpkgs/riot-desktop/INSTALL.msg b/srcpkgs/element-desktop/INSTALL.msg
similarity index 100%
rename from srcpkgs/riot-desktop/INSTALL.msg
rename to srcpkgs/element-desktop/INSTALL.msg
diff --git a/srcpkgs/riot-desktop/files/riot-desktop.desktop b/srcpkgs/element-desktop/files/element-desktop.desktop
similarity index 66%
rename from srcpkgs/riot-desktop/files/riot-desktop.desktop
rename to srcpkgs/element-desktop/files/element-desktop.desktop
index 9aba3fb6c25..3c2fc581df8 100644
--- a/srcpkgs/riot-desktop/files/riot-desktop.desktop
+++ b/srcpkgs/element-desktop/files/element-desktop.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
-Name=Riot
+Name=Element
Comment=A feature-rich client for Matrix.org
-Exec=riot-desktop
+Exec=element-desktop
Terminal=false
Type=Application
-Icon=riot
-StartupWMClass="Riot"
+Icon=element
+StartupWMClass="Element"
Categories=Network;InstantMessaging;Chat;IRCClient
diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/element-desktop/template
similarity index 51%
rename from srcpkgs/riot-desktop/template
rename to srcpkgs/element-desktop/template
index f551dfd7e64..f7b02d53b09 100644
--- a/srcpkgs/riot-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,8 +1,8 @@
-# Template file for 'riot-desktop'
-pkgname=riot-desktop
-version=1.6.8
+# Template file for 'element-desktop'
+pkgname=element-desktop
+version=1.7.0
revision=1
-archs="i686 x86_64"
+archs="x86_64"
wrksrc="riot-web-${version}"
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl libappindicator-devel libnotify-devel pkg-config"
@@ -11,25 +11,21 @@ depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy
short_desc="Glossy Matrix collaboration client, desktop version"
maintainer="projectmoon <projectmoon@agnos.is>"
license="Apache-2.0"
-homepage="https://riot.im"
+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="fecf357e5326a4cf059b99c4478230d427686ae02072b8f8810ddfc623d69e85
- c0481954e1dc523f78b25552017f8adbb192c1f869f62f8a4cc655dab32ee721"
+checksum="838b9b423623aa57554603bbb5d663923c1b1c6efab0c6a8ad73d81ae834c9b3
+ 48aeef17ca703876f72ca3d3bd110ebb247ec92dd048342edc756ccca23035e3"
nocross=yes
nostrip=yes
-case "$XBPS_TARGET_MACHINE" in
- i686*) broken="/void-packages/srcpkgs/riot-desktop/template: line 20: 390 Segmentation fault" ;;
-esac
-
pre_build() {
# Build dependencies for riot-web
yarn install
# Build dependencies and alterations for riot-desktop
cd ../riot-desktop-${version}
- # Disable auto-updating.
- sed -i 's@https://packages.riot.im/desktop/update/@null@g' riot.im/release/config.json
+ # 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
yarn install
}
@@ -42,19 +38,25 @@ do_build() {
}
do_install() {
- vmkdir usr/lib/riot-desktop
- vmkdir etc/riot-desktop
- vcopy ../riot-desktop-${version}/dist/linux-unpacked/* /usr/lib/riot-desktop
- vinstall config.sample.json 644 /etc/riot-desktop/ config.json
- vcopy webapp /usr/lib/riot-desktop/resources
- ln -s /etc/riot-desktop/config.json $DESTDIR/usr/lib/riot-desktop/resources/webapp/config.json
+ vmkdir usr/lib/element-desktop
+ vmkdir etc/element-desktop
+ vcopy ../riot-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
vmkdir usr/bin
- ln -s /usr/lib/riot-desktop/riot-desktop $DESTDIR/usr/bin/riot-desktop
- vinstall ${FILESDIR}/riot-desktop.desktop 644 /usr/share/applications/ riot-desktop.desktop
- vinstall webapp/themes/riot/img/logos/riot-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ riot.svg
+ ln -s /usr/lib/element-desktop/element-desktop $DESTDIR/usr/bin/element-desktop
+ vinstall ${FILESDIR}/element-desktop.desktop 644 /usr/share/applications/ element-desktop.desktop
+ 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/ riot.png
+ vinstall ../riot-desktop-${version}/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ element.png
done
}
+
+riot-desktop_package() {
+ depends="element-desktop"
+ short_desc+=" - transitional dummy package"
+ build_style=meta
+}
diff --git a/srcpkgs/riot-desktop b/srcpkgs/riot-desktop
new file mode 120000
index 00000000000..b58491091cd
--- /dev/null
+++ b/srcpkgs/riot-desktop
@@ -0,0 +1 @@
+element-desktop
\ No newline at end of file
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (4 preceding siblings ...)
2020-07-15 14:41 ` [PR PATCH] [Updated] " dawidpotocki
@ 2020-07-15 14:45 ` jeffverk
2020-07-15 14:47 ` jeffverk
` (22 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: jeffverk @ 2020-07-15 14:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
New comment by jeffverk on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658812112
Comment:
The repackage looks good to me. There's apparently a small issue with the new client showing "Riot" in it that will require a repackage from upstream, but I'm trying to figure out if that will require them to make a new release in the riot-desktop GitHub repo, or if it was just an error in their Debian package. If they need to make a new release in GitHub, maybe it would be good to wait for that.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (5 preceding siblings ...)
2020-07-15 14:45 ` jeffverk
@ 2020-07-15 14:47 ` jeffverk
2020-07-15 14:48 ` ProjectMoon
` (21 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: jeffverk @ 2020-07-15 14:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
New comment by jeffverk on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658812112
Comment:
The repackage looks good to me. There's apparently a small issue with the new client showing "Riot" in it that will require a repackage from upstream, but I'm trying to figure out if that will require them to make a new release in the riot-desktop GitHub repo, or if it was just an error in their Debian package. If they need to make a new release in GitHub, maybe it would be good to wait for that.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (6 preceding siblings ...)
2020-07-15 14:47 ` jeffverk
@ 2020-07-15 14:48 ` ProjectMoon
2020-07-15 14:49 ` dawidpotocki
` (20 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: ProjectMoon @ 2020-07-15 14:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
New comment by ProjectMoon on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658813830
Comment:
The repackage looks good to me. There's apparently a small issue with the new client showing "Riot" that will require a repackage from upstream, but I'm trying to figure out if that will require them to make a new release in the riot-desktop GitHub repo, or if it was just an error in their Debian package. If they need to make a new release in GitHub, maybe it would be good to wait for that.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (7 preceding siblings ...)
2020-07-15 14:48 ` ProjectMoon
@ 2020-07-15 14:49 ` dawidpotocki
2020-07-15 14:58 ` jeffverk
` (19 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: dawidpotocki @ 2020-07-15 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
New comment by dawidpotocki on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658814626
Comment:
I didn't notice "Riot" anywhere myself. I know there is some Riot image in
1.7.0 tag of vector-im/riot-desktop, but it looks like something for browser
and we don't explicitly copy it.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (8 preceding siblings ...)
2020-07-15 14:49 ` dawidpotocki
@ 2020-07-15 14:58 ` jeffverk
2020-07-15 15:01 ` jeffverk
` (18 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: jeffverk @ 2020-07-15 14:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 274 bytes --]
New comment by jeffverk on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658819235
Comment:
It seems like it was a mistake with the icon. Since the icon is handled directly in the XBPS build, that issue should not affect us.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (9 preceding siblings ...)
2020-07-15 14:58 ` jeffverk
@ 2020-07-15 15:01 ` jeffverk
2020-07-15 15:01 ` ProjectMoon
` (17 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: jeffverk @ 2020-07-15 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 274 bytes --]
New comment by jeffverk on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658819235
Comment:
It seems like it was a mistake with the icon. Since the icon is handled directly in the XBPS build, that issue should not affect us.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (10 preceding siblings ...)
2020-07-15 15:01 ` jeffverk
@ 2020-07-15 15:01 ` ProjectMoon
2020-07-15 16:20 ` ProjectMoon
` (16 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: ProjectMoon @ 2020-07-15 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New comment by ProjectMoon on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658821188
Comment:
It seems like it was a mistake with the icon. Since the icon is handled directly in the XBPS build, that issue should not affect us.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (11 preceding siblings ...)
2020-07-15 15:01 ` ProjectMoon
@ 2020-07-15 16:20 ` ProjectMoon
2020-07-15 16:56 ` dawidpotocki
` (15 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: ProjectMoon @ 2020-07-15 16:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 265 bytes --]
New comment by ProjectMoon on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658860985
Comment:
Actually one suggestion, making a symbolic link from `riot-desktop` to `element-desktop` is probably a good idea, right?
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (12 preceding siblings ...)
2020-07-15 16:20 ` ProjectMoon
@ 2020-07-15 16:56 ` dawidpotocki
2020-07-15 17:31 ` dawidpotocki
` (14 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: dawidpotocki @ 2020-07-15 16:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by dawidpotocki on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658881486
Comment:
I don't know how it looked in other packages, but I'm fine with making a symlink.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (13 preceding siblings ...)
2020-07-15 16:56 ` dawidpotocki
@ 2020-07-15 17:31 ` dawidpotocki
2020-07-15 17:56 ` ericonr
` (13 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: dawidpotocki @ 2020-07-15 17:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 444 bytes --]
New comment by dawidpotocki on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658901713
Comment:
btw… what's the preferred description for transitional packages? I can see
`(transitional dummy package)`, `- transitional dummy pkg`, `- transitional dummy package`,
`transitional dummy package`, `- dummy transitional package`, `(transitional meta-package)`
and probably more in repository.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (14 preceding siblings ...)
2020-07-15 17:31 ` dawidpotocki
@ 2020-07-15 17:56 ` ericonr
2020-07-15 18:35 ` [PR PATCH] [Updated] " dawidpotocki
` (12 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: ericonr @ 2020-07-15 17:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658913341
Comment:
I prefer `(transitional dummy package)`
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Updated] riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (15 preceding siblings ...)
2020-07-15 17:56 ` ericonr
@ 2020-07-15 18:35 ` dawidpotocki
2020-07-15 18:53 ` ProjectMoon
` (11 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: dawidpotocki @ 2020-07-15 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 408 bytes --]
There is an updated pull request by dawidpotocki against master on the void-packages repository
https://github.com/dawidpotocki/void-packages element-desktop
https://github.com/void-linux/void-packages/pull/23587
riot-desktop: update to 1.7.0, rename to element-desktop.
https://element.io/blog/welcome-to-element/
A patch file from https://github.com/void-linux/void-packages/pull/23587.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-23587.patch --]
[-- Type: text/x-diff, Size: 5904 bytes --]
From d4588546b709196c552d32629bb7431b72110590 Mon Sep 17 00:00:00 2001
From: Dawid Potocki <dawid@dawidpotocki.com>
Date: Thu, 16 Jul 2020 01:59:45 +1200
Subject: [PATCH] riot-desktop: update to 1.7.0, rename to element-desktop.
---
.../INSTALL.msg | 0
.../files/element-desktop.desktop} | 8 +--
.../template | 49 ++++++++++---------
srcpkgs/riot-desktop | 1 +
4 files changed, 31 insertions(+), 27 deletions(-)
rename srcpkgs/{riot-desktop => element-desktop}/INSTALL.msg (100%)
rename srcpkgs/{riot-desktop/files/riot-desktop.desktop => element-desktop/files/element-desktop.desktop} (66%)
rename srcpkgs/{riot-desktop => element-desktop}/template (50%)
create mode 120000 srcpkgs/riot-desktop
diff --git a/srcpkgs/riot-desktop/INSTALL.msg b/srcpkgs/element-desktop/INSTALL.msg
similarity index 100%
rename from srcpkgs/riot-desktop/INSTALL.msg
rename to srcpkgs/element-desktop/INSTALL.msg
diff --git a/srcpkgs/riot-desktop/files/riot-desktop.desktop b/srcpkgs/element-desktop/files/element-desktop.desktop
similarity index 66%
rename from srcpkgs/riot-desktop/files/riot-desktop.desktop
rename to srcpkgs/element-desktop/files/element-desktop.desktop
index 9aba3fb6c25..3c2fc581df8 100644
--- a/srcpkgs/riot-desktop/files/riot-desktop.desktop
+++ b/srcpkgs/element-desktop/files/element-desktop.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
-Name=Riot
+Name=Element
Comment=A feature-rich client for Matrix.org
-Exec=riot-desktop
+Exec=element-desktop
Terminal=false
Type=Application
-Icon=riot
-StartupWMClass="Riot"
+Icon=element
+StartupWMClass="Element"
Categories=Network;InstantMessaging;Chat;IRCClient
diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/element-desktop/template
similarity index 50%
rename from srcpkgs/riot-desktop/template
rename to srcpkgs/element-desktop/template
index f551dfd7e64..33425aeb4bb 100644
--- a/srcpkgs/riot-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,8 +1,8 @@
-# Template file for 'riot-desktop'
-pkgname=riot-desktop
-version=1.6.8
+# Template file for 'element-desktop'
+pkgname=element-desktop
+version=1.7.0
revision=1
-archs="i686 x86_64"
+archs="x86_64"
wrksrc="riot-web-${version}"
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl libappindicator-devel libnotify-devel pkg-config"
@@ -11,25 +11,21 @@ depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy
short_desc="Glossy Matrix collaboration client, desktop version"
maintainer="projectmoon <projectmoon@agnos.is>"
license="Apache-2.0"
-homepage="https://riot.im"
+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="fecf357e5326a4cf059b99c4478230d427686ae02072b8f8810ddfc623d69e85
- c0481954e1dc523f78b25552017f8adbb192c1f869f62f8a4cc655dab32ee721"
+checksum="838b9b423623aa57554603bbb5d663923c1b1c6efab0c6a8ad73d81ae834c9b3
+ 48aeef17ca703876f72ca3d3bd110ebb247ec92dd048342edc756ccca23035e3"
nocross=yes
nostrip=yes
-case "$XBPS_TARGET_MACHINE" in
- i686*) broken="/void-packages/srcpkgs/riot-desktop/template: line 20: 390 Segmentation fault" ;;
-esac
-
pre_build() {
# Build dependencies for riot-web
yarn install
# Build dependencies and alterations for riot-desktop
cd ../riot-desktop-${version}
- # Disable auto-updating.
- sed -i 's@https://packages.riot.im/desktop/update/@null@g' riot.im/release/config.json
+ # 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
yarn install
}
@@ -42,19 +38,26 @@ do_build() {
}
do_install() {
- vmkdir usr/lib/riot-desktop
- vmkdir etc/riot-desktop
- vcopy ../riot-desktop-${version}/dist/linux-unpacked/* /usr/lib/riot-desktop
- vinstall config.sample.json 644 /etc/riot-desktop/ config.json
- vcopy webapp /usr/lib/riot-desktop/resources
- ln -s /etc/riot-desktop/config.json $DESTDIR/usr/lib/riot-desktop/resources/webapp/config.json
+ vmkdir usr/lib/element-desktop
+ vmkdir etc/element-desktop
+ vcopy ../riot-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
vmkdir usr/bin
- ln -s /usr/lib/riot-desktop/riot-desktop $DESTDIR/usr/bin/riot-desktop
- vinstall ${FILESDIR}/riot-desktop.desktop 644 /usr/share/applications/ riot-desktop.desktop
- vinstall webapp/themes/riot/img/logos/riot-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ riot.svg
+ ln -s /usr/lib/element-desktop/element-desktop $DESTDIR/usr/bin/element-desktop
+ ln -s /usr/lib/element-desktop/element-desktop $DESTDIR/usr/bin/riot-desktop
+ vinstall ${FILESDIR}/element-desktop.desktop 644 /usr/share/applications/ element-desktop.desktop
+ 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/ riot.png
+ vinstall ../riot-desktop-${version}/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ element.png
done
}
+
+riot-desktop_package() {
+ depends="element-desktop"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
diff --git a/srcpkgs/riot-desktop b/srcpkgs/riot-desktop
new file mode 120000
index 00000000000..b58491091cd
--- /dev/null
+++ b/srcpkgs/riot-desktop
@@ -0,0 +1 @@
+element-desktop
\ No newline at end of file
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (16 preceding siblings ...)
2020-07-15 18:35 ` [PR PATCH] [Updated] " dawidpotocki
@ 2020-07-15 18:53 ` ProjectMoon
2020-07-15 19:04 ` dawidpotocki
` (10 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: ProjectMoon @ 2020-07-15 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New comment by ProjectMoon on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658942294
Comment:
Another suggestion: update install message to mention the rename
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (17 preceding siblings ...)
2020-07-15 18:53 ` ProjectMoon
@ 2020-07-15 19:04 ` dawidpotocki
2020-07-15 19:53 ` ProjectMoon
` (9 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: dawidpotocki @ 2020-07-15 19:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New comment by dawidpotocki on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658948233
Comment:
*sigh* Should I remove previous message about tray or put it next to it?
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (18 preceding siblings ...)
2020-07-15 19:04 ` dawidpotocki
@ 2020-07-15 19:53 ` ProjectMoon
2020-07-16 1:41 ` [PR PATCH] [Updated] " dawidpotocki
` (8 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: ProjectMoon @ 2020-07-15 19:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 244 bytes --]
New comment by ProjectMoon on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-658974595
Comment:
It makes sense to keep it above the tray message, which can probably be removed after this version.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Updated] riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (19 preceding siblings ...)
2020-07-15 19:53 ` ProjectMoon
@ 2020-07-16 1:41 ` dawidpotocki
2020-07-16 2:03 ` dawidpotocki
` (7 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: dawidpotocki @ 2020-07-16 1:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 408 bytes --]
There is an updated pull request by dawidpotocki against master on the void-packages repository
https://github.com/dawidpotocki/void-packages element-desktop
https://github.com/void-linux/void-packages/pull/23587
riot-desktop: update to 1.7.0, rename to element-desktop.
https://element.io/blog/welcome-to-element/
A patch file from https://github.com/void-linux/void-packages/pull/23587.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-23587.patch --]
[-- Type: text/x-diff, Size: 6572 bytes --]
From 5b97730ea80594738196205fccacddacf7d01dd6 Mon Sep 17 00:00:00 2001
From: Dawid Potocki <dawid@dawidpotocki.com>
Date: Thu, 16 Jul 2020 01:59:45 +1200
Subject: [PATCH] riot-desktop: update to 1.7.0, rename to element-desktop.
---
srcpkgs/element-desktop/INSTALL.msg | 5 ++
.../files/element-desktop.desktop} | 8 +--
.../template | 49 ++++++++++---------
srcpkgs/riot-desktop | 1 +
srcpkgs/riot-desktop/INSTALL.msg | 2 -
5 files changed, 36 insertions(+), 29 deletions(-)
create mode 100644 srcpkgs/element-desktop/INSTALL.msg
rename srcpkgs/{riot-desktop/files/riot-desktop.desktop => element-desktop/files/element-desktop.desktop} (66%)
rename srcpkgs/{riot-desktop => element-desktop}/template (50%)
create mode 120000 srcpkgs/riot-desktop
delete mode 100644 srcpkgs/riot-desktop/INSTALL.msg
diff --git a/srcpkgs/element-desktop/INSTALL.msg b/srcpkgs/element-desktop/INSTALL.msg
new file mode 100644
index 00000000000..72f9e09ec32
--- /dev/null
+++ b/srcpkgs/element-desktop/INSTALL.msg
@@ -0,0 +1,5 @@
+Riot is now called Element.
+https://element.io/blog/welcome-to-element/
+
+Element 1.6.8 has upgraded to Electron 9, with support for tray icons. It
+should no longer be necessary to use a package like snixembed.
diff --git a/srcpkgs/riot-desktop/files/riot-desktop.desktop b/srcpkgs/element-desktop/files/element-desktop.desktop
similarity index 66%
rename from srcpkgs/riot-desktop/files/riot-desktop.desktop
rename to srcpkgs/element-desktop/files/element-desktop.desktop
index 9aba3fb6c25..3c2fc581df8 100644
--- a/srcpkgs/riot-desktop/files/riot-desktop.desktop
+++ b/srcpkgs/element-desktop/files/element-desktop.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
-Name=Riot
+Name=Element
Comment=A feature-rich client for Matrix.org
-Exec=riot-desktop
+Exec=element-desktop
Terminal=false
Type=Application
-Icon=riot
-StartupWMClass="Riot"
+Icon=element
+StartupWMClass="Element"
Categories=Network;InstantMessaging;Chat;IRCClient
diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/element-desktop/template
similarity index 50%
rename from srcpkgs/riot-desktop/template
rename to srcpkgs/element-desktop/template
index f551dfd7e64..33425aeb4bb 100644
--- a/srcpkgs/riot-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,8 +1,8 @@
-# Template file for 'riot-desktop'
-pkgname=riot-desktop
-version=1.6.8
+# Template file for 'element-desktop'
+pkgname=element-desktop
+version=1.7.0
revision=1
-archs="i686 x86_64"
+archs="x86_64"
wrksrc="riot-web-${version}"
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl libappindicator-devel libnotify-devel pkg-config"
@@ -11,25 +11,21 @@ depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy
short_desc="Glossy Matrix collaboration client, desktop version"
maintainer="projectmoon <projectmoon@agnos.is>"
license="Apache-2.0"
-homepage="https://riot.im"
+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="fecf357e5326a4cf059b99c4478230d427686ae02072b8f8810ddfc623d69e85
- c0481954e1dc523f78b25552017f8adbb192c1f869f62f8a4cc655dab32ee721"
+checksum="838b9b423623aa57554603bbb5d663923c1b1c6efab0c6a8ad73d81ae834c9b3
+ 48aeef17ca703876f72ca3d3bd110ebb247ec92dd048342edc756ccca23035e3"
nocross=yes
nostrip=yes
-case "$XBPS_TARGET_MACHINE" in
- i686*) broken="/void-packages/srcpkgs/riot-desktop/template: line 20: 390 Segmentation fault" ;;
-esac
-
pre_build() {
# Build dependencies for riot-web
yarn install
# Build dependencies and alterations for riot-desktop
cd ../riot-desktop-${version}
- # Disable auto-updating.
- sed -i 's@https://packages.riot.im/desktop/update/@null@g' riot.im/release/config.json
+ # 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
yarn install
}
@@ -42,19 +38,26 @@ do_build() {
}
do_install() {
- vmkdir usr/lib/riot-desktop
- vmkdir etc/riot-desktop
- vcopy ../riot-desktop-${version}/dist/linux-unpacked/* /usr/lib/riot-desktop
- vinstall config.sample.json 644 /etc/riot-desktop/ config.json
- vcopy webapp /usr/lib/riot-desktop/resources
- ln -s /etc/riot-desktop/config.json $DESTDIR/usr/lib/riot-desktop/resources/webapp/config.json
+ vmkdir usr/lib/element-desktop
+ vmkdir etc/element-desktop
+ vcopy ../riot-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
vmkdir usr/bin
- ln -s /usr/lib/riot-desktop/riot-desktop $DESTDIR/usr/bin/riot-desktop
- vinstall ${FILESDIR}/riot-desktop.desktop 644 /usr/share/applications/ riot-desktop.desktop
- vinstall webapp/themes/riot/img/logos/riot-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ riot.svg
+ ln -s /usr/lib/element-desktop/element-desktop $DESTDIR/usr/bin/element-desktop
+ ln -s /usr/lib/element-desktop/element-desktop $DESTDIR/usr/bin/riot-desktop
+ vinstall ${FILESDIR}/element-desktop.desktop 644 /usr/share/applications/ element-desktop.desktop
+ 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/ riot.png
+ vinstall ../riot-desktop-${version}/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ element.png
done
}
+
+riot-desktop_package() {
+ depends="element-desktop"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
diff --git a/srcpkgs/riot-desktop b/srcpkgs/riot-desktop
new file mode 120000
index 00000000000..b58491091cd
--- /dev/null
+++ b/srcpkgs/riot-desktop
@@ -0,0 +1 @@
+element-desktop
\ No newline at end of file
diff --git a/srcpkgs/riot-desktop/INSTALL.msg b/srcpkgs/riot-desktop/INSTALL.msg
deleted file mode 100644
index dfad20572a1..00000000000
--- a/srcpkgs/riot-desktop/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-Riot 1.6.8 has upgraded to Electron 9, with support for tray icons. It
-should no longer be necessary to use a package like snixembed.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (20 preceding siblings ...)
2020-07-16 1:41 ` [PR PATCH] [Updated] " dawidpotocki
@ 2020-07-16 2:03 ` dawidpotocki
2020-07-16 10:05 ` ProjectMoon
` (6 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: dawidpotocki @ 2020-07-16 2:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by dawidpotocki on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-659111931
Comment:
Okay, hopefully everything is okay now 🙃
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (21 preceding siblings ...)
2020-07-16 2:03 ` dawidpotocki
@ 2020-07-16 10:05 ` ProjectMoon
2020-07-16 15:33 ` dawidpotocki
` (5 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: ProjectMoon @ 2020-07-16 10:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 162 bytes --]
New comment by ProjectMoon on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-659312145
Comment:
Looks good, yes
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (22 preceding siblings ...)
2020-07-16 10:05 ` ProjectMoon
@ 2020-07-16 15:33 ` dawidpotocki
2020-07-16 16:08 ` [PR PATCH] [Updated] " dawidpotocki
` (4 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: dawidpotocki @ 2020-07-16 15:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New comment by dawidpotocki on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-659491394
Comment:
Don't merge, preparing new template for 1.7.1 🙃
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Updated] riot-desktop: update to 1.7.0, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (23 preceding siblings ...)
2020-07-16 15:33 ` dawidpotocki
@ 2020-07-16 16:08 ` dawidpotocki
2020-07-16 16:09 ` riot-desktop: update to 1.7.1, " dawidpotocki
` (3 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: dawidpotocki @ 2020-07-16 16:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 408 bytes --]
There is an updated pull request by dawidpotocki against master on the void-packages repository
https://github.com/dawidpotocki/void-packages element-desktop
https://github.com/void-linux/void-packages/pull/23587
riot-desktop: update to 1.7.0, rename to element-desktop.
https://element.io/blog/welcome-to-element/
A patch file from https://github.com/void-linux/void-packages/pull/23587.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-desktop-23587.patch --]
[-- Type: text/x-diff, Size: 6572 bytes --]
From cbad5bd9a8351cc3e4606c50eba618867e63ac44 Mon Sep 17 00:00:00 2001
From: Dawid Potocki <dawid@dawidpotocki.com>
Date: Thu, 16 Jul 2020 01:59:45 +1200
Subject: [PATCH] riot-desktop: update to 1.7.1, rename to element-desktop.
---
srcpkgs/element-desktop/INSTALL.msg | 5 ++
.../files/element-desktop.desktop} | 8 +--
.../template | 49 ++++++++++---------
srcpkgs/riot-desktop | 1 +
srcpkgs/riot-desktop/INSTALL.msg | 2 -
5 files changed, 36 insertions(+), 29 deletions(-)
create mode 100644 srcpkgs/element-desktop/INSTALL.msg
rename srcpkgs/{riot-desktop/files/riot-desktop.desktop => element-desktop/files/element-desktop.desktop} (66%)
rename srcpkgs/{riot-desktop => element-desktop}/template (50%)
create mode 120000 srcpkgs/riot-desktop
delete mode 100644 srcpkgs/riot-desktop/INSTALL.msg
diff --git a/srcpkgs/element-desktop/INSTALL.msg b/srcpkgs/element-desktop/INSTALL.msg
new file mode 100644
index 00000000000..72f9e09ec32
--- /dev/null
+++ b/srcpkgs/element-desktop/INSTALL.msg
@@ -0,0 +1,5 @@
+Riot is now called Element.
+https://element.io/blog/welcome-to-element/
+
+Element 1.6.8 has upgraded to Electron 9, with support for tray icons. It
+should no longer be necessary to use a package like snixembed.
diff --git a/srcpkgs/riot-desktop/files/riot-desktop.desktop b/srcpkgs/element-desktop/files/element-desktop.desktop
similarity index 66%
rename from srcpkgs/riot-desktop/files/riot-desktop.desktop
rename to srcpkgs/element-desktop/files/element-desktop.desktop
index 9aba3fb6c25..3c2fc581df8 100644
--- a/srcpkgs/riot-desktop/files/riot-desktop.desktop
+++ b/srcpkgs/element-desktop/files/element-desktop.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
-Name=Riot
+Name=Element
Comment=A feature-rich client for Matrix.org
-Exec=riot-desktop
+Exec=element-desktop
Terminal=false
Type=Application
-Icon=riot
-StartupWMClass="Riot"
+Icon=element
+StartupWMClass="Element"
Categories=Network;InstantMessaging;Chat;IRCClient
diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/element-desktop/template
similarity index 50%
rename from srcpkgs/riot-desktop/template
rename to srcpkgs/element-desktop/template
index f551dfd7e64..935a0ecd686 100644
--- a/srcpkgs/riot-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,8 +1,8 @@
-# Template file for 'riot-desktop'
-pkgname=riot-desktop
-version=1.6.8
+# Template file for 'element-desktop'
+pkgname=element-desktop
+version=1.7.1
revision=1
-archs="i686 x86_64"
+archs="x86_64"
wrksrc="riot-web-${version}"
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl libappindicator-devel libnotify-devel pkg-config"
@@ -11,25 +11,21 @@ depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy
short_desc="Glossy Matrix collaboration client, desktop version"
maintainer="projectmoon <projectmoon@agnos.is>"
license="Apache-2.0"
-homepage="https://riot.im"
+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="fecf357e5326a4cf059b99c4478230d427686ae02072b8f8810ddfc623d69e85
- c0481954e1dc523f78b25552017f8adbb192c1f869f62f8a4cc655dab32ee721"
+checksum="6d92437d3cd3d7846a21616a98759e9d0c1cabd07bcbbedf1e933c1baf55b287
+ e26ad0d5ce192de4dfe29dd0cee296dddf77c043ae6e23ffcc6fc5c5fdb959b2"
nocross=yes
nostrip=yes
-case "$XBPS_TARGET_MACHINE" in
- i686*) broken="/void-packages/srcpkgs/riot-desktop/template: line 20: 390 Segmentation fault" ;;
-esac
-
pre_build() {
# Build dependencies for riot-web
yarn install
# Build dependencies and alterations for riot-desktop
cd ../riot-desktop-${version}
- # Disable auto-updating.
- sed -i 's@https://packages.riot.im/desktop/update/@null@g' riot.im/release/config.json
+ # 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
yarn install
}
@@ -42,19 +38,26 @@ do_build() {
}
do_install() {
- vmkdir usr/lib/riot-desktop
- vmkdir etc/riot-desktop
- vcopy ../riot-desktop-${version}/dist/linux-unpacked/* /usr/lib/riot-desktop
- vinstall config.sample.json 644 /etc/riot-desktop/ config.json
- vcopy webapp /usr/lib/riot-desktop/resources
- ln -s /etc/riot-desktop/config.json $DESTDIR/usr/lib/riot-desktop/resources/webapp/config.json
+ vmkdir usr/lib/element-desktop
+ vmkdir etc/element-desktop
+ vcopy ../riot-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
vmkdir usr/bin
- ln -s /usr/lib/riot-desktop/riot-desktop $DESTDIR/usr/bin/riot-desktop
- vinstall ${FILESDIR}/riot-desktop.desktop 644 /usr/share/applications/ riot-desktop.desktop
- vinstall webapp/themes/riot/img/logos/riot-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ riot.svg
+ ln -s /usr/lib/element-desktop/element-desktop $DESTDIR/usr/bin/element-desktop
+ ln -s /usr/lib/element-desktop/element-desktop $DESTDIR/usr/bin/riot-desktop
+ vinstall ${FILESDIR}/element-desktop.desktop 644 /usr/share/applications/ element-desktop.desktop
+ 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/ riot.png
+ vinstall ../riot-desktop-${version}/build/icons/${i}x${i}.png 644 /usr/share/icons/hicolor/${i}x${i}/apps/ element.png
done
}
+
+riot-desktop_package() {
+ depends="element-desktop"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
diff --git a/srcpkgs/riot-desktop b/srcpkgs/riot-desktop
new file mode 120000
index 00000000000..b58491091cd
--- /dev/null
+++ b/srcpkgs/riot-desktop
@@ -0,0 +1 @@
+element-desktop
\ No newline at end of file
diff --git a/srcpkgs/riot-desktop/INSTALL.msg b/srcpkgs/riot-desktop/INSTALL.msg
deleted file mode 100644
index dfad20572a1..00000000000
--- a/srcpkgs/riot-desktop/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-Riot 1.6.8 has upgraded to Electron 9, with support for tray icons. It
-should no longer be necessary to use a package like snixembed.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.1, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (24 preceding siblings ...)
2020-07-16 16:08 ` [PR PATCH] [Updated] " dawidpotocki
@ 2020-07-16 16:09 ` dawidpotocki
2020-07-16 16:50 ` dawidpotocki
` (2 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: dawidpotocki @ 2020-07-16 16:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New comment by dawidpotocki on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-659491394
Comment:
Don't merge, preparing new template for 1.7.1 🙃
EDIT: Done.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.1, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (25 preceding siblings ...)
2020-07-16 16:09 ` riot-desktop: update to 1.7.1, " dawidpotocki
@ 2020-07-16 16:50 ` dawidpotocki
2020-07-20 13:10 ` ProjectMoon
2020-07-20 13:42 ` [PR PATCH] [Merged]: " abenson
28 siblings, 0 replies; 30+ messages in thread
From: dawidpotocki @ 2020-07-16 16:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New comment by dawidpotocki on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-659491394
Comment:
~~Don't merge, preparing new template for 1.7.1 🙃~~
EDIT: Done.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: riot-desktop: update to 1.7.1, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (26 preceding siblings ...)
2020-07-16 16:50 ` dawidpotocki
@ 2020-07-20 13:10 ` ProjectMoon
2020-07-20 13:42 ` [PR PATCH] [Merged]: " abenson
28 siblings, 0 replies; 30+ messages in thread
From: ProjectMoon @ 2020-07-20 13:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
New comment by ProjectMoon on void-packages repository
https://github.com/void-linux/void-packages/pull/23587#issuecomment-661029430
Comment:
I have been testing both 1.7.0 and now 1.7.1 using this build for 5 days now. It looks like everything is in working order.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Merged]: riot-desktop: update to 1.7.1, rename to element-desktop.
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
` (27 preceding siblings ...)
2020-07-20 13:10 ` ProjectMoon
@ 2020-07-20 13:42 ` abenson
28 siblings, 0 replies; 30+ messages in thread
From: abenson @ 2020-07-20 13:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
There's a merged pull request on the void-packages repository
riot-desktop: update to 1.7.1, rename to element-desktop.
https://github.com/void-linux/void-packages/pull/23587
Description:
https://element.io/blog/welcome-to-element/
^ permalink raw reply [flat|nested] 30+ messages in thread
end of thread, other threads:[~2020-07-20 13:42 UTC | newest]
Thread overview: 30+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-15 14:03 [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop dawidpotocki
2020-07-15 14:29 ` ericonr
2020-07-15 14:36 ` dawidpotocki
2020-07-15 14:40 ` ericonr
2020-07-15 14:40 ` ericonr
2020-07-15 14:41 ` [PR PATCH] [Updated] " dawidpotocki
2020-07-15 14:45 ` jeffverk
2020-07-15 14:47 ` jeffverk
2020-07-15 14:48 ` ProjectMoon
2020-07-15 14:49 ` dawidpotocki
2020-07-15 14:58 ` jeffverk
2020-07-15 15:01 ` jeffverk
2020-07-15 15:01 ` ProjectMoon
2020-07-15 16:20 ` ProjectMoon
2020-07-15 16:56 ` dawidpotocki
2020-07-15 17:31 ` dawidpotocki
2020-07-15 17:56 ` ericonr
2020-07-15 18:35 ` [PR PATCH] [Updated] " dawidpotocki
2020-07-15 18:53 ` ProjectMoon
2020-07-15 19:04 ` dawidpotocki
2020-07-15 19:53 ` ProjectMoon
2020-07-16 1:41 ` [PR PATCH] [Updated] " dawidpotocki
2020-07-16 2:03 ` dawidpotocki
2020-07-16 10:05 ` ProjectMoon
2020-07-16 15:33 ` dawidpotocki
2020-07-16 16:08 ` [PR PATCH] [Updated] " dawidpotocki
2020-07-16 16:09 ` riot-desktop: update to 1.7.1, " dawidpotocki
2020-07-16 16:50 ` dawidpotocki
2020-07-20 13:10 ` ProjectMoon
2020-07-20 13:42 ` [PR PATCH] [Merged]: " abenson
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).