[arch-commits] Commit in cozy-desktop/repos/community-any (6 files)

Bruno Pagani archange at gemini.archlinux.org
Thu Apr 28 11:19:57 UTC 2022


    Date: Thursday, April 28, 2022 @ 11:19:56
  Author: archange
Revision: 1191564

archrelease: copy trunk to community-any

Added:
  cozy-desktop/repos/community-any/PKGBUILD
    (from rev 1191563, cozy-desktop/trunk/PKGBUILD)
  cozy-desktop/repos/community-any/cozy-desktop.desktop
    (from rev 1191563, cozy-desktop/trunk/cozy-desktop.desktop)
  cozy-desktop/repos/community-any/cozy-desktop.sh
    (from rev 1191563, cozy-desktop/trunk/cozy-desktop.sh)
Deleted:
  cozy-desktop/repos/community-any/PKGBUILD
  cozy-desktop/repos/community-any/cozy-desktop.desktop
  cozy-desktop/repos/community-any/cozy-desktop.sh

----------------------+
 PKGBUILD             |  114 +++++++++++++++++++++++++------------------------
 cozy-desktop.desktop |   18 +++----
 cozy-desktop.sh      |    6 +-
 3 files changed, 72 insertions(+), 66 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-28 11:19:28 UTC (rev 1191563)
+++ PKGBUILD	2022-04-28 11:19:56 UTC (rev 1191564)
@@ -1,54 +0,0 @@
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-
-pkgname=cozy-desktop
-pkgver=3.33.0
-pkgrel=1
-pkgdesc="File synchronisation for Cozy Cloud on Desktop"
-arch=(any)
-url="https://cozy-labs.github.io/cozy-desktop/"
-license=(AGPL3)
-_electron=electron12
-depends=(${_electron})
-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
-        ${pkgname}.desktop
-        ${pkgname}.sh)
-sha256sums=('a82325f1183c83888c30bb839b89a2e87e3991a09588c0c4564b33db7a557590'
-            '2ecffbfe8d464fc03070d7f320e37b770f7ac4fdb043ab34bdf8211f56fdfa90'
-            '563edd5a43c7f06080e03bec5f4e46154227f7e163500950ea39ecad466b198a'
-            'a8783d3f6ce2da344ffe403f8e1a4f9da8de3b59e8bfda10e15a4ff5643244cf')
-
-prepare() {
-    # Specify electron version in launcher
-    sed -i "s|@ELECTRON@|${_electron}|" ${pkgname}.sh
-    cd ${pkgname}-${pkgver}
-    yarn install --no-fund
-}
-
-build() {
-    cd ${pkgname}-${pkgver}
-    yarn build #--offline disabled https://github.com/cozy-labs/cozy-desktop/issues/2206
-}
-
-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)
-
-    install -d "${pkgdir}"/usr/lib/${pkgname}
-    cp -r dist/linux-unpacked/resources/* "${pkgdir}"/usr/lib/${pkgname}/
-
-    rm "${pkgdir}"/usr/lib/cozy-desktop/app.asar.unpacked/gui/scripts/macos-add-favorite.py
-    rmdir "${pkgdir}"/usr/lib/cozy-desktop/app.asar.unpacked/{gui/{scripts/,},}
-    rm -r "${pkgdir}"/usr/lib/cozy-desktop/regedit
-
-    cd "${srcdir}"
-    chmod +x Cozy-Drive-${pkgver}-x86_64.AppImage
-    ./Cozy-Drive-${pkgver}-x86_64.AppImage --appimage-extract
-    cp -r squashfs-root/usr/share "${pkgdir}"/usr/
-    chmod a+rX -R "${pkgdir}"/usr/share
-
-    install -Dm755 ${pkgname}.sh "${pkgdir}"/usr/bin/${pkgname}
-    install -Dm644 ${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop
-}

Copied: cozy-desktop/repos/community-any/PKGBUILD (from rev 1191563, cozy-desktop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-04-28 11:19:56 UTC (rev 1191564)
@@ -0,0 +1,60 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+
+pkgname=cozy-desktop
+pkgver=3.34.1
+pkgrel=1
+pkgdesc="File synchronisation for Cozy Cloud on Desktop"
+arch=(any)
+url="https://cozy-labs.github.io/cozy-desktop/"
+license=(AGPL3)
+_electron=electron12
+depends=(${_electron})
+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=('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
+}
+
+package() {
+    cd ${pkgname}-${pkgver}
+    # 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}/
+
+    rm "${pkgdir}"/usr/lib/cozy-desktop/app.asar.unpacked/gui/scripts/macos-add-favorite.py
+    rmdir "${pkgdir}"/usr/lib/cozy-desktop/app.asar.unpacked/{gui/{scripts/,},}
+    rm -r "${pkgdir}"/usr/lib/cozy-desktop/regedit
+
+    cd "${srcdir}"
+    chmod +x Cozy-Drive-${pkgver}-x86_64.AppImage
+    ./Cozy-Drive-${pkgver}-x86_64.AppImage --appimage-extract
+    cp -r squashfs-root/usr/share "${pkgdir}"/usr/
+    chmod a+rX -R "${pkgdir}"/usr/share
+
+    install -Dm755 ${pkgname}.sh "${pkgdir}"/usr/bin/${pkgname}
+    install -Dm644 ${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop
+}

Deleted: cozy-desktop.desktop
===================================================================
--- cozy-desktop.desktop	2022-04-28 11:19:28 UTC (rev 1191563)
+++ cozy-desktop.desktop	2022-04-28 11:19:56 UTC (rev 1191564)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Cozy Desktop
-Comment=Save them safely in your open source personal cloud, access them anywhere, anytime with the mobile application and share them with the world or just your friends and colleagues. You can host your own Cozy Cloud, and or use the hosting services. Your freedom to chose is why you can trust us.
-Exec=/usr/bin/cozy-desktop
-Terminal=false
-Type=Application
-Icon=cozydrive
-StartupNotify=true
-Categories=Network;FileTransfer;

Copied: cozy-desktop/repos/community-any/cozy-desktop.desktop (from rev 1191563, cozy-desktop/trunk/cozy-desktop.desktop)
===================================================================
--- cozy-desktop.desktop	                        (rev 0)
+++ cozy-desktop.desktop	2022-04-28 11:19:56 UTC (rev 1191564)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Cozy Desktop
+Comment=Save them safely in your open source personal cloud, access them anywhere, anytime with the mobile application and share them with the world or just your friends and colleagues. You can host your own Cozy Cloud, and or use the hosting services. Your freedom to chose is why you can trust us.
+Exec=/usr/bin/cozy-desktop
+Terminal=false
+Type=Application
+Icon=cozydrive
+StartupNotify=true
+Categories=Network;FileTransfer;

Deleted: cozy-desktop.sh
===================================================================
--- cozy-desktop.sh	2022-04-28 11:19:28 UTC (rev 1191563)
+++ cozy-desktop.sh	2022-04-28 11:19:56 UTC (rev 1191564)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec @ELECTRON@ /usr/lib/cozy-desktop/app.asar --disable-dev-mode "$@"

Copied: cozy-desktop/repos/community-any/cozy-desktop.sh (from rev 1191563, cozy-desktop/trunk/cozy-desktop.sh)
===================================================================
--- cozy-desktop.sh	                        (rev 0)
+++ cozy-desktop.sh	2022-04-28 11:19:56 UTC (rev 1191564)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @ELECTRON@ /usr/lib/cozy-desktop/app.asar --disable-dev-mode "$@"



More information about the arch-commits mailing list