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 KIghEEpWR2D1MwAA0tVLHw (envelope-from ) for ; Tue, 09 Mar 2021 11:04:42 +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 iB3gC0pWR2CMUQAAB5/wlQ (envelope-from ) for ; Tue, 09 Mar 2021 11:04:42 +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 D34852AFC8 for ; Tue, 9 Mar 2021 12:04:40 +0100 (CET) Received: from localhost ([::1]:52804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJaAI-00073K-S4 for larch@yhetil.org; Tue, 09 Mar 2021 06:04:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJZx8-0000Iy-Cr for guix-patches@gnu.org; Tue, 09 Mar 2021 05:51:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34184) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJZx7-0000Z1-WD for guix-patches@gnu.org; Tue, 09 Mar 2021 05:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJZx7-0004iM-Ra for guix-patches@gnu.org; Tue, 09 Mar 2021 05:51:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v16) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Mar 2021 10:51: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.161528705518111 (code B ref 45889); Tue, 09 Mar 2021 10:51:01 +0000 Received: (at 45889) by debbugs.gnu.org; 9 Mar 2021 10:50:55 +0000 Received: from localhost ([127.0.0.1]:45730 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJZwx-0004hx-1S for submit@debbugs.gnu.org; Tue, 09 Mar 2021 05:50:55 -0500 Received: from out2.migadu.com ([188.165.223.204]:59662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJZwt-0004hl-JO for 45889@debbugs.gnu.org; Tue, 09 Mar 2021 05:50:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615287045; 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=QkLSLBdPLauP1FjpKuCJzLJfkVkO5AN8AEV3voriyPw=; b=S7/AUyEFTc/yfKwKY9YLLiKI9PU9vRZAYdGWzDJ5nKQ4rMT+Zn3r529GR2SP3Yh7nYs8Zm Hikh63K6toejTSvew5PIBZKonVw3Lo5MBWKyk/wCw6OJ6OLSrom6+DjLi7/CiG0lNcAWeC UJaPARD4MwgI72ZV/UGP+DXmys7FEqcbtPh7t2CJpdwaRCfXbEAJqdpIqNJ1CSGPxQZjlt ZQfrYVm23AKWz0040GbBWI2aIiIMLfSCpx1fE7D0LJ9l69u7HSa2IogayVY8RcG/rPX+4o tnV2Ns0Yjrt86RaWLs21eClSeKWfnMJvlVoEiQi7U4nwdfqEtw2DdS1ubbDl0Q== References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@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> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> <31701971d849e72506ed4105c92b2ad85d3aa6be.camel@student.tugraz.at> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. Message-ID: Date: Tue, 9 Mar 2021 05:50:43 -0500 MIME-Version: 1.0 In-Reply-To: <31701971d849e72506ed4105c92b2ad85d3aa6be.camel@student.tugraz.at> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="KwggqOuXhmYzqi7ZvN8Y2qfBqhKSUE4DA" 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615287881; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=QkLSLBdPLauP1FjpKuCJzLJfkVkO5AN8AEV3voriyPw=; b=gOb0NQYwVGvszRXAIe/Wvt0ctcUYm0oFoTmMRZdaDUGblYRJVQnK1Pug906VN0l7S3Dg+k qKvAX16TQ4OGEq6KBhMFeXgr2u5+2w3+qW/YmZJxJR+p7jjASTeqvHiha5kNr3R+vigBAs RNxV8RlMK5zQLCcgIMnIytNz54ZGesvmi/JxGZm0mVfd7kP1i+4V13g9NZjXojX/Lwozxt swJt7QsyQ5/QzrXMHgF8MspxjoWSK7rDSKYbbCshLLeaLvRwA+0DIYDxAWcISHlNHRCvB9 n2zI8pdceH2OWZu1RanbobkwA3WePd20r4CUQNf9eSw8PIL3CFs0b1/LzWkVdg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615287881; a=rsa-sha256; cv=none; b=iI05eg1Vin5XPNZ9ycNML3o9MLCID21H1d4NtCkEcYvxZFrg1hvg4JYDe1tfwOs+/WTz8Z ibiPIIepqrYacQ7hjA0m7DUPvopgHJePGiPBoTxSYX8lNoA3I44rTxT5Xy6hRDFzrBPKcw +6wWLxR6PQPpqyOht13GnmVVSVl63NMrtvOVWDCjAhLRSiZYbKm2snVVisxSzDC0LdKypd JoDxvW/h+gmj2fzIcvlasVHiYL6W1l+RrZohcb6ldEkTVplkWJCgWKSRgg19+l7s3iQ0sf gRmftUeakg8xnjwmrvFJm1lPlgbuNQkClzkjxXKUzWmOnKLS2FSALPoapxOD2g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=raghavgururajan.name header.s=key1 header.b="S7/AUyEF"; 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-Spam-Score: -4.98 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=raghavgururajan.name header.s=key1 header.b="S7/AUyEF"; 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: D34852AFC8 X-Spam-Score: -4.98 X-Migadu-Scanner: scn0.migadu.com X-TUID: apvZYXeys+l0 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --KwggqOuXhmYzqi7ZvN8Y2qfBqhKSUE4DA Content-Type: multipart/mixed; boundary="vtnEEBVAsWbMhS8611HFrFZCIjdxFHwj8"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: Subject: Re: Nextcloud Client (v16) References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@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> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> <31701971d849e72506ed4105c92b2ad85d3aa6be.camel@student.tugraz.at> In-Reply-To: <31701971d849e72506ed4105c92b2ad85d3aa6be.camel@student.tugraz.at> --vtnEEBVAsWbMhS8611HFrFZCIjdxFHwj8 Content-Type: multipart/mixed; boundary="------------4A15F2C070C501CD9322F754" Content-Language: en-US This is a multi-part message in MIME format. --------------4A15F2C070C501CD9322F754 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! > Try not to arbitrarily use too many new lines. If you break Scheme > code in such a manner for no good reason, it will look odd. Done. > Why not to UTF-8? Done. > You should install the shared libraries in the install phase. Done. > Use '(...) for fixed input. Done. > I'm starting to grow a little suspicious about matching the leading > spaces. You probably want to lead this (and similar stuff in 0001) > with [ \t]*. Done. > LGTM, but probably deserves a comment. Done. > Definitely deserves a comment and perhaps a less broad match? Done the comment. I think this is perfect match. The mentioned libraries will get linked=20 wherever synclib gets linked. Also, this patch is compatible with=20 current master, which is different from this version. > Also deserves a comment about QtSingleApplication differences. Done. > Would the raw string here exceed a line? Yep! > This is now just qtokenizer, right? Changed. Please find the attached v16. Regards, RG. --------------4A15F2C070C501CD9322F754 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 daad8ffd22e8f000a1569ca45b415e28b4e20798 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 14 Jan 2021 23:32:27 -0500 Subject: [PATCH 1/3] 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..60fa080c9d 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" + (("[ \t]*g_test_add_func \\(\"/AppStream/PoolRead?.*;") + "") + (("[ \t]*g_test_add_func \\(\"/AppStream/PoolReadAsync?.*= ;") + "") + (("[ \t]*g_test_add_func \\(\"/AppStream/PoolEmpty?.*;") + "") + (("[ \t]*g_test_add_func \\(\"/AppStream/Cache?.*;") + "") + (("[ \t]*g_test_add_func \\(\"/AppStream/Merges?.*;") + "")) + #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 --------------4A15F2C070C501CD9322F754 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-Add-qtsolutions.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-Add-qtsolutions.patch" =46rom f17fadd96e03b7507aa8c6aed1054ef976ed3e45 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 9 Mar 2021 02:14:56 -0500 Subject: [PATCH 2/3] gnu: Add qtsolutions. * gnu/packages/qt.scm (qtsolutions): New variable. --- gnu/packages/qt.scm | 92 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 11e69ff5db..d5d4258f88 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -105,6 +105,98 @@ #:use-module (gnu packages xml) #:use-module (srfi srfi-1)) =20 +(define-public qtsolutions + (let ((commit "9568abd142d581b67b86a5f63d823a34b0612702") + (revision "53")) + (package + (name "qtsolutions") + (version + (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://code.qt.io/cgit/qt-solutions/qt-solutions") + (commit commit))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "17fnmassflm3vxi0krpr6fff368jy38cby31a48rban4nqqmgx7n"= )))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No target + #:imported-modules + ((guix build copy-build-system) + ,@%gnu-build-system-modules) + #:modules + (((guix build copy-build-system) + #:prefix copy:) + (guix build gnu-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key outputs #:allow-other-keys) + (substitute* (find-files "." "common.pri") + ;; Remove prefix in library names. + (("qt5") "qt") + ;; Remove suffix in library names. + (("-head") "")) + ;; Disable building of examples. + (substitute* (find-files "." "\\.pro$") + (("SUBDIRS\\+=3Dexamples") "")) + ;; Fix deprecated functions. + (substitute* "qtsoap/src/qtsoap.cpp" + (("toAscii") "toUtf8")) + #t)) + (replace 'configure + (lambda _ + (for-each (lambda (solution) + (with-directory-excursion solution + (invoke "./configure" "-library") + (invoke "qmake"))) + '("qtlockedfile" "qtpropertybrowser" "qtservice= " + "qtsingleapplication" "qtsoap")) + #t)) + (replace 'build + (lambda _ + (for-each (lambda (solution) + (with-directory-excursion solution + (invoke "make"))) + '("qtlockedfile" "qtpropertybrowser" "qtservice= " + "qtsingleapplication" "qtsoap")) + #t)) + (replace 'install + (lambda args + (for-each (lambda (solution) + (with-directory-excursion solution + (apply (assoc-ref copy:%standard-phases 'in= stall) + #:install-plan + `(("src" ,(string-append "include/" = solution) + #:include-regexp ("\\.h$")) + ("lib" "lib")) + args))) + '("qtlockedfile" "qtpropertybrowser" "qtservice= " + "qtsingleapplication" "qtsoap"))))))) + (inputs + `(("qtbase" ,qtbase))) + (synopsis "Qt Solutions") + (description "QtSolutions are set of components that extends Qt. +@itemize +@item QtLockedFile: A class that extends QFile with advisory locking fun= ctions. +@item QtPropertyBrowser: A framework that enables the user to edit a set= of +properties. +@item QtService: A component useful for developing Windows services and = Unix +daemons. +@item QtSingleApplication: A component that provides support for applica= tions +that can be only started once per user. +@item QtSoap: A component that provides basic web service support with v= ersion +1.1 of the SOAP protocol. +@end itemize\n") + (home-page "https://doc.qt.io/archives/qq/qq09-qt-solutions.html")= + (license license:lgpl2.1+)))) + (define-public qt5ct (package (name "qt5ct") --=20 2.30.1 --------------4A15F2C070C501CD9322F754 Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-Add-nextcloud-client.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0003-gnu-Add-nextcloud-client.patch" =46rom e52d1d8e4a602254c68be6739a18dedaf02d9ff2 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 9 Mar 2021 02:19:00 -0500 Subject: [PATCH 3/3] gnu: Add nextcloud-client. * gnu/packages/messaging.scm (nextcloud-client): New variable. --- gnu/packages/sync.scm | 160 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index d7c9009f3b..9aa7e9f866 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -30,6 +30,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) + #:use-module (guix build-system qt) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) @@ -42,8 +43,11 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages golang) + #:use-module (gnu packages graphviz) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages linux) @@ -52,15 +56,171 @@ #:use-module (gnu packages pcre) #: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 readline) #:use-module (gnu packages rsync) + #:use-module (gnu packages ruby) #:use-module (gnu packages selinux) #:use-module (gnu packages shells) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls)) =20 +(define-public nextcloud-client + (package + (name "nextcloud-client") + (version "3.1.3") + (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 "15ymk3gvfmgwzmqbhlw7jjy9y65ib3391h1dlmpll65iaj2miajk"))= + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + `(begin + ;; Not available in Guix. + (let* ((keep '("QProgressIndicator" "qtokenizer"))) + (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-source + (lambda* (#:key inputs outputs #:allow-other-keys) + (with-directory-excursion "src/gui" + (substitute* "CMakeLists.txt" + ;; Remove source references of deleted 3rdparties. + (("[ \t]*\\.\\./3rdparty/qtlockedfile/?.*\\.cpp") + "") + (("[ \t]*\\.\\./3rdparty/qtsingleapplication/?.*\\.cpp"= ) + "") + (("[ \t]*\\.\\./3rdparty/kmessagewidget/?.*\\.cpp") + "") + (("[ \t]*list\\(APPEND 3rdparty_SRC \\.\\./3rdparty/?.*= \\)") + "") + ;; Patch include references of deleted 3rdparties to in= puts. + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtlockedfile"= ) + (string-append (assoc-ref inputs "qtsolutions") + "/include/qtlockedfile/")) + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtsingleappli= cation") + (string-append (assoc-ref inputs "qtsolutions") + "/include/qtsingleapplication/")) + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/kmessagewidge= t") + (string-append (assoc-ref inputs "kwidgetsaddons") + "/include/KF5/KWidgetsAddons/")) + ;; Link libraries from inputs that were deleted in 3rdp= arty. + (("\\$\\{synclib_NAME\\}") + (string-append "${synclib_NAME} " + "QtSolutions_LockedFile " + "QtSolutions_SingleApplication " + "KF5WidgetsAddons"))) + ;; Fix compatibility with QtSingleApplication from QtSolu= tions. + (substitute* '("application.h" "application.cpp") + (("SharedTools::QtSingleApplication") + "QtSingleApplication") + (("slotParseMessage\\(const QString &(msg)?.*\\)") + "slotParseMessage(const QString &msg)"))) + #t)) + (add-after 'patch-source 'patch-cmake + (lambda* (#:key outputs #:allow-other-keys) + ;; Patch install directory for dbus service files. + (substitute* "shell_integration/libcloudproviders/CMakeList= s.txt" + (("PKGCONFIG_GETVAR\\(.+ _install_dir\\)") + (string-append "set(_install_dir \"${CMAKE_INSTALL_PREFI= X}" + "/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) + ("kwidgetsaddons" ,kwidgetsaddons) + ("libcloudproviders" ,libcloudproviders) + ("libzip" ,libzip) + ("openssl" ,openssl) + ("python-nautilus" ,python-nautilus) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtkeychain" ,qtkeychain) + ("qtquickcontrols2" ,qtquickcontrols2) + ("qtsolutions" ,qtsolutions) + ("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 + ;; Qtokenizer + license:lgpl2.1+ + ;; Others + license:gpl2+)))) + (define-public megacmd (package (name "megacmd") --=20 2.30.1 --------------4A15F2C070C501CD9322F754-- --vtnEEBVAsWbMhS8611HFrFZCIjdxFHwj8-- --KwggqOuXhmYzqi7ZvN8Y2qfBqhKSUE4DA Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYEdTAwUDAAAAAAAKCRBfWBZkf4vlUaTD AQDe3Qtl6XUdHJwDel/Vb/yH6CIEpJnyjK+UhO88iCijfgEA8R6ghBS5ZdnM4tTsqs0YJmfcVqTq 5QPJu58iBv9+RAY= =p16L -----END PGP SIGNATURE----- --KwggqOuXhmYzqi7ZvN8Y2qfBqhKSUE4DA--