From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id AKyJFUylAmCEHQAA0tVLHw (envelope-from ) for ; Sat, 16 Jan 2021 08:35:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id uCZREUylAmAgSgAAbx9fmQ (envelope-from ) for ; Sat, 16 Jan 2021 08:35:24 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4B0D594030E for ; Sat, 16 Jan 2021 08:35:23 +0000 (UTC) Received: from localhost ([::1]:41116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0h3J-00020A-J2 for larch@yhetil.org; Sat, 16 Jan 2021 03:35:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0h30-0001zr-NA for guix-patches@gnu.org; Sat, 16 Jan 2021 03:35:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59058) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0h30-0001HK-Ey for guix-patches@gnu.org; Sat, 16 Jan 2021 03:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l0h30-0001z6-B8 for guix-patches@gnu.org; Sat, 16 Jan 2021 03:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Desktop (v3) References: In-Reply-To: Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jan 2021 08: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.16107860577569 (code B ref 45889); Sat, 16 Jan 2021 08:35:02 +0000 Received: (at 45889) by debbugs.gnu.org; 16 Jan 2021 08:34:17 +0000 Received: from localhost ([127.0.0.1]:42371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0h2B-0001xv-3e for submit@debbugs.gnu.org; Sat, 16 Jan 2021 03:34:17 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:57453) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0h26-0001xM-Qr for 45889@debbugs.gnu.org; Sat, 16 Jan 2021 03:34:09 -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 relay4-d.mail.gandi.net (Postfix) with ESMTPSA id E177BE000C for <45889@debbugs.gnu.org>; Sat, 16 Jan 2021 08:33:59 +0000 (UTC) From: Raghav Gururajan Message-ID: <459601fa-c064-9eb0-2796-f4882bf6ac1a@raghavgururajan.name> Date: Sat, 16 Jan 2021 03:33:57 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.6.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------85D011E4F7A0FB06AC8F26A4" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -0.86 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 4B0D594030E X-Spam-Score: -0.86 X-Migadu-Scanner: scn1.migadu.com X-TUID: vn5zGa2DfnrO This is a multi-part message in MIME format. --------------85D011E4F7A0FB06AC8F26A4 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit --------------85D011E4F7A0FB06AC8F26A4 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-Add-appstream.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-gnu-Add-appstream.patch" >From 61c8855b31df21363a92e8b2bbf5d70ab977d874 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 14 Jan 2021 23:32:27 -0500 Subject: [PATCH 1/2] gnu: Add appstream. * gnu/packages/freedesktop.scm (appstream): New variable. --- gnu/packages/freedesktop.scm | 96 ++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6dd37005ae..a65cc9bd90 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -58,8 +58,10 @@ #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cryptsetup) + #:use-module (gnu packages databases) #:use-module (gnu packages disk) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) @@ -75,6 +77,7 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages language) #:use-module (gnu packages libffi) #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) @@ -101,6 +104,99 @@ #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) +(define-public appstream + (package + (name "appstream") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri + (string-append "https://www.freedesktop.org/software/" + "appstream/releases/" + "AppStream-" version ".tar.xz")) + (sha256 + (base32 "09l6ixz1w29pi0nb0flz14m4r3f2hpqpp1fq8y66v9xa4c9fczds")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-libstemmer + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "meson.build" + (("/usr/include") + (string-append (assoc-ref inputs "libstemmer") + "/include"))) + #t)) + (add-after 'patch-libstemmer 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/api" + (substitute* "appstream-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml-4.3") + "/xml/dtd/docbook/")))) + (for-each (lambda (file) + (substitute* file + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + (find-files "scripts/desc" "\\.xml$")) + #t)) + (add-after 'patch-docbook-xml 'disable-failing-tests + (lambda _ + (substitute* "tests/test-pool.c" + ((" g_test_add_func \\(\"/AppStream/PoolRead\", test_pool_read\\);") + "") + ((" g_test_add_func \\(\"/AppStream/PoolReadAsync\", test_pool_read_async\\);") + "") + ((" g_test_add_func \\(\"/AppStream/PoolEmpty\", test_pool_empty\\);") + "") + ((" g_test_add_func \\(\"/AppStream/Cache\", test_cache\\);") + "") + ((" g_test_add_func \\(\"/AppStream/Merges\", test_merge_components\\);") + "")) + #t)) + (add-after 'disable-failing-tests 'patch-install-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "data/meson.build" + (("/etc") + (string-append (assoc-ref outputs "out") + "/etc"))) + #t))))) + (native-inputs + `(("cmake" ,cmake) + ("docbook-xml-4.3" ,docbook-xml-4.3) + ("docbook-xml" ,docbook-xml) + ("docbook-xsl" ,docbook-xsl) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gperf" ,gperf) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("xsltproc" ,libxslt))) + (inputs + `(("libsoup" ,libsoup) + ("libstemmer" ,libstemmer) + ("libxml2" ,libxml2) + ("libyaml" ,libyaml) + ("lmdb" ,lmdb))) + (propagated-inputs + `(("glib" ,glib))) + (synopsis "Tools and libraries to work with AppStream metadata") + (description "AppStream is a cross-distribution effort for enhancing the way +we interact with the software repositories provided by distributions by +standardizing software component metadata. It provides the foundation to build +software-center applications, by providing metadata necessary for an +application-centric view on package repositories. It additionally provides +specifications for things like an unified software metadata database, screenshot +services and various other things needed to create user-friendly +application-centers for distributions.") + (home-page "https://www.freedesktop.org/wiki/Distributions/AppStream/") + (license license:gpl2+))) + (define-public farstream (package (name "farstream") -- 2.30.0 --------------85D011E4F7A0FB06AC8F26A4 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-Add-nextcloud-desktop.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0002-gnu-Add-nextcloud-desktop.patch" >From b2937fe6c61cab1fc900ba786129c458cee5bb3c 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 | 135 +++++++++++++++++++++++++++++++++++++ 2 files changed, 136 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..594392605b --- /dev/null +++ b/gnu/packages/nextcloud.scm @@ -0,0 +1,135 @@ +;;; 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.git") + (commit + (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1ba9z1kv3wlrmaxsn442vn0inzbd0smvq4xkavarn1h8i0dm62hb")))) + (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 + (list + "libcrashreporter-qt" + "sqlite3"))) + #t)) + (add-after 'remove-thirdparty 'patch-plugin-dirs + (lambda* (#:key outputs #:allow-other-keys) + (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\")")) + (substitute* "shell_integration/dolphin/CMakeLists.txt" + (("ON CACHE") + "OFF CACHE")) + #t)) + (add-before 'check 'pre-check + (lambda _ + (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) + ("sphinx" ,python-sphinx))) + (inputs + `(("appstream" ,appstream) + ("dbus" ,dbus) + ("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 license:gpl2+))) -- 2.30.0 --------------85D011E4F7A0FB06AC8F26A4--