[arch-commits] Commit in riot/trunk (PKGBUILD riot-desktop.sh riot.desktop)

[Bruno Pagani]

    Date: Monday, December 30, 2019 @ 23:54:57
  Author: archange
Revision: 545023

upgpkg: riot 1.5.6-1

Switch to yarn as recommended by upstream since npm produces non-working builds.
Also use electron-builder through yarn to produce a reduced app.asar instead of
packaging the whole electron_app directory.

Modified:
  riot/trunk/PKGBUILD
  riot/trunk/riot-desktop.sh
  riot/trunk/riot.desktop

-----------------+
 PKGBUILD        |   36 ++++++++++++++++++------------------
 riot-desktop.sh |    2 +-
 riot.desktop    |    2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-30 23:48:38 UTC (rev 545022)
+++ PKGBUILD	2019-12-30 23:54:57 UTC (rev 545023)
@@ -2,8 +2,8 @@
 # Contributor: Luca Weiss <luca (at) z3ntu (dot) xyz>
 
 pkgbase=riot
-pkgname=('riot-desktop' 'riot-web')
-pkgver=1.5.5
+pkgname=('riot-web' 'riot-desktop')
+pkgver=1.5.6
 pkgrel=1
 pkgdesc="A glossy Matrix collaboration client, web and desktop versions."
 arch=(any)
@@ -15,21 +15,22 @@
         ${pkgbase}-${pkgver}.tar.gz.asc::"${_url}/releases/download/v${pkgver}/v${pkgver}-src.tar.gz.asc"
         "${pkgbase}.desktop"
         "${pkgbase}-desktop.sh")
-sha256sums=('f0fac527fedade01243268a08c891e3d302b2ea7ceab9c6a4aa21503b636c4b3'
+sha256sums=('81716845e53cca31ce3dc6ed42640ec56279b9171db2709e3f6f81b93c415a6a'
             'SKIP'
-            '7bb009c38bce944472e5b9d4eded6a9051e673665034ecc3a7f1cb63912123b7'
-            '94807ecb4210b09672d39f39b5be6f4e8fbd58e9d674c3b7ca795a6dd9c14ff7')
+            '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
 }
 
 build() {
   cd ${pkgbase}-web-${pkgver}
-  npm install --cache ../npm-cache
-  npm run build --cache ../npm-cache
+  yarn build:electron:linux
 }
 
 package_riot-web() {
@@ -36,6 +37,7 @@
   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}
@@ -50,27 +52,25 @@
   pkgdesc="A glossy Matrix collaboration client for the desktop."
   depends=(riot-web electron)
   backup=('etc/riot/config.json')
+
   cd ${pkgbase}-web-${pkgver}
 
-  cd electron_app
-  npm install --cache "${srcdir}"/npm-cache
-  cd ..
+  install -d "${pkgdir}"{/usr/lib/${pkgbase}/,/etc/webapps/${pkgbase}}
 
-  install -d "${pkgdir}"{/usr/lib/${pkgbase}/electron_app,/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
 
-  ln -s /usr/share/webapps/${pkgbase} "${pkgdir}"/usr/lib/${pkgbase}/webapp
+  # Config file
   ln -s /etc/${pkgbase}/config.json "${pkgdir}"/etc/webapps/${pkgbase}/config.json
-
-  install -Dm644 package.json -t "${pkgdir}"/usr/lib/${pkgbase}/
-  cp -r origin_migrator "${pkgdir}"/usr/lib/${pkgbase}/
-  cp -r electron_app/src "${pkgdir}"/usr/lib/${pkgbase}/electron_app/
-  cp -r electron_app/node_modules "${pkgdir}"/usr/lib/${pkgbase}/electron_app/
-  install -Dm644 electron_app/img/riot.png -t "${pkgdir}"/usr/lib/${pkgbase}/img
   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

Modified: riot-desktop.sh
===================================================================
--- riot-desktop.sh	2019-12-30 23:48:38 UTC (rev 545022)
+++ riot-desktop.sh	2019-12-30 23:54:57 UTC (rev 545023)
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-electron /usr/lib/riot/ "$@"
+electron /usr/lib/riot/app.asar "$@"

Modified: riot.desktop
===================================================================
--- riot.desktop	2019-12-30 23:48:38 UTC (rev 545022)
+++ riot.desktop	2019-12-30 23:54:57 UTC (rev 545023)
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Riot
-Comment=A feature-rich client for Matrix.org
+Comment=A feature-rich client for Matrix
 Exec=/usr/bin/riot-desktop
 Terminal=false
 Type=Application