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

Bruno Pagani archange at archlinux.org
Thu Nov 29 17:57:23 UTC 2018


    Date: Thursday, November 29, 2018 @ 17:57:22
  Author: archange
Revision: 410549

archrelease: copy trunk to community-any

Added:
  cozy-desktop/repos/community-any/PKGBUILD
    (from rev 410548, cozy-desktop/trunk/PKGBUILD)
  cozy-desktop/repos/community-any/cozy-desktop.desktop
    (from rev 410548, cozy-desktop/trunk/cozy-desktop.desktop)
  cozy-desktop/repos/community-any/cozy-desktop.sh
    (from rev 410548, cozy-desktop/trunk/cozy-desktop.sh)
  cozy-desktop/repos/community-any/icons.tar.xz
    (from rev 410548, cozy-desktop/trunk/icons.tar.xz)
Deleted:
  cozy-desktop/repos/community-any/PKGBUILD
  cozy-desktop/repos/community-any/cozy-desktop.desktop
  cozy-desktop/repos/community-any/cozy-desktop.sh
  cozy-desktop/repos/community-any/icons.tar.xz

----------------------+
 PKGBUILD             |   98 +++++++++++++++++++++++++------------------------
 cozy-desktop.desktop |   18 ++++-----
 cozy-desktop.sh      |    6 +--
 3 files changed, 63 insertions(+), 59 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-29 17:57:06 UTC (rev 410548)
+++ PKGBUILD	2018-11-29 17:57:22 UTC (rev 410549)
@@ -1,47 +0,0 @@
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-
-pkgname=cozy-desktop
-pkgver=3.10.2
-pkgrel=1
-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')
-makedepends=('yarn' 'git' 'node-gyp' 'python2')
-source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/cozy-labs/${pkgname}/archive/v${pkgver}.tar.gz"
-        "${pkgname}.desktop"
-        "${pkgname}.sh"
-        'icons.tar.xz')
-sha256sums=('d4a6738e77188e638e4957015289b2fb7b80106ab636a1329a6bd680aa87bff8'
-            'df0935e38d99c506b622d99d85179ec4612140d78fcd8c73103cb89c4f58ebab'
-            'fe182a6ee6b42c26fc5577df7b845798bfddadbbe470ab057e12ca46d6ca93f1'
-            '69631fcd5f2334deffd3a5e2708cd06801fd9c22f1ebd2892c2d829dc33adf97')
-
-prepare() {
-    cd ${pkgname}-${pkgver}
-    #npm install --cache "${srcdir}"/npm-cache
-    yarn install
-}
-
-build() {
-    cd ${pkgname}-${pkgver}
-    #npm run build --cache "${srcdir}"/npm-cache
-    yarn build
-}
-
-package() {
-    cd ${pkgname}-${pkgver}
-    #npm run dist --dir --cache "${srcdir}"/npm-cache
-    yarn dist --dir
-
-    install -dm755 "${pkgdir}"/usr/lib/${pkgname}
-    cp -r dist/linux-unpacked/resources "${pkgdir}"/usr/lib/${pkgname}/
-
-    cd "${srcdir}"
-    install -dm755 "${pkgdir}"/usr/share/icons/
-    cp -r hicolor "${pkgdir}"/usr/share/icons/
-
-    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 410548, cozy-desktop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-11-29 17:57:22 UTC (rev 410549)
@@ -0,0 +1,51 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+
+pkgname=cozy-desktop
+pkgver=3.10.2
+pkgrel=2
+pkgdesc="File synchronisation for Cozy Cloud on Desktop"
+arch=('any')
+url="https://cozy-labs.github.io/cozy-desktop/"
+license=('AGPL3')
+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'
+            '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
+}
+
+build() {
+    cd ${pkgname}-${pkgver}
+    #npm run build --cache "${srcdir}"/npm-cache
+    yarn build
+}
+
+package() {
+    cd ${pkgname}-${pkgver}
+    #npm run dist --dir --cache "${srcdir}"/npm-cache
+    yarn dist --dir
+
+    install -dm755 "${pkgdir}"/usr/lib/${pkgname}
+    cp -r dist/linux-unpacked/resources "${pkgdir}"/usr/lib/${pkgname}/
+
+    cd "${srcdir}"
+    install -dm755 "${pkgdir}"/usr/share/icons/
+    cp -r hicolor "${pkgdir}"/usr/share/icons/
+
+    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	2018-11-29 17:57:06 UTC (rev 410548)
+++ cozy-desktop.desktop	2018-11-29 17:57:22 UTC (rev 410549)
@@ -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=cozy-desktop
-StartupNotify=true
-Categories=Network;FileTransfer;

Copied: cozy-desktop/repos/community-any/cozy-desktop.desktop (from rev 410548, cozy-desktop/trunk/cozy-desktop.desktop)
===================================================================
--- cozy-desktop.desktop	                        (rev 0)
+++ cozy-desktop.desktop	2018-11-29 17:57:22 UTC (rev 410549)
@@ -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=cozy-desktop
+StartupNotify=true
+Categories=Network;FileTransfer;

Deleted: cozy-desktop.sh
===================================================================
--- cozy-desktop.sh	2018-11-29 17:57:06 UTC (rev 410548)
+++ cozy-desktop.sh	2018-11-29 17:57:22 UTC (rev 410549)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-electron /usr/lib/cozy-desktop/resources/app.asar "$@"

Copied: cozy-desktop/repos/community-any/cozy-desktop.sh (from rev 410548, cozy-desktop/trunk/cozy-desktop.sh)
===================================================================
--- cozy-desktop.sh	                        (rev 0)
+++ cozy-desktop.sh	2018-11-29 17:57:22 UTC (rev 410549)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+electron2 /usr/lib/cozy-desktop/resources/app.asar "$@"

Deleted: icons.tar.xz
===================================================================
(Binary files differ)

Copied: cozy-desktop/repos/community-any/icons.tar.xz (from rev 410548, cozy-desktop/trunk/icons.tar.xz)
===================================================================
(Binary files differ)


More information about the arch-commits mailing list