From patchwork Sun Feb 21 18:09:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 27187 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 43C5327BC48; Sun, 21 Feb 2021 18:10:26 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,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 3CCB827BC49 for ; Sun, 21 Feb 2021 18:10:25 +0000 (GMT) Received: from localhost ([::1]:50324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lDtBY-0000fM-9T for patchwork@mira.cbaines.net; Sun, 21 Feb 2021 13:10:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDtBD-0000dd-8E for guix-patches@gnu.org; Sun, 21 Feb 2021 13:10:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43246) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lDtBC-0007sq-0H for guix-patches@gnu.org; Sun, 21 Feb 2021 13:10:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lDtBB-0002L0-Pv for guix-patches@gnu.org; Sun, 21 Feb 2021 13:10:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v11) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Feb 2021 18:10:01 +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: Leo Prikler , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.16139309668933 (code B ref 45889); Sun, 21 Feb 2021 18:10:01 +0000 Received: (at 45889) by debbugs.gnu.org; 21 Feb 2021 18:09:26 +0000 Received: from localhost ([127.0.0.1]:54792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDtAW-0002Jw-6z for submit@debbugs.gnu.org; Sun, 21 Feb 2021 13:09:25 -0500 Received: from out1.migadu.com ([91.121.223.63]:49164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDtAT-0002Jm-AE for 45889@debbugs.gnu.org; Sun, 21 Feb 2021 13:09:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1613930954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=A3AZM6+p+MwUZ3/zBASUF9jnHIcEjGp3h+9l2615rhc=; b=EVG0tWkiyRDLNR/lr0oOstmskMJEQJtIaMeMGjOODUxYZ+x/c4CpeD/k1PZk+0k+k32eNM PCNHodlyOtR2hgxNkWVjmNmG+AD8evfpIyu3uqryPC1QeQWcTqdcv4WZZimSaP3e36VulI EWPBiFcJY/QVEl8QNJLGXBgQ0AXdTgREpEO8q1ApYyUo3cYz+sdnlIL/ICrFCHOLdxvExI hYM3LGoGSFbzcxkwhQr1sX27dLMy+evUhjKY7JheZG2aju4FvGBj005sm6beOdgaK4E/kw xqCsooZGoa1z7jr5sRLsTp5Z7EXCu0/j/pmaZVhXqNdQy8tEJF0Ht0M3zbqx9w== References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> <8b239920351c99a887835c98fd9a3892b9cfd0f5.camel@student.tugraz.at> <3c07544c-97fe-88b1-2e80-ec5cfb87d4ec@raghavgururajan.name> <73f0495c29ee82c2a16a96cc2825f19bd88b4ab4.camel@student.tugraz.at> <8f88bef4-cf4d-5bcc-e0bb-979dc0ce1efd@raghavgururajan.name> <67f2ff73-c6e0-743f-d873-0a488fa05e31@raghavgururajan.name> <29553b60ceb47530cd0bda7f84badb80b8daab74.camel@student.tugraz.at> <7d1a2db6-5da9-80f6-d160-128d2200935b@raghavgururajan.name> <1c216cbfd761c8ce77b2402cf9a88ad8772b2331.camel@student.tugraz.at> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. Message-ID: <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> Date: Sun, 21 Feb 2021 13:09:12 -0500 MIME-Version: 1.0 In-Reply-To: <1c216cbfd761c8ce77b2402cf9a88ad8772b2331.camel@student.tugraz.at> X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches Hi Leo! > Looking at QtSingleApplication, the changes made by Nextcloud seem > rather cosmetic, so packaging the upstream version, which also had > "cosmetic" changes to it since their shared ancestor should not be an > issue. Ah Cool! I have attached v11. Regards, RG. From a6601db8975105332bfe322353ae045fff461928 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 15 Jan 2021 05:04:31 -0500 Subject: [PATCH 3/3] gnu: Add nextcloud-client. * gnu/packages/nextcloud.scm: New module. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/nextcloud.scm (nextcloud-client): New variable. --- gnu/local.mk | 1 + gnu/packages/nextcloud.scm | 158 +++++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 gnu/packages/nextcloud.scm diff --git a/gnu/local.mk b/gnu/local.mk index c3398c62fd..a9e0abe225 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..38b3ea5e8f --- /dev/null +++ b/gnu/packages/nextcloud.scm @@ -0,0 +1,158 @@ +;;; 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 python-xyz) + #: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-client + (package + (name "nextcloud-client") + (version "3.1.2") + (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 "10f9kmbn7s3hlkg1pv4kjflzh0159psrilci56kg4s2m49andhbs")) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + `(begin + (let ((keep '( ;; Not available in Guix. + "QProgressIndicator" + "kmessagewidget" "qtlockedfile" + "qtokenizer" "qtsingleapplication"))) + (with-directory-excursion "src/3rdparty" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep)))) + #t))))) + (build-system qt-build-system) + (arguments + `(#:configure-flags + (list + "-DUNIT_TESTING=ON" + ;; Upstream Bug: https://github.com/nextcloud/desktop/issues/2885 + "-DNO_SHIBBOLETH=ON") + #:imported-modules + ((guix build glib-or-gtk-build-system) + ,@%qt-build-system-modules) + #:modules + (((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:) + (guix build qt-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-plugin-dirs + (lambda* (#:key outputs #:allow-other-keys) + ;; Patch install directory for dbus service files. + (substitute* "shell_integration/libcloudproviders/CMakeLists.txt" + (("PKGCONFIG_GETVAR\\(.+ _install_dir\\)") + "set(_install_dir \"${CMAKE_INSTALL_PREFIX}/share/dbus-1/services\")")) + ;; Make sure, that Qt modules are installed under $prefix. + (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) + ("kjs" ,kjs) + ("libcloudproviders" ,libcloudproviders) + ("libzip" ,libzip) + ("openssl" ,openssl) + ("python-nautilus" ,python-nautilus) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtkeychain" ,qtkeychain) + ("qtquickcontrols2" ,qtquickcontrols2) + ("qtsvg" ,qtsvg) + ("qtwebchannel" ,qtwebchannel) + ("qtwebsockets" ,qtwebsockets) + ("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.1