[arch-commits] Commit in riot/repos (4 files)

Bruno Pagani archange at archlinux.org
Mon Feb 10 18:43:02 UTC 2020


    Date: Monday, February 10, 2020 @ 18:43:01
  Author: archange
Revision: 566186

archrelease: copy trunk to community-staging-x86_64

Added:
  riot/repos/community-staging-x86_64/
  riot/repos/community-staging-x86_64/PKGBUILD
    (from rev 566185, riot/trunk/PKGBUILD)
  riot/repos/community-staging-x86_64/riot-desktop.sh
    (from rev 566185, riot/trunk/riot-desktop.sh)
  riot/repos/community-staging-x86_64/riot.desktop
    (from rev 566185, riot/trunk/riot.desktop)

-----------------+
 PKGBUILD        |  100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 riot-desktop.sh |    3 +
 riot.desktop    |    9 ++++
 3 files changed, 112 insertions(+)

Copied: riot/repos/community-staging-x86_64/PKGBUILD (from rev 566185, riot/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-02-10 18:43:01 UTC (rev 566186)
@@ -0,0 +1,100 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: Luca Weiss <luca (at) z3ntu (dot) xyz>
+# Contributor: Julian Schacher <jspp at posteo.net>
+
+pkgbase=riot
+pkgname=('riot-web' 'riot-desktop')
+pkgver=1.5.8
+pkgrel=2
+pkgdesc="A glossy Matrix collaboration client, web and desktop versions."
+arch=(x86_64)
+url="https://riot.im"
+license=(Apache)
+makedepends=(npm git yarn python rust sqlcipher electron)
+_url="https://github.com/vector-im/riot-web"
+source=(${pkgbase}-${pkgver}.tar.gz::${_url}/archive/v${pkgver}.tar.gz
+        ${pkgbase}-${pkgver}.tar.gz.asc::${_url}/releases/download/v${pkgver}/v${pkgver}-src.tar.gz.asc
+        ${pkgbase}.desktop
+        ${pkgbase}-desktop.sh)
+sha256sums=('49e5aa356b72d61096e0f0e649a2a8caff55b8626ba4d65343fd132f1fba62ed'
+            'SKIP'
+            'fa1a6756280c678e2193930adbd98c7721071278700e17a0db38de1668365091'
+            'dc14c79694bac4f523493c26a73c8000f9a2374f36dd21c1945bfb93d19277cd')
+validpgpkeys=(A878CDF66CF4A9B4807CEBE574692659BDA3D940) # Riot Releases <releases at riot.im>
+
+prepare() {
+  cd ${pkgbase}-web-${pkgver}
+  sed -i 's at https://riot.im/download/desktop/update/@null at g' electron_app/riot.im/config.json
+  sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+  yarn install
+
+  # Add the matrix-seshat package (which is needed for search in E2E encrypted
+  # rooms) as well as the electron-build-env package, which gets used later to
+  # rebuild the native libraries against electron’s version of node.
+  # See here for more information:
+  # https://github.com/vector-im/riot-web/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms
+  cd electron_app
+  yarn add matrix-seshat
+  yarn add electron-build-env
+  # Finally also enable the event indexing feature in the config.
+  sed 's/"features": {/"features": {\n        "feature_event_indexing": "enable",/' riot.im/config.json
+}
+
+build() {
+  cd ${pkgbase}-web-${pkgver}/electron_app
+  # Recompile matrix-seshat
+  yarn run electron-build-env -- --electron $(cat /usr/lib/electron/version) -- neon build matrix-seshat --release
+
+  cd ..
+  # Do the actual build
+  yarn build:electron:linux
+}
+
+package_riot-web() {
+  pkgdesc="A glossy Matrix collaboration client for the web."
+  provides=(vector-web)
+  replaces=(vector-web)
+
+  cd ${pkgbase}-web-${pkgver}
+
+  install -d "${pkgdir}"/{usr/share/webapps,etc/webapps}/${pkgbase}
+
+  cp -r webapp/* "${pkgdir}"/usr/share/webapps/${pkgbase}/
+  install -Dm644 config.sample.json -t "${pkgdir}"/etc/webapps/${pkgbase}/
+  ln -s /etc/webapps/${pkgbase}/config.json "${pkgdir}"/usr/share/webapps/${pkgbase}/
+  echo "${pkgver}" > "${pkgdir}"/usr/share/webapps/${pkgbase}/version
+}
+
+package_riot-desktop() {
+  pkgdesc="A glossy Matrix collaboration client for the desktop."
+  depends=(riot-web electron sqlcipher)
+  backup=('etc/riot/config.json')
+
+  cd ${pkgbase}-web-${pkgver}
+
+  install -d "${pkgdir}"{/usr/lib/${pkgbase}/,/etc/webapps/${pkgbase}}
+
+  # Install the app content, replace the webapp with a symlink to the system package
+  cp -r electron_app/dist/linux-unpacked/resources/* "${pkgdir}"/usr/lib/${pkgbase}/
+  rm -r "${pkgdir}"/usr/lib/${pkgbase}/webapp
+  ln -s /usr/share/webapps/${pkgbase} "${pkgdir}"/usr/lib/${pkgbase}/webapp
+
+  # Remove cruft from seshat build
+  for item in Cargo.lock Cargo.toml artifacts.json build.rs src target ; do
+    rm -r "${pkgdir}"/usr/lib/${pkgbase}/app.asar.unpacked/node_modules/matrix-seshat/native/${item}
+  done
+
+  # Config file
+  ln -s /etc/${pkgbase}/config.json "${pkgdir}"/etc/webapps/${pkgbase}/config.json
+  install -Dm644 electron_app/riot.im/config.json -t "${pkgdir}"/etc/${pkgbase}
+
+  # Required extras
+  install -Dm644 "${srcdir}"/${pkgbase}.desktop "${pkgdir}"/usr/share/applications/${pkgbase}.desktop
+  install -Dm755 "${srcdir}"/${pkgname}.sh "${pkgdir}"/usr/bin/${pkgname}
+
+  # Icons
+  install -Dm644 res/themes/riot/img/logos/riot-im-logo.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/${pkgbase}.svg
+  for i in 16 24 48 64 96 128 256 512; do
+    install -Dm644 electron_app/build/icons/${i}x${i}.png "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/${pkgbase}.png
+  done
+}

Copied: riot/repos/community-staging-x86_64/riot-desktop.sh (from rev 566185, riot/trunk/riot-desktop.sh)
===================================================================
--- community-staging-x86_64/riot-desktop.sh	                        (rev 0)
+++ community-staging-x86_64/riot-desktop.sh	2020-02-10 18:43:01 UTC (rev 566186)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+electron /usr/lib/riot/app.asar "$@"

Copied: riot/repos/community-staging-x86_64/riot.desktop (from rev 566185, riot/trunk/riot.desktop)
===================================================================
--- community-staging-x86_64/riot.desktop	                        (rev 0)
+++ community-staging-x86_64/riot.desktop	2020-02-10 18:43:01 UTC (rev 566186)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Riot
+Comment=A feature-rich client for Matrix
+Exec=/usr/bin/riot-desktop
+Terminal=false
+Type=Application
+Icon=riot
+StartupWMClass=Riot
+Categories=Network;InstantMessaging;Chat;IRCClient



More information about the arch-commits mailing list