From patchwork Sat Jan 16 14:34:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 26416 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E95C927BC14; Sat, 16 Jan 2021 14:35:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3823C27BC13 for ; Sat, 16 Jan 2021 14:35:24 +0000 (GMT) Received: from localhost ([::1]:46480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0mfj-0007Iz-8B for patchwork@mira.cbaines.net; Sat, 16 Jan 2021 09:35:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0mfO-0007Ik-DC for guix-patches@gnu.org; Sat, 16 Jan 2021 09:35:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59381) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0mfO-0003vt-5A for guix-patches@gnu.org; Sat, 16 Jan 2021 09:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l0mfO-0004gC-26 for guix-patches@gnu.org; Sat, 16 Jan 2021 09:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Desktop (v5) References: In-Reply-To: Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jan 2021 14:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161080766917936 (code B ref 45889); Sat, 16 Jan 2021 14:35:02 +0000 Received: (at 45889) by debbugs.gnu.org; 16 Jan 2021 14:34:29 +0000 Received: from localhost ([127.0.0.1]:42694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0mel-0004f8-LN for submit@debbugs.gnu.org; Sat, 16 Jan 2021 09:34:29 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:42609) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0mei-0004en-4R for 45889@debbugs.gnu.org; Sat, 16 Jan 2021 09:34:22 -0500 X-Originating-IP: 76.68.120.100 Received: from [192.168.5.10] (bras-vprn-toroon474rw-lp130-08-76-68-120-100.dsl.bell.ca [76.68.120.100]) (Authenticated sender: rg@raghavgururajan.name) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 05606FF806 for <45889@debbugs.gnu.org>; Sat, 16 Jan 2021 14:34:12 +0000 (UTC) From: Raghav Gururajan Message-ID: <172c0f0e-d8c8-01e5-e8ec-8f73a64c63bf@raghavgururajan.name> Date: Sat, 16 Jan 2021 09:34:11 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.6.0 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From eebddbfb83bc58f05f8926deb197839c00133a33 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 15 Jan 2021 05:04:31 -0500 Subject: [PATCH 2/2] gnu: Add nextcloud-desktop. * gnu/packages/nextcloud.scm: New module. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/nextcloud.scm (nextcloud-desktop): New variable. --- gnu/local.mk | 1 + gnu/packages/nextcloud.scm | 148 +++++++++++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+) create mode 100644 gnu/packages/nextcloud.scm diff --git a/gnu/local.mk b/gnu/local.mk index 747cbb1da7..9c155fff73 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -398,6 +398,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/netpbm.scm \ %D%/packages/nettle.scm \ %D%/packages/networking.scm \ + %D%/packages/nextcloud.scm \ %D%/packages/nfs.scm \ %D%/packages/nickle.scm \ %D%/packages/nicotine.scm \ diff --git a/gnu/packages/nextcloud.scm b/gnu/packages/nextcloud.scm new file mode 100644 index 0000000000..abf33cdc6b --- /dev/null +++ b/gnu/packages/nextcloud.scm @@ -0,0 +1,148 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Raghav Gururajan +;;; +;;; 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 nextcloud) + #:use-module (gnu packages) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages documentation) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages graphviz) + #:use-module (gnu packages kde-frameworks) + #: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 sphinx) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages tls) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system qt)) + +(define-public nextcloud-desktop + (package + (name "nextcloud-desktop") + (version "3.1.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/nextcloud/desktop") + (commit + (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "022k7b3c30dymrjc1g3ly2cac1c34gkqnvjya6p7w2j3qw2w1dm2")))) + (build-system qt-build-system) + (arguments + `(#:configure-flags + (list + "-DUNIT_TESTING=ON") + #:imported-modules + (,@%qt-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules + ((guix build qt-build-system) + ((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-thirdparty + (lambda _ + (with-directory-excursion "src/3rdparty" + (for-each delete-file-recursively + ;; Keep QProgressIndicator, KMessageWidget + ;; QtLockedFile, Qtokenizer and QtSingleApplication, + ;; as they are not available in Guix. + ;; LibCrashReporter-Qt has it's own bundled 3rdparty stuff. + ;; SQLite is available in Guix. + (list + "libcrashreporter-qt" + "sqlite3"))) + #t)) + (add-after 'remove-thirdparty 'patch-plugin-dirs + (lambda* (#:key outputs #:allow-other-keys) + ;; Patch install directory for dbus service files. + (substitute* "shell_integration/libcloudproviders/CMakeLists.txt" + (("PKGCONFIG_GETVAR\\(dbus-1 session_bus_services_dir _install_dir\\)") + "set(_install_dir \"${CMAKE_INSTALL_PREFIX}/share/dbus-1/services\")")) + ;; Turn-off the use of absolute Qt paths for installation. + (substitute* "shell_integration/dolphin/CMakeLists.txt" + (("ON CACHE") + "OFF CACHE")) + #t)) + (add-before 'check 'pre-check + (lambda _ + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + #t)) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (native-inputs + `(("cmocka" ,cmocka) + ("dot" ,graphviz) + ("doxygen" ,doxygen) + ("extra-cmake-modules" ,extra-cmake-modules) + ("glib:bin" ,glib "bin") + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("qttools" ,qttools) + ("ruby" ,ruby))) + (inputs + `(("appstream" ,appstream) + ("glib" ,glib) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("kio" ,kio) + ("libcloudproviders" ,libcloudproviders) + ("openssl" ,openssl) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtkeychain" ,qtkeychain) + ("qtquickcontrols2" ,qtquickcontrols2) + ("qtsvg" ,qtsvg) + ("qtwebchannel" ,qtwebchannel) + ("qtwebkit" ,qtwebkit) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) + (propagated-inputs + `(("qtwebengine" ,qtwebengine))) + (synopsis "Desktop sync client for Nextcloud") + (description "Nextcloud-Desktop is a tool to synchronize files from +Nextcloud Server with your computer.") + (home-page "https://nextcloud.com/install/#install-clients") + (license + (list + ;; QtProgressIndicator + license:expat + ;; All ThirdParty (except QtProgressIndicator) + license:lgpl2.1+ + ;; Others + license:gpl2+)))) -- 2.30.0