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

[Bruno Pagani]

    Date: Thursday, April 28, 2022 @ 11:19:17
  Author: archange
Revision: 1191561

upgpkg: cozy-desktop 3.34.1-1

FS#74134 Fix build w.r.t. atom/watcher.

Modified:
  cozy-desktop/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-28 11:18:17 UTC (rev 1191560)
+++ PKGBUILD	2022-04-28 11:19:17 UTC (rev 1191561)
@@ -1,7 +1,7 @@
 # Maintainer: Bruno Pagani <archange at archlinux.org>
 
 pkgname=cozy-desktop
-pkgver=3.33.0
+pkgver=3.34.1
 pkgrel=1
 pkgdesc="File synchronisation for Cozy Cloud on Desktop"
 arch=(any)
@@ -12,29 +12,35 @@
 makedepends=(nodejs-lts-fermium yarn git node-gyp python)
 source=(https://github.com/cozy-labs/${pkgname}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
         https://github.com/cozy-labs/${pkgname}/releases/download/v${pkgver}/Cozy-Drive-${pkgver}-x86_64.AppImage
+        watcher-1.3.5.tar.gz::https://github.com/atom/watcher/archive/refs/tags/v1.3.5.tar.gz
         ${pkgname}.desktop
         ${pkgname}.sh)
-sha256sums=('a82325f1183c83888c30bb839b89a2e87e3991a09588c0c4564b33db7a557590'
-            '2ecffbfe8d464fc03070d7f320e37b770f7ac4fdb043ab34bdf8211f56fdfa90'
+sha256sums=('72fd5c1acfd8d5685fbfb37d0b45101d913b822d920828d3423e1e045728c5f2'
+            'a1a83946579f18ce6447786db70183759deb375d26b7d62bbbd7c7aecd23058f'
+            'a674bf8f633a7d0a146d90db384e8761a9c430fc65a4e9028d9b19ad07a0f6d2'
             '563edd5a43c7f06080e03bec5f4e46154227f7e163500950ea39ecad466b198a'
             'a8783d3f6ce2da344ffe403f8e1a4f9da8de3b59e8bfda10e15a4ff5643244cf')
 
 prepare() {
+    # https://github.com/cozy-labs/cozy-desktop/issues/2206
+    sed -i 's/from_path, EntryKind kind);/from_path, EntryKind kind) noexcept;/' watcher-1.3.5/src/worker/linux/cookie_jar.h
     # Specify electron version in launcher
     sed -i "s|@ELECTRON@|${_electron}|" ${pkgname}.sh
     cd ${pkgname}-${pkgver}
+    yarn add file:"${srcdir}"/watcher-1.3.5
     yarn install --no-fund
 }
 
 build() {
     cd ${pkgname}-${pkgver}
-    yarn build #--offline disabled https://github.com/cozy-labs/cozy-desktop/issues/2206
+    yarn build --offline
 }
 
 package() {
     cd ${pkgname}-${pkgver}
-    # Using our electron does not work with the same failure as https://github.com/cozy-labs/cozy-desktop/issues/2206
-    yarn dist --dir #-c.electronDist=/usr/lib/${_electron} -c.electronVersion=$(tail -c +1 /usr/lib/${_electron}/version)
+    # https://github.com/cozy-labs/cozy-desktop/issues/2206
+    export npm_config_force_process_config=true
+    yarn dist --dir -c.electronDist=/usr/lib/${_electron} -c.electronVersion=$(tail -c +1 /usr/lib/${_electron}/version)
 
     install -d "${pkgdir}"/usr/lib/${pkgname}
     cp -r dist/linux-unpacked/resources/* "${pkgdir}"/usr/lib/${pkgname}/