From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: [PATCH 2/2] gnu: Add owncloud-client. Date: Sat, 7 Nov 2015 20:35:52 +0200 Message-ID: <20151107203552.6229013f@debian-netbook> References: <1446497399-30726-1-git-send-email-efraim@flashner.co.il> <1446497399-30726-3-git-send-email-efraim@flashner.co.il> <87611gceu2.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/uV1eB1IxDmmuyJU35p_qAkV"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zv8Nv-00021b-Mr for guix-devel@gnu.org; Sat, 07 Nov 2015 13:38:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zv8Nr-0007MA-5k for guix-devel@gnu.org; Sat, 07 Nov 2015 13:38:43 -0500 In-Reply-To: <87611gceu2.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic =?UTF-8?B?Q291cnTDqHM=?= Cc: guix-devel@gnu.org --Sig_/uV1eB1IxDmmuyJU35p_qAkV Content-Type: multipart/mixed; boundary="MP_/IpkbELA1Sw=+/PWtPmxVNhz" --MP_/IpkbELA1Sw=+/PWtPmxVNhz Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Thu, 05 Nov 2015 22:32:21 +0100 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > Efraim Flashner skribis: >=20 > > * gnu/packages/owncloud.scm (owncloud-client): New variable. > > * gnu-system.am [GNU_SYSTEM_MODULES]: Add it. =20 >=20 > [...] >=20 > > + (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\\}\\\"") "= \""))))))) =20 >=20 > 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 >=20 > > + (synopsis "GUI folder synchronization with an ownCloud server") =20 >=20 > I=E2=80=99d remove =E2=80=9CGUI=E2=80=9D here (looks weird.) ok >=20 > > + (description "The ownCloudSync system lets you always have your la= test =20 >=20 > =E2=80=A6 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. >=20 > Could you send an updated patch? of course >=20 > Thanks, > Ludo=E2=80=99. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --MP_/IpkbELA1Sw=+/PWtPmxVNhz Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-gnu-Add-owncloud-client.patch =46rom 56d9cb2f5132838cbaefb9a5488fb2cdd9b126e2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner 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 =3D \ 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 =C2=A9 2015 Efraim Flashner +;;; +;;; 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 . + +(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=20 + ;; need the executable to point to the libraries in /lib and= not + ;; in /lib/appname.=20 + (("\\/\\$\\{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 mac= hine +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+))) --=20 2.6.2 --MP_/IpkbELA1Sw=+/PWtPmxVNhz-- --Sig_/uV1eB1IxDmmuyJU35p_qAkV Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJWPkSIAAoJEPTB05F+rO6TgB4P+wYQSCcOsVPrXFFzuEu6ZruH MJKPO5S44rz9xsCGy+iprnuCDhbZuaPhZdgpW/Kk+6nEQJTPYVAz5THXyqmBtqx2 s0QBh6T2LsabR7rQ6LPjLMxoNlZyJQN2VowM1kbZ6GwBH6Sm0CY3tIKNp9R4aoDK i7htRYp67cuX6MPVY/AKz9zU/MRW45U+n4UPj/cg3LA7uDxZuOeQlr+lXKnW2JuD O2O4N8CLBqqlaegRn/Z3EGT2wdI8lNAIQOAc9xZ0VZJdvbygZKNzi3+9se0tq34J ph+8XEtg7Xj3nu+KiH+6ZP3OLgo/68YHKv9BhSD0BQ99xcaoWHq4mXwP5F42laY4 e/wy8vmkvbfF6ZXrxdlZnN66d/x0MS1yYeO4e2KKm8lFzbtlcLbr2iEkhAyKWM0m byQYZHTLPx8LIDKL9gLK4mh+SBn0XGAVHEQvgKrsrLTwZUFdr96QUWLfy55hUyZx PIuopkdg+9subj36En+AhTJRm3FZz2ZNPbJzxwKsFD7rwkHnqhMbU4iO/k7z8Noy Pa5/O3eYfPPplBHK5QTYxNbGtPlCmLTL9Ji3Kj9Uq43bcUUA2hm9MntqMrizNPyl ZXHHSTqS0J6DrV4/HHgGB+lPYTP9D8q22ZQzYUUCNbJjnvDZOY1cjmKhwMFNv+AR PM07JWyY13DdMjy+ZFiX =fymB -----END PGP SIGNATURE----- --Sig_/uV1eB1IxDmmuyJU35p_qAkV--