From 5b97730ea80594738196205fccacddacf7d01dd6 Mon Sep 17 00:00:00 2001 From: Dawid Potocki 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 " 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.