From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UFLICHDNLmA5cQAA0tVLHw (envelope-from ) for ; Thu, 18 Feb 2021 20:26:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id kNOmBHDNLmDEfgAAB5/wlQ (envelope-from ) for ; Thu, 18 Feb 2021 20:26: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 03AD110D27 for ; Thu, 18 Feb 2021 21:26:23 +0100 (CET) Received: from localhost ([::1]:37324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCpsU-0006Ue-3A for larch@yhetil.org; Thu, 18 Feb 2021 15:26:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCpqE-0004J0-72 for guix-patches@gnu.org; Thu, 18 Feb 2021 15:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36537) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCpqD-0003nb-U4 for guix-patches@gnu.org; Thu, 18 Feb 2021 15:24:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lCpqD-0002Ff-PO for guix-patches@gnu.org; Thu, 18 Feb 2021 15:24:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v10) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Feb 2021 20:24: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.16136798248632 (code B ref 45889); Thu, 18 Feb 2021 20:24:01 +0000 Received: (at 45889) by debbugs.gnu.org; 18 Feb 2021 20:23:44 +0000 Received: from localhost ([127.0.0.1]:48083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lCppq-0002F4-U3 for submit@debbugs.gnu.org; Thu, 18 Feb 2021 15:23:44 -0500 Received: from out2.migadu.com ([188.165.223.204]:43096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lCppn-0002Es-2J for 45889@debbugs.gnu.org; Thu, 18 Feb 2021 15:23:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1613679812; 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=9Pk46BWGc7SJH7WibVJeimscvGAdH4fUHpbja2Bq5YM=; b=b8sDxjZ9EqOZM35NMF+Nke1h3dTlZPXYzNbTjTTxESP+NeEFEJUEnIngX6F+r56YSxXR2Y b6+PE971ZdDT5P0uSrHbcs0FiE01rDfL++W4Z7Q0oKmnTXOBP/sqjGKbHtPmdmIbBVdX0i +1TD4RLwsAVzzozh3fMOqjwO8eeKcfUP/NvU1jQrX+HtVItogGi+WPYragRjuJLsZui1+H ZpknO+I+gy/hlKSvbfwuf0lsGUQqBXby4I64ku5Tb87sHXuHcZAzrgYGsY5SQCF7lwAdCQ tUpMkjpHdZK2togUMydjPq1J4qs1I5Tg3fPBHODJsvjfvg4eiBc7bNE+9I7KJw== 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> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. Message-ID: <67f2ff73-c6e0-743f-d873-0a488fa05e31@raghavgururajan.name> Date: Thu, 18 Feb 2021 15:23:30 -0500 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="h42Wit21Hl4UQA7jTPSg3iNvzMLu0LjBN" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches From: Raghav Gururajan via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.97 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=raghavgururajan.name header.s=key1 header.b=b8sDxjZ9; dmarc=pass (policy=none) header.from=gnu.org; 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: 03AD110D27 X-Spam-Score: -4.97 X-Migadu-Scanner: scn1.migadu.com X-TUID: nhmgcZ4GVfi+ This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --h42Wit21Hl4UQA7jTPSg3iNvzMLu0LjBN Content-Type: multipart/mixed; boundary="GuWuSsViI6HK4dK9G3JWnFOhXamuOcuwe"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: <67f2ff73-c6e0-743f-d873-0a488fa05e31@raghavgururajan.name> Subject: Re: Nextcloud Client (v10) 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> In-Reply-To: --GuWuSsViI6HK4dK9G3JWnFOhXamuOcuwe Content-Type: multipart/mixed; boundary="------------B375EDB9F860740A6263A48E" Content-Language: en-US This is a multi-part message in MIME format. --------------B375EDB9F860740A6263A48E Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! > Interesting. Is this due to CMakeLists picking up, that they're > missing and not replacing them with core stuff? >=20 > Perhaps you can patch the CMakeLists to add such support? > Alternatively, you might want to delete them and unpack the upstream > ones to their locations. I have asked upstream and they are looking into providing options to use = distribution packages.=20 https://github.com/nextcloud/desktop/issues/2929#issuecomment-780548919 So once they update the source in the next-release, I will update the=20 package and remove the 3rdparty directory completely. :-) > Note, that you're missing a space here. This would also match > PKGCONFIG_GETVAR(pkg var foobar_install_dir). Changed in v10. V10 is attached. Regards, RG. --------------B375EDB9F860740A6263A48E Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-Add-appstream.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-appstream.patch" =46rom bd8daa06c1d956e472e40b889e4724f13a0ad2cd 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 e00454f7b3..bccd8e9b00 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)) =20 +(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-xm= l") + "/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_poo= l_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 t= o build +software-center applications, by providing metadata necessary for an +application-centric view on package repositories. It additionally provi= des +specifications for things like an unified software metadata database, sc= reenshot +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") --=20 2.30.1 --------------B375EDB9F860740A6263A48E Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-Add-nextcloud-client.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-Add-nextcloud-client.patch" =46rom 77584aedececd4f0e364c4a5673594fb8c113937 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-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 =3D \ %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 =C2=A9 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 (a= t +;;; 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=3D? + (scandir ".") + (cons* "." ".." keep)))) + #t))))) + (build-system qt-build-system) + (arguments + `(#:configure-flags + (list + "-DUNIT_TESTING=3DON" + ;; Upstream Bug: https://github.com/nextcloud/desktop/issues/288= 5 + "-DNO_SHIBBOLETH=3DON") + #: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/CMakeList= s.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+)))) --=20 2.30.1 --------------B375EDB9F860740A6263A48E-- --GuWuSsViI6HK4dK9G3JWnFOhXamuOcuwe-- --h42Wit21Hl4UQA7jTPSg3iNvzMLu0LjBN Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYC7MwgUDAAAAAAAKCRBfWBZkf4vlUYpj AQCA9F2XTzNjLEAPI9v5ghKfUrsnlV1oxS2YdjCgLGsizwEA9Uvj7iT5If0m4qWRWJ4dAMjMwaIu N8180ZAHv/GeXgU= =5yWP -----END PGP SIGNATURE----- --h42Wit21Hl4UQA7jTPSg3iNvzMLu0LjBN--