From: dawidpotocki <dawidpotocki@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] riot-desktop: update to 1.7.0, rename to element-desktop.
Date: Wed, 15 Jul 2020 16:03:48 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23587@inbox.vuxu.org> (raw)
[-- 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
next reply other threads:[~2020-07-15 14:03 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 14:03 dawidpotocki [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23587@inbox.vuxu.org \
--to=dawidpotocki@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).