Re: [PATCH 2/2] gnu: Add owncloud-client.

[Efraim Flashner <efraim@flashner.co.il>]

[-- Attachment #1.1: Type: text/plain, Size: 1892 bytes --]

On Thu, 05 Nov 2015 22:32:21 +0100
ludo@gnu.org (Ludovic Courtès) wrote:

> Efraim Flashner <efraim@flashner.co.il> skribis:
> 
> > * gnu/packages/owncloud.scm (owncloud-client): New variable.
> > * gnu-system.am [GNU_SYSTEM_MODULES]: Add it.  
> 
> [...]
> 
> > +       (modify-phases %standard-phases
> > +        (add-after 'unpack 'change-rpath-dirs
> > +          (lambda _
> > +           (substitute* '("src/libsync/CMakeLists.txt"
> > +                          "csync/src/CMakeLists.txt")
> > +                         (("\\/\\$\\{APPLICATION_EXECUTABLE\\}") ""))
> > +           (substitute* '("src/cmd/CMakeLists.txt"
> > +                          "src/crashreporter/CMakeLists.txt"
> > +                          "src/gui/CMakeLists.txt")
> > +                         (("\\/\\$\\{APPLICATION_EXECUTABLE\\}\\\"") "\"")))))))  
> 
> Please indent as in other files.  Also, could you add a comment
> explaining what this does?

Intenting fixed. I also added a comment that the default is to save the
libraries in /usr/lib/name/ and we store them in $out/lib/, hence removing
the last piece

> 
> > +    (synopsis "GUI folder synchronization with an ownCloud server")  
> 
> I’d remove “GUI” here (looks weird.)

ok

> 
> > +    (description "The ownCloudSync system lets you always have your latest  
> 
> … and s/system/GUI/ here.

ok. Also, this package has both the GUI sync client and the cli sync client.
Debian splits the output into two packages, but I'm assuming that wouldn't
actually save that much of the build time.

> 
> Could you send an updated patch?

of course

> 
> Thanks,
> Ludo’.



-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0002-gnu-Add-owncloud-client.patch --]
[-- Type: text/x-patch, Size: 4649 bytes --]

From 56d9cb2f5132838cbaefb9a5488fb2cdd9b126e2 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 2 Nov 2015 19:31:31 +0200
Subject: [PATCH 2/2] gnu: Add owncloud-client.

* gnu/packages/owncloud.scm (owncloud-client): New variable.
* gnu-system.am [GNU_SYSTEM_MODULES]: Add it.
---
 gnu-system.am             |  1 +
 gnu/packages/owncloud.scm | 80 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 gnu/packages/owncloud.scm

diff --git a/gnu-system.am b/gnu-system.am
index f3ded69..3612958 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -241,6 +241,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/openstack.scm			\
   gnu/packages/orpheus.scm			\
   gnu/packages/ots.scm				\
+  gnu/packages/owncloud.scm			\
   gnu/packages/package-management.scm		\
   gnu/packages/parallel.scm			\
   gnu/packages/password-utils.scm		\
diff --git a/gnu/packages/owncloud.scm b/gnu/packages/owncloud.scm
new file mode 100644
index 0000000..58c2a51
--- /dev/null
+++ b/gnu/packages/owncloud.scm
@@ -0,0 +1,80 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages owncloud)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix download)
+  #:use-module (guix packages)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages ruby)
+  #:use-module (gnu packages tls))
+
+(define-public owncloud-client
+  (package
+    (name "owncloud-client")
+    (version "2.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://download.owncloud.com/desktop/stable/"
+                           "owncloudclient-" version ".tar.xz"))
+       (sha256
+        (base32 "0a42nqx0gn10n7ikhxwif0lqddmb6gbvr45bqbbl30an9gixq598"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'change-rpath-dirs
+          (lambda _
+            (substitute* '("src/libsync/CMakeLists.txt"
+                           "csync/src/CMakeLists.txt")
+              ;; We store the libs in out/lib and not /usr/lib/appname, so we 
+              ;; need the executable to point to the libraries in /lib and not
+              ;; in /lib/appname. 
+              (("\\/\\$\\{APPLICATION_EXECUTABLE\\}") ""))
+            (substitute* '("src/cmd/CMakeLists.txt"
+                           "src/crashreporter/CMakeLists.txt"
+                           "src/gui/CMakeLists.txt")
+              ;; This has the same issue as the substitution above.
+              (("\\/\\$\\{APPLICATION_EXECUTABLE\\}\\\"") "\"")))))))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("inotify-tools" ,inotify-tools)
+       ("openssl" ,openssl)
+       ("perl" ,perl)
+       ("python-wrapper" ,python-wrapper)
+       ("qt" ,qt)
+       ("qtkeychain" ,qtkeychain)
+       ("ruby" ,ruby)
+       ("sqlite" ,sqlite)
+       ("zlib" ,zlib)))
+    (home-page "https://owncloud.org")
+    (synopsis "Folder synchronization with an ownCloud server")
+    (description "The ownCloudSync system lets you always have your latest
+files wherever you are.  Just specify one or more folders on the local machine
+to and a server to synchronize to.  You can configure more computers to
+synchronize to the same server and any change to the files on one computer will
+silently and reliably flow across to every other.")
+    (license license:gpl2+)))
-- 
2.6.2


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]