riot-desktop: update to 1.7.1, rename to element-desktop.

This commit is contained in:
Dawid Potocki 2020-07-16 01:59:45 +12:00 committed by Andrew Benson
parent 3b968624f7
commit efbd8dfcb4
5 changed files with 36 additions and 29 deletions

View file

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

View file

@ -1,10 +1,10 @@
[Desktop Entry] [Desktop Entry]
Name=Riot Name=Element
Comment=A feature-rich client for Matrix.org Comment=A feature-rich client for Matrix.org
Exec=riot-desktop Exec=element-desktop
Terminal=false Terminal=false
Type=Application Type=Application
Icon=riot Icon=element
StartupWMClass="Riot" StartupWMClass="Element"
Categories=Network;InstantMessaging;Chat;IRCClient Categories=Network;InstantMessaging;Chat;IRCClient

View file

@ -1,8 +1,8 @@
# Template file for 'riot-desktop' # Template file for 'element-desktop'
pkgname=riot-desktop pkgname=element-desktop
version=1.6.8 version=1.7.1
revision=1 revision=1
archs="i686 x86_64" archs="x86_64"
wrksrc="riot-web-${version}" wrksrc="riot-web-${version}"
conf_files="/etc/${pkgname}/config.json" conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python sqlcipher-devel curl libappindicator-devel libnotify-devel pkg-config" 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" short_desc="Glossy Matrix collaboration client, desktop version"
maintainer="projectmoon <projectmoon@agnos.is>" maintainer="projectmoon <projectmoon@agnos.is>"
license="Apache-2.0" 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" 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 checksum="6d92437d3cd3d7846a21616a98759e9d0c1cabd07bcbbedf1e933c1baf55b287
c0481954e1dc523f78b25552017f8adbb192c1f869f62f8a4cc655dab32ee721" e26ad0d5ce192de4dfe29dd0cee296dddf77c043ae6e23ffcc6fc5c5fdb959b2"
nocross=yes nocross=yes
nostrip=yes nostrip=yes
case "$XBPS_TARGET_MACHINE" in
i686*) broken="/void-packages/srcpkgs/riot-desktop/template: line 20: 390 Segmentation fault" ;;
esac
pre_build() { pre_build() {
# Build dependencies for riot-web # Build dependencies for riot-web
yarn install yarn install
# Build dependencies and alterations for riot-desktop # Build dependencies and alterations for riot-desktop
cd ../riot-desktop-${version} cd ../riot-desktop-${version}
# Disable auto-updating. # Disable auto-updating
sed -i 's@https://packages.riot.im/desktop/update/@null@g' riot.im/release/config.json 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 sed -i 's/"target": "deb"/"target": "dir"/g' package.json
yarn install yarn install
} }
@ -42,19 +38,26 @@ do_build() {
} }
do_install() { do_install() {
vmkdir usr/lib/riot-desktop vmkdir usr/lib/element-desktop
vmkdir etc/riot-desktop vmkdir etc/element-desktop
vcopy ../riot-desktop-${version}/dist/linux-unpacked/* /usr/lib/riot-desktop vcopy ../riot-desktop-${version}/dist/linux-unpacked/* /usr/lib/element-desktop
vinstall config.sample.json 644 /etc/riot-desktop/ config.json vinstall config.sample.json 644 /etc/element-desktop/ config.json
vcopy webapp /usr/lib/riot-desktop/resources vcopy webapp /usr/lib/element-desktop/resources
ln -s /etc/riot-desktop/config.json $DESTDIR/usr/lib/riot-desktop/resources/webapp/config.json ln -s /etc/element-desktop/config.json $DESTDIR/usr/lib/element-desktop/resources/webapp/config.json
vmkdir usr/bin vmkdir usr/bin
ln -s /usr/lib/riot-desktop/riot-desktop $DESTDIR/usr/bin/riot-desktop ln -s /usr/lib/element-desktop/element-desktop $DESTDIR/usr/bin/element-desktop
vinstall ${FILESDIR}/riot-desktop.desktop 644 /usr/share/applications/ riot-desktop.desktop ln -s /usr/lib/element-desktop/element-desktop $DESTDIR/usr/bin/riot-desktop
vinstall webapp/themes/riot/img/logos/riot-logo.svg 644 /usr/share/icons/hicolor/scalable/apps/ riot.svg 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 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 done
} }
riot-desktop_package() {
depends="element-desktop"
short_desc+=" (transitional dummy package)"
build_style=meta
}

1
srcpkgs/riot-desktop Symbolic link
View file

@ -0,0 +1 @@
element-desktop

View file

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