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

[Bruno Pagani]

    Date: Thursday, November 29, 2018 @ 17:57:06
  Author: archange
Revision: 410548

Switch to electron2 since incompatible with electron 3.x

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

-----------------+
 PKGBUILD        |   10 +++++++---
 cozy-desktop.sh |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-29 17:45:56 UTC (rev 410547)
+++ PKGBUILD	2018-11-29 17:57:06 UTC (rev 410548)
@@ -2,24 +2,28 @@
 
 pkgname=cozy-desktop
 pkgver=3.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="File synchronisation for Cozy Cloud on Desktop"
 arch=('any')
 url="https://cozy-labs.github.io/cozy-desktop/"
 license=('AGPL3')
-depends=('electron' 'nodejs-lts-carbon')
+depends=('electron2' 'nodejs-lts-carbon')
 makedepends=('yarn' 'git' 'node-gyp' 'python2')
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/cozy-labs/${pkgname}/archive/v${pkgver}.tar.gz"
+        cozy-desktop-electron.patch::"https://patch-diff.githubusercontent.com/raw/cozy-labs/cozy-desktop/pull/1302.patch"
         "${pkgname}.desktop"
         "${pkgname}.sh"
         'icons.tar.xz')
 sha256sums=('d4a6738e77188e638e4957015289b2fb7b80106ab636a1329a6bd680aa87bff8'
+            '09e396165ba17dd82e76c17226e38b41d984b33cbeb7e57519d41118d5024495'
             'df0935e38d99c506b622d99d85179ec4612140d78fcd8c73103cb89c4f58ebab'
-            'fe182a6ee6b42c26fc5577df7b845798bfddadbbe470ab057e12ca46d6ca93f1'
+            '6c2df91fca75903c1e518eab56ba9cddfd3e7af6d4433207d9861ce22338f677'
             '69631fcd5f2334deffd3a5e2708cd06801fd9c22f1ebd2892c2d829dc33adf97')
 
 prepare() {
     cd ${pkgname}-${pkgver}
+    patch -p1 -i ../cozy-desktop-electron.patch
+    sed -i 's/"electron": "^1.8.3"/"electron": "^2.0.14"/' package.json
     #npm install --cache "${srcdir}"/npm-cache
     yarn install
 }

Modified: cozy-desktop.sh
===================================================================
--- cozy-desktop.sh	2018-11-29 17:45:56 UTC (rev 410547)
+++ cozy-desktop.sh	2018-11-29 17:57:06 UTC (rev 410548)
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-electron /usr/lib/cozy-desktop/resources/app.asar "$@"
+electron2 /usr/lib/cozy-desktop/resources/app.asar "$@"