From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Desktop Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Jan 2021 10:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 45889@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16107053902839 (code B ref -1); Fri, 15 Jan 2021 10:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jan 2021 10:09:50 +0000 Received: from localhost ([127.0.0.1]:39937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0M36-0000jW-0X for submit@debbugs.gnu.org; Fri, 15 Jan 2021 05:09:50 -0500 Received: from lists.gnu.org ([209.51.188.17]:38804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0M32-0000jN-Dw for submit@debbugs.gnu.org; Fri, 15 Jan 2021 05:09:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0M32-0003nY-9R for guix-patches@gnu.org; Fri, 15 Jan 2021 05:09:40 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:34147) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0M2z-0000w1-5N for guix-patches@gnu.org; Fri, 15 Jan 2021 05:09:40 -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 25E9DFF81B for ; Fri, 15 Jan 2021 10:09:32 +0000 (UTC) From: Raghav Gururajan Message-ID: Date: Fri, 15 Jan 2021 05:09:31 -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="------------0E158249476BFC847837A61B" Content-Language: en-US Received-SPF: pass client-ip=217.70.183.199; envelope-from=rg@raghavgururajan.name; helo=relay9-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) This is a multi-part message in MIME format. --------------0E158249476BFC847837A61B Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Hello Guix! Please find the attached patch-set to add Nextcloud desktop application to guix. Regards, RG. --------------0E158249476BFC847837A61B 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 --------------0E158249476BFC847837A61B 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 aa2f1809b0d7250d10086211cd23a6e5a4e86d94 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 | 145 +++++++++++++++++++++++++++++++++++++ 2 files changed, 146 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..e8280feace --- /dev/null +++ b/gnu/packages/nextcloud.scm @@ -0,0 +1,145 @@ +;;; 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") + (("\\$\\{KDE_INSTALL_KSERVICES5DIR\\}") + (string-append + (assoc-ref outputs "out") + "/lib/qt5/plugins")) + (("\\$\\{KDE_INSTALL_PLUGINDIR\\}") + (string-append + (assoc-ref outputs "out") + "/lib/qt5/plugins"))) + #t)) + (add-before 'build 'gate + (lambda _ + #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) + ("qtwebengine" ,qtwebengine) + ("qtwebkit" ,qtwebkit) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) + (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 --------------0E158249476BFC847837A61B-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Desktop (v2) References: In-Reply-To: Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jan 2021 06:42: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.161077926221794 (code B ref 45889); Sat, 16 Jan 2021 06:42:02 +0000 Received: (at 45889) by debbugs.gnu.org; 16 Jan 2021 06:41:02 +0000 Received: from localhost ([127.0.0.1]:42296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0fGa-0005f4-2M for submit@debbugs.gnu.org; Sat, 16 Jan 2021 01:41:02 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:56735) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0fGX-0005ep-3V for 45889@debbugs.gnu.org; Sat, 16 Jan 2021 01:40:54 -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 relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 0C0F320003 for <45889@debbugs.gnu.org>; Sat, 16 Jan 2021 06:40:45 +0000 (UTC) From: Raghav Gururajan Message-ID: Date: Sat, 16 Jan 2021 01:40:44 -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="------------3BA214658031B52CA47CFD27" Content-Language: en-US X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------3BA214658031B52CA47CFD27 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit --------------3BA214658031B52CA47CFD27 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 --------------3BA214658031B52CA47CFD27 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 4346ce4e708876e2951987c5284c8579c1ccdc2f 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 | 146 +++++++++++++++++++++++++++++++++++++ 2 files changed, 147 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..8ab1a5393f --- /dev/null +++ b/gnu/packages/nextcloud.scm @@ -0,0 +1,146 @@ +;;; 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") + (("\\$\\{KDE_INSTALL_KSERVICES5DIR\\}") + (string-append + (assoc-ref outputs "out") + "/lib/qt5/plugins")) + (("\\$\\{KDE_INSTALL_PLUGINDIR\\}") + (string-append + (assoc-ref outputs "out") + "/lib/qt5/plugins"))) + #t)) + (add-before 'build 'gate + (lambda _ + #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 --------------3BA214658031B52CA47CFD27-- From unknown Sat Aug 16 18:44:36 2025 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-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Desktop (v4) References: In-Reply-To: Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jan 2021 10:10: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.161079178016478 (code B ref 45889); Sat, 16 Jan 2021 10:10:02 +0000 Received: (at 45889) by debbugs.gnu.org; 16 Jan 2021 10:09:40 +0000 Received: from localhost ([127.0.0.1]:42436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0iWU-0004Hc-6f for submit@debbugs.gnu.org; Sat, 16 Jan 2021 05:09:40 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:43113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0iWP-0004HL-8s for 45889@debbugs.gnu.org; Sat, 16 Jan 2021 05:09:32 -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 relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 747FF60007 for <45889@debbugs.gnu.org>; Sat, 16 Jan 2021 10:09:21 +0000 (UTC) From: Raghav Gururajan Message-ID: Date: Sat, 16 Jan 2021 05:09:20 -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="------------E464AC8D105E83F645B7A4C2" Content-Language: en-US X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------E464AC8D105E83F645B7A4C2 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit --------------E464AC8D105E83F645B7A4C2 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 --------------E464AC8D105E83F645B7A4C2 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 b45173115d454b635d24952236d740bb3e28bdc6 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 | 134 +++++++++++++++++++++++++++++++++++++ 2 files changed, 135 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..355bf3e930 --- /dev/null +++ b/gnu/packages/nextcloud.scm @@ -0,0 +1,134 @@ +;;; 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) + ("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 --------------E464AC8D105E83F645B7A4C2-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Desktop (v4) Resent-From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jan 2021 10:49: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: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161079411020240 (code B ref 45889); Sat, 16 Jan 2021 10:49:01 +0000 Received: (at 45889) by debbugs.gnu.org; 16 Jan 2021 10:48:30 +0000 Received: from localhost ([127.0.0.1]:42455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0j89-0005GO-O2 for submit@debbugs.gnu.org; Sat, 16 Jan 2021 05:48:30 -0500 Received: from mail-wr1-f41.google.com ([209.85.221.41]:41658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0j84-0005G5-1w for 45889@debbugs.gnu.org; Sat, 16 Jan 2021 05:48:27 -0500 Received: by mail-wr1-f41.google.com with SMTP id a12so11707157wrv.8 for <45889@debbugs.gnu.org>; Sat, 16 Jan 2021 02:48:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:in-reply-to:references:date:message-id:mime-version; bh=16XF/7+MaCnjkLtAnlpcv08arM6atqrIuT6nwsOj3bs=; b=JIaiaUCTvs42hT3bHKPymBfC41IcqPdGWfaYr9UzDEDSR0935W4KtLABos3aAg4w4a D/que5y5x6hLEKDJ4PlSbOcikEmBjU7qs7Jmk3fr56wkZ2qG0CytaYpo+5506Q2Pm4NX 3wYSJUtHmPB9que0WrIqflQ8LDVv02fygiMzgywXSWheqN9j4/K4gMi+Axb9EKP0xBc/ Gq5GKRucddxZV2u8hKviNFlLqPjeNEdSnOw2qddzMKIoFX6PCTNs97+XE9xIVx5MoYFn C3IXBwBFP2SBBLImPaQkqyBlmhlO/P+v7eO9pD3qvv1/NVJgv9Ww9YxH6desSwyu/8xj yVtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:in-reply-to:references:date :message-id:mime-version; bh=16XF/7+MaCnjkLtAnlpcv08arM6atqrIuT6nwsOj3bs=; b=mkYGy+SerfrvauhAXe7Ofxu8wE8pTBoJzSyHDGKP9DpvVGLtj0d0zZKQp6t04oWmKN 75kqQUCeac5iQOWn6OMlTsKPrTMLQpTsw7OUfu4TY4mlejMY2YC3AEvDEkoUgwxd+XnB ZMRdlCER5XIRqi8HZmPaEs5HdibE9/Lcn4U7gglPpRu/qOC79CYP+iWwKT5WaXh6ERAV rXJb/tNv5meZgSYSf+4R1Suva+/2QQgCvEApYuYtj+y+movo/Tc2Qh4lyqBaV5u6ESVI zsOoY4LwR9KqwYelRmOHcqR7yGmaxs7QcAC8r2Sgk5DClnxD8Y08OUEEzdVN7jnn619d Iotw== X-Gm-Message-State: AOAM533ZupDF88LzE6Mt5r+XZhNciowbPdivT3TNt4LoSf0mET4BJ6IF 9uu1wotebSj34vXpbH4LOJUIi5Y4Gz0= X-Google-Smtp-Source: ABdhPJzi3PY7Su+KVP8qmcr3vU3dznPEng7azRUb/Ol0KNKKE8eGQXX/uznNYOKV137MCcNYuobe6A== X-Received: by 2002:adf:f344:: with SMTP id e4mr17472304wrp.25.1610794098093; Sat, 16 Jan 2021 02:48:18 -0800 (PST) Received: from guixSD (host-95-244-15-108.retail.telecomitalia.it. [95.244.15.108]) by smtp.gmail.com with ESMTPSA id y6sm17754802wrp.6.2021.01.16.02.48.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jan 2021 02:48:17 -0800 (PST) From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti In-Reply-To: References: Date: Sat, 16 Jan 2021 11:48:16 +0100 Message-ID: <87o8hp6tu7.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Raghav Gururajan writes: Hi! > Please find the attached patch-set to add Nextcloud desktop application > to guix. I usually don't do patch review, so don't weight too much my comments. Why is it placed inside a new module? It should fit nicely in sync.scm > + (url "https://github.com/nextcloud/desktop.git") .git shouldn't be needed > + (base32 "1ba9z1kv3wlrmaxsn442vn0inzbd0smvq4xkavarn1h8i0dm62hb")))) This hash is wrong, I get 022k7b3c30dymrjc1g3ly2cac1c34gkqnvjya6p7w2j3qw2w1dm2 > + (with-directory-excursion "src/3rdparty" > + (for-each delete-file-recursively > + (list > + "libcrashreporter-qt" > + "sqlite3"))) This can be expressed in terms of what you you are keeping instead. Something along the line of: (let ((preserved-3rdparty-files '("QProgressIndicator" "qtlockedfile" "qtokenizer" "qtsingleapplication" "kmessagewidget"))) (with-directory-excursion "src/3rdparty" (for-each (lambda (directory) (simple-format #t "deleting: ~A\n" directory) (delete-file-recursively directory)) (lset-difference string=? (scandir ".") (cons* "." ".." preserved-3rdparty-files)))) #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\\)") This line is too long, you can use something like ("PKGCONFIG_GETVAR\\(.*") instead. > + "set(_install_dir> \"${CMAKE_INSTALL_PREFIX}/share/dbus-1/services\")")) Other long line, maybe string-append. > + (substitute* "shell_integration/dolphin/CMakeLists.txt" > + (("ON CACHE") > + "OFF CACHE")) > + #t)) Why? > + (add-before 'check 'pre-check > + (lambda _ > + (setenv "HOME" (getcwd)) > + #t)) It's missing a comment on why this is needed (like qttest tries to create $HOME/.qttest/config/autostart/) > + (license license:gpl2+))) Unbundled dependencies have different licenses QprogressIndicator is under expat while others lgpl2.1+ if I'm not wrong Also, I tried removing ruby and python-sphinx from the dependencies and it did build fine, so be sure all of them are needed (or are they used for some optional feature?). Thanks From unknown Sat Aug 16 18:44:36 2025 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-Type: multipart/mixed; boundary="------------A889195AFCE612C5B4C5A0A1" Content-Language: en-US X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------A889195AFCE612C5B4C5A0A1 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit --------------A889195AFCE612C5B4C5A0A1 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 --------------A889195AFCE612C5B4C5A0A1 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 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 --------------A889195AFCE612C5B4C5A0A1-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Desktop (v4) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jan 2021 14:43: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: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161080814118724 (code B ref 45889); Sat, 16 Jan 2021 14:43:01 +0000 Received: (at 45889) by debbugs.gnu.org; 16 Jan 2021 14:42:21 +0000 Received: from localhost ([127.0.0.1]:42700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0mmT-0004rw-Dg for submit@debbugs.gnu.org; Sat, 16 Jan 2021 09:42:21 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:54491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0mmR-0004rg-Br for 45889@debbugs.gnu.org; Sat, 16 Jan 2021 09:42:19 -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 relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 4D6F360006; Sat, 16 Jan 2021 14:42:11 +0000 (UTC) References: <87o8hp6tu7.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> From: Raghav Gururajan Message-ID: <0ac1a1a7-825a-0737-268f-b41502db0045@raghavgururajan.name> Date: Sat, 16 Jan 2021 09:42:10 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.6.0 MIME-Version: 1.0 In-Reply-To: <87o8hp6tu7.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Nicolò! > Why is it placed inside a new module? It should fit nicely in sync.scm Nextcloud is a big project. There will be other packages like server, plugins etc., which can then be added to this module. Concept is similar to linphone.scm. > .git shouldn't be needed Updated in v5. > This hash is wrong, I get 022k7b3c30dymrjc1g3ly2cac1c34gkqnvjya6p7w2j3qw2w1dm2 Updated in v5. > Something along the line of: > > (let ((preserved-3rdparty-files > '("QProgressIndicator" "qtlockedfile" "qtokenizer" > "qtsingleapplication" "kmessagewidget"))) > (with-directory-excursion "src/3rdparty" > (for-each > (lambda (directory) > (simple-format #t "deleting: ~A\n" directory) > (delete-file-recursively directory)) > (lset-difference string=? > (scandir ".") > (cons* "." ".." preserved-3rdparty-files)))) > #t) The snippet didn't work, but I added comments in v5. > This line is too long, you can use something like > ("PKGCONFIG_GETVAR\\(.*") instead. If I use this, it causes parsing error. > Other long line, maybe string-append. Ah, I have been advised before not to break lines like this via string-append. > Why? Added comments in v5. > It's missing a comment on why this is needed (like qttest tries to create > $HOME/.qttest/config/autostart/) >> + (license license:gpl2+))) Added comments in v5. > Unbundled dependencies have different licenses > QprogressIndicator is under expat while others lgpl2.1+ if I'm not wrong Updated in v5. > Also, I tried removing ruby and python-sphinx from the dependencies and > it did build fine, so be sure all of them are needed (or are they used > for some optional feature?). Ruby is for patch-shebangs phase. Sphinx was looked for during configure phase, but doesn't seem to do anything, so I removed it in v5. Thanks so much for the review. :-) Regards, RG. From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v6) References: In-Reply-To: Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Jan 2021 14:45: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: 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.16108946718197 (code B ref 45889); Sun, 17 Jan 2021 14:45:01 +0000 Received: (at 45889) by debbugs.gnu.org; 17 Jan 2021 14:44:31 +0000 Received: from localhost ([127.0.0.1]:44701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l19I1-00027w-DD for submit@debbugs.gnu.org; Sun, 17 Jan 2021 09:44:31 -0500 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:45829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l19Hz-00027g-8R for 45889@debbugs.gnu.org; Sun, 17 Jan 2021 09:44:24 -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 relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 6BF52C0002 for <45889@debbugs.gnu.org>; Sun, 17 Jan 2021 14:44:15 +0000 (UTC) From: Raghav Gururajan Message-ID: <7d0357f6-4913-7c4d-1bfb-7af562c4041f@raghavgururajan.name> Date: Sun, 17 Jan 2021 09:44:14 -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="------------B645B3AF7C56C1694DF48BBE" Content-Language: en-US X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------B645B3AF7C56C1694DF48BBE Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit --------------B645B3AF7C56C1694DF48BBE Content-Type: text/x-patch; charset=UTF-8; name="0015-gnu-Add-nextcloud-client.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0015-gnu-Add-nextcloud-client.patch" >From 0f643d59bd13b07175dce772d922f216456d9025 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 15 Jan 2021 05:04:31 -0500 Subject: [PATCH 15/15] 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 | 149 +++++++++++++++++++++++++++++++++++++ 2 files changed, 150 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..1f0906470e --- /dev/null +++ b/gnu/packages/nextcloud.scm @@ -0,0 +1,149 @@ +;;; 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-client + (package + (name "nextcloud-client") + (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")) + (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") + #: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 '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 --------------B645B3AF7C56C1694DF48BBE Content-Type: text/x-patch; charset=UTF-8; name="0014-gnu-Add-appstream.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0014-gnu-Add-appstream.patch" >From 4865aa2f435817a0cbcaddf1c75459894a63bb82 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 14 Jan 2021 23:32:27 -0500 Subject: [PATCH 14/15] 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 --------------B645B3AF7C56C1694DF48BBE-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 18 04:39:21 2021 Received: (at control) by debbugs.gnu.org; 18 Jan 2021 09:39:21 +0000 Received: from localhost ([127.0.0.1]:46368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1R0L-0002IY-D8 for submit@debbugs.gnu.org; Mon, 18 Jan 2021 04:39:21 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:50463) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1R0G-0002IF-2i for control@debbugs.gnu.org; Mon, 18 Jan 2021 04:39:19 -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 F23EAE000D for ; Mon, 18 Jan 2021 09:39:08 +0000 (UTC) To: control@debbugs.gnu.org From: Raghav Gururajan Subject: Nextcloud Client Message-ID: Date: Mon, 18 Jan 2021 04:39:07 -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: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) retitle 45889 Nextcloud Client From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v6) Resent-From: david larsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Jan 2021 18:46: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: Raghav Gururajan Cc: Guix-patches , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.16115139226139 (code B ref 45889); Sun, 24 Jan 2021 18:46:02 +0000 Received: (at 45889) by debbugs.gnu.org; 24 Jan 2021 18:45:22 +0000 Received: from localhost ([127.0.0.1]:37251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3kO1-0001ax-RI for submit@debbugs.gnu.org; Sun, 24 Jan 2021 13:45:22 -0500 Received: from server0.selfhosted.xyz ([217.64.149.7]:54772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3kO0-0001ah-8W for 45889@debbugs.gnu.org; Sun, 24 Jan 2021 13:45:20 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1611513914; bh=FDx9yq+tDWVbaZvGdlaaU8v0FafqBgoZIdQ2ILg3uZg=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=FzAwOJ2mD0zk/7qWioug0zcX4/kOEGWrRPiUPIDI8BkEVJsRiAq4NUCSBu9ICTKYB XchGfgDme+77Tg95c/NxnZxRAdx/pUwPVPmHNs/WLZVxQmf7BDSDeX7PMrI0Blkuqn XXg4codtRSf+C0pwZmkb4JyZVBVBd1Zt39r3uKtOjKq0dAM65fZ29IdnU640/eXtER VwcKD6phG1c3komBS3S7+2t7OL3gVAkLiAtPOsyXlnAlEkG9KO5gfgPQ5Ip4m2F4Ed KDa/0OWsA+I4ev803vhBb1Tuuc5HUv8NHjUl2ogi34+hg5tDVEgHg1UvAnUh9/rlPh U1bU8b0Tpwm1A== X-Fuglu-Suspect: 051cf7868e7a457899f89978cb3fde54 X-Fuglu-Spamstatus: NO Received: from [127.0.0.1] (localhost [127.0.0.1]) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sun, 24 Jan 2021 19:45:08 +0100 From: david larsson In-Reply-To: <7d0357f6-4913-7c4d-1bfb-7af562c4041f@raghavgururajan.name> References: <7d0357f6-4913-7c4d-1bfb-7af562c4041f@raghavgururajan.name> Message-ID: <9f96608f9d5c992a4c31dee90139e7e9@selfhosted.xyz> X-Sender: david.larsson@selfhosted.xyz X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) On 2021-01-17 15:44, Raghav Gururajan wrote: > Hi, Thank you for working on this! I have tried to package this myself but haven't much success beyond being able to login and sync things and to receive notifications via libnotify. However, this patch also doesn't succeeed in a fully functional nextcloud-desktop, yet - though I hope you do succeed! I tried this out, and started it with --log-window (or similar) and it complained about qt-graphical-effect, so I suggest you add it to propagated-inputs to have that error go away. And as a general tip - start nextcloud-desktop with the log-window flag. I wish you best of luck in completing it! Best regards, David From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v6) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Feb 2021 15:09: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: david larsson Cc: Guix-patches , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161219208326137 (code B ref 45889); Mon, 01 Feb 2021 15:09:01 +0000 Received: (at 45889) by debbugs.gnu.org; 1 Feb 2021 15:08:03 +0000 Received: from localhost ([127.0.0.1]:32868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6ao6-0006nV-HM for submit@debbugs.gnu.org; Mon, 01 Feb 2021 10:08:03 -0500 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:42969) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6ao4-0006n0-Ax for 45889@debbugs.gnu.org; Mon, 01 Feb 2021 10:08:00 -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 relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 883CCC0007; Mon, 1 Feb 2021 15:07:50 +0000 (UTC) References: <7d0357f6-4913-7c4d-1bfb-7af562c4041f@raghavgururajan.name> <9f96608f9d5c992a4c31dee90139e7e9@selfhosted.xyz> From: Raghav Gururajan Message-ID: <6fed2af8-4ca6-9269-2c99-10999a1dde46@raghavgururajan.name> Date: Mon, 1 Feb 2021 10:07:47 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.6.1 MIME-Version: 1.0 In-Reply-To: <9f96608f9d5c992a4c31dee90139e7e9@selfhosted.xyz> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="v5oABcrNf7jqKi0HEn8zOoGkuJuIKOAqs" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --v5oABcrNf7jqKi0HEn8zOoGkuJuIKOAqs Content-Type: multipart/mixed; boundary="y3WaFSpPcc3mH7XHAKOdoeWSxlLmXxv9x"; protected-headers="v1" From: Raghav Gururajan To: david larsson Cc: 45889@debbugs.gnu.org, Guix-patches Message-ID: <6fed2af8-4ca6-9269-2c99-10999a1dde46@raghavgururajan.name> Subject: Re: [bug#45889] Nextcloud Client (v6) References: <7d0357f6-4913-7c4d-1bfb-7af562c4041f@raghavgururajan.name> <9f96608f9d5c992a4c31dee90139e7e9@selfhosted.xyz> In-Reply-To: <9f96608f9d5c992a4c31dee90139e7e9@selfhosted.xyz> --y3WaFSpPcc3mH7XHAKOdoeWSxlLmXxv9x Content-Type: multipart/mixed; boundary="------------BA38CBB9A08266F61F96CFA1" Content-Language: en-US This is a multi-part message in MIME format. --------------BA38CBB9A08266F61F96CFA1 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi David! > Thank you for working on this! I have tried to package this myself but = > haven't much success beyond being able to login and sync things and to = > receive notifications via libnotify. However, this patch also doesn't=20 > succeeed in a fully functional nextcloud-desktop, yet - though I hope=20 > you do succeed! I can confirm that this patch-set is functional. I haven't faced any=20 issues. Please let me know which function(s) didn't work for you. I'll=20 look into them. :-) > I tried this out, and started it with --log-window (or similar) and it = > complained about qt-graphical-effect, so I suggest you add it to=20 > propagated-inputs to have that error go away. And as a general tip -=20 > start nextcloud-desktop with the log-window flag. Ah thanks! Yeah, it needed qtgraphicaleffects. Added them in v7. Also,=20 the application excepts that the system runs either gnome-keyring or=20 kwallet. Regards, RG. --------------BA38CBB9A08266F61F96CFA1 Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------BA38CBB9A08266F61F96CFA1-- --y3WaFSpPcc3mH7XHAKOdoeWSxlLmXxv9x-- --v5oABcrNf7jqKi0HEn8zOoGkuJuIKOAqs Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBgZQwUDAAAAAAAKCRBfWBZkf4vlUajI AP99/imRpUjO+U/S76Fwt48PUiDTYWRFNsXtyJ9L1XrFlwD/aa4rJfi01M5YPE6D2W//1r7CQx+h hCMPdfPSQqL+/AQ= =ddOH -----END PGP SIGNATURE----- --v5oABcrNf7jqKi0HEn8zOoGkuJuIKOAqs-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v7) References: In-Reply-To: Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Feb 2021 15:14: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.161219241726691 (code B ref 45889); Mon, 01 Feb 2021 15:14:02 +0000 Received: (at 45889) by debbugs.gnu.org; 1 Feb 2021 15:13:37 +0000 Received: from localhost ([127.0.0.1]:32881 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6atP-0006wL-LG for submit@debbugs.gnu.org; Mon, 01 Feb 2021 10:13:37 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:41787) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6atM-0006w4-PI for 45889@debbugs.gnu.org; Mon, 01 Feb 2021 10:13:30 -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 95D07FF808 for <45889@debbugs.gnu.org>; Mon, 1 Feb 2021 15:13:20 +0000 (UTC) From: Raghav Gururajan Message-ID: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> Date: Mon, 1 Feb 2021 10:13:18 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.6.1 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="QsrWNJ7UTcFZGGZf3TPOqFxcCgFAClD6N" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --QsrWNJ7UTcFZGGZf3TPOqFxcCgFAClD6N Content-Type: multipart/mixed; boundary="vFGiChZMgvkiqbRSZED9ex2iF24LPcvrR"; protected-headers="v1" From: Raghav Gururajan To: 45889@debbugs.gnu.org Message-ID: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> Subject: Nextcloud Client (v7) --vFGiChZMgvkiqbRSZED9ex2iF24LPcvrR Content-Type: multipart/mixed; boundary="------------F33636EE64DBC94A2C1845E5" Content-Language: en-US This is a multi-part message in MIME format. --------------F33636EE64DBC94A2C1845E5 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable --------------F33636EE64DBC94A2C1845E5 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 96567208d08fc5692d721bb54488b7261eba3396 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 09db6de783..921094f6de 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.0 --------------F33636EE64DBC94A2C1845E5 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-kwayland-Disable-failing-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-kwayland-Disable-failing-tests.patch" =46rom 1f8ae09541505a39e2e011bce6fb6fdf12a5bde7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 30 Jan 2021 11:42:12 -0500 Subject: [PATCH 2/3] gnu: kwayland: Disable failing tests. * gnu/packages/kde-frameworks.scm (kwayland) [arguments]<#:phases> ['disable-failing-tests]: New phase. --- gnu/packages/kde-frameworks.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-framework= s.scm index 8c2028b978..cf5840f3f3 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1049,6 +1049,12 @@ integration with a custom editor as well as a read= y-to-use (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "autotests/client/CMakeLists.txt" + ((" add_test\\(NAME kwayland-testPlasmaWindowModel COM= MAND testPlasmaWindowModel\\)") + "")) + #t)) (add-before 'check 'check-setup (lambda _ (setenv "XDG_RUNTIME_DIR" "/tmp") --=20 2.30.0 --------------F33636EE64DBC94A2C1845E5 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 d8d102622331390726068dc6f82acf23ebb97734 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 | 150 +++++++++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+) create mode 100644 gnu/packages/nextcloud.scm diff --git a/gnu/local.mk b/gnu/local.mk index 6679b6fb17..d1b3c1699f 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..7c04cfcc91 --- /dev/null +++ b/gnu/packages/nextcloud.scm @@ -0,0 +1,150 @@ +;;; 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 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.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"))= + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + `(begin + (let ((keep '( ;; Not available in Guix. + "QProgressIndicator" "kmessagewidget" "qtlocked= file" + "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") + #: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 '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\\(dbus-1 session_bus_services_dir _in= stall_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) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("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+)))) --=20 2.30.0 --------------F33636EE64DBC94A2C1845E5 Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------F33636EE64DBC94A2C1845E5-- --vFGiChZMgvkiqbRSZED9ex2iF24LPcvrR-- --QsrWNJ7UTcFZGGZf3TPOqFxcCgFAClD6N Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBgajgUDAAAAAAAKCRBfWBZkf4vlUTXV AP0TYVxX1Tm1ER84ZnJgXIxpRnVNUxkM9khHcQHokOzTMgD/ao4Qta11wjM0+4Bi2HQ5JmzQtAuo hfvFn7fC/Aog/AQ= =+kf/ -----END PGP SIGNATURE----- --QsrWNJ7UTcFZGGZf3TPOqFxcCgFAClD6N-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v7) Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Feb 2021 10:23: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: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.1612866156300 (code B ref 45889); Tue, 09 Feb 2021 10:23:02 +0000 Received: (at 45889) by debbugs.gnu.org; 9 Feb 2021 10:22:36 +0000 Received: from localhost ([127.0.0.1]:52740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l9QAG-0008WS-0b for submit@debbugs.gnu.org; Tue, 09 Feb 2021 05:22:36 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:15643) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l9QAB-0008WE-DC for 45889@debbugs.gnu.org; Tue, 09 Feb 2021 05:22:34 -0500 Received: from nijino.local (217-149-165-242.nat.highway.telekom.at [217.149.165.242]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DZf8g48R1z1LB1w; Tue, 9 Feb 2021 11:22:27 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4DZf8g48R1z1LB1w DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1612866147; bh=rY8a1z+WN4Pl4UfVukNy3r70vRMcOJvtKXcOKiatysk=; h=Subject:From:To:Date:In-Reply-To:References:From; b=nNmC3O7opNgIE5U0hBppj1bJETyIvJTuNbFSwWEO8s3iIpRSG4z3wFS4WsfvdupYm JCYbt2D1sFcqdnOYBtje1fmGrhPtct9bjshT+iKgUNXu9q8jt7dzLpmMVDB/ZslvGs EVHICmnInOUFbpn2V+O5fRYeJB6oHJ0YFwgFuW4M= Message-ID: <8b239920351c99a887835c98fd9a3892b9cfd0f5.camel@student.tugraz.at> From: Leo Prikler Date: Tue, 09 Feb 2021 11:22:26 +0100 In-Reply-To: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, Am Montag, den 01.02.2021, 10:13 -0500 schrieb Raghav Gururajan: > Subject: [PATCH 1/3] gnu: Add appstream. Mostly LGTM. > + (native-inputs > + `(("cmake" ,cmake) Is cmake really needed? I know that meson falls back to cmake if pkg- config fails and also supports output to cmake, but meson/ninja should be the default. > Subject: [PATCH 2/3] gnu: kwayland: Disable failing tests. LGTM, we might want to push that independently. > + (let ((keep '( ;; Not available in Guix. > + "QProgressIndicator" "kmessagewidget" > "qtlockedfile" > + "qtokenizer" "qtsingleapplication"))) Could you try packaging those for Guix as well? > + #: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)) As with your telegram patch, I personally think the ordering is wrong here. > + (("PKGCONFIG_GETVAR\\(dbus-1 session_bus_services_dir > _install_dir\\)") > + "set(_install_dir > \"${CMAKE_INSTALL_PREFIX}/share/dbus-1/services\")")) You might want to regexp the middle part in case it is changed. > + ;; Turn-off the use of absolute Qt paths for > installation. > + (substitute* "shell_integration/dolphin/CMakeLists.txt" > + (("ON CACHE") > + "OFF CACHE")) What does this achieve exactly? Btw. slightly off-topic, but if you're planning to reply to this patch- set and send v8 at roughly the same time, please collapse it to a single message as you're already using a "patches as attachments" style. Having everything in a single message makes it a little easier for me to respond and Evolution can save all attachments to a directory just fine. Regards, Leo From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v7) Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Feb 2021 12:54: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: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161287519122794 (code B ref 45889); Tue, 09 Feb 2021 12:54:01 +0000 Received: (at 45889) by debbugs.gnu.org; 9 Feb 2021 12:53:11 +0000 Received: from localhost ([127.0.0.1]:52856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l9SVz-0005va-IN for submit@debbugs.gnu.org; Tue, 09 Feb 2021 07:53:11 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:39286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l9SVw-0005vP-SX for 45889@debbugs.gnu.org; Tue, 09 Feb 2021 07:53:10 -0500 Received: from nijino.local (217-149-165-242.nat.highway.telekom.at [217.149.165.242]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DZjVT0P1Qz3xPF; Tue, 9 Feb 2021 13:53:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1612875185; bh=O+mVbpTF3YlHvgSbVq1yAOvf9IsXQczISx5joSEUJrw=; h=Subject:From:To:Date:In-Reply-To:References; b=LpjrR+cNN2NH7hh+0C1/nvmZPStLdO++jUBxu8CZ8NbM33vMzgfNKkYvXqscI0EvX hP59D02YuXRB3hK+F/vkxm2yiklCwIBbJ3D/a889pRYJOnlECzCWUnluqp2585ACIc LUhwZ+eKmxULnZzJ6Zesw/k9bVZdxNpxI2UKmz/Q= Message-ID: <6cb70873281335aa8dca026dcd3c91e64d2d9e93.camel@student.tugraz.at> From: Leo Prikler Date: Tue, 09 Feb 2021 13:53:04 +0100 In-Reply-To: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Am Montag, den 01.02.2021, 10:13 -0500 schrieb Raghav Gururajan: > Subject: [PATCH 2/3] gnu: kwayland: Disable failing tests. It seems the test you've disabled is no longer the only failing one. Upstream kwayland builds by disabling tests altogether, so you can skip this patch if you don't want to investigate further. If you do want to investigate further, I suggest doing those patches separately from Nextcloud. > 17/45 Test #17: kwayland-testWindowmanagement ..............Child > aborted***Exception: 0.17 sec > qt.qpa.xcb: could not connect to display > qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even > though it was found. > This application failed to start because no Qt platform plugin could > be initialized. Reinstalling the application may fix this problem. > > Available platform plugins are: eglfs, linuxfb, minimal, minimalegl, > offscreen, vnc, xcb, wayland-egl, wayland, wayland-xcomposite-egl, > wayland-xcomposite-glx. Regards, Leo From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v8) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Feb 2021 20:38: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: Leo Prikler , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161324862318102 (code B ref 45889); Sat, 13 Feb 2021 20:38:02 +0000 Received: (at 45889) by debbugs.gnu.org; 13 Feb 2021 20:37:03 +0000 Received: from localhost ([127.0.0.1]:35137 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lB1ez-0004hX-12 for submit@debbugs.gnu.org; Sat, 13 Feb 2021 15:37:03 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:60175) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lB1ev-0004hF-1n for 45889@debbugs.gnu.org; Sat, 13 Feb 2021 15:36:55 -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 relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 72BA460002; Sat, 13 Feb 2021 20:36:44 +0000 (UTC) References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> <8b239920351c99a887835c98fd9a3892b9cfd0f5.camel@student.tugraz.at> From: Raghav Gururajan Message-ID: <3c07544c-97fe-88b1-2e80-ec5cfb87d4ec@raghavgururajan.name> Date: Sat, 13 Feb 2021 15:36:42 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.7.1 MIME-Version: 1.0 In-Reply-To: <8b239920351c99a887835c98fd9a3892b9cfd0f5.camel@student.tugraz.at> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="kVTd25zOYWSAuonaq4zxs5YDS4ovbTLVw" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --kVTd25zOYWSAuonaq4zxs5YDS4ovbTLVw Content-Type: multipart/mixed; boundary="ab0tcDyVxuqlhLDet7Czs4knZ3Trvw7uC"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: <3c07544c-97fe-88b1-2e80-ec5cfb87d4ec@raghavgururajan.name> Subject: Re: Nextcloud Client (v8) References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> <8b239920351c99a887835c98fd9a3892b9cfd0f5.camel@student.tugraz.at> In-Reply-To: <8b239920351c99a887835c98fd9a3892b9cfd0f5.camel@student.tugraz.at> --ab0tcDyVxuqlhLDet7Czs4knZ3Trvw7uC Content-Type: multipart/mixed; boundary="------------66366573839A1DFEE2E56A73" Content-Language: en-US This is a multi-part message in MIME format. --------------66366573839A1DFEE2E56A73 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! > Is cmake really needed? I know that meson falls back to cmake if pkg- > config fails and also supports output to cmake, but meson/ninja should > be the default. Yes, it is used to generate `.cmake` files inder '[out]/lib/cmake'. > Could you try packaging those for Guix as well? They don't have dedicated build scripts. > As with your telegram patch, I personally think the ordering is wrong > here. I changed it in v8. > You might want to regexp the middle part in case it is changed. I could use PKGCONFIG_GETVAR\\(.+\\) but that would conflict with other=20 PKGCONFIG_GETVAR lines now or in future. > What does this achieve exactly? It configures the build-system to install modules in output "out"=20 instead of Qt's (input) path. I have attached v8 with this email. Regards, RG. --------------66366573839A1DFEE2E56A73 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 f1d8d53754578c01023535625d7f58ecbcd8fe96 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 56e53a73e2..e8fed74170 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.0 --------------66366573839A1DFEE2E56A73 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 8f8c9e98ffd7bbb16738d9bd5836fb723731c5e7 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 | 150 +++++++++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+) create mode 100644 gnu/packages/nextcloud.scm diff --git a/gnu/local.mk b/gnu/local.mk index ad6e02116e..56cf470a2d 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..2e1e694ad0 --- /dev/null +++ b/gnu/packages/nextcloud.scm @@ -0,0 +1,150 @@ +;;; 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 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.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"))= + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + `(begin + (let ((keep '( ;; Not available in Guix. + "QProgressIndicator" "kmessagewidget" "qtlocked= file" + "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") + #: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\\(dbus-1 session_bus_services_dir _in= stall_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) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("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+)))) --=20 2.30.0 --------------66366573839A1DFEE2E56A73 Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------66366573839A1DFEE2E56A73-- --ab0tcDyVxuqlhLDet7Czs4knZ3Trvw7uC-- --kVTd25zOYWSAuonaq4zxs5YDS4ovbTLVw Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYCg4WgUDAAAAAAAKCRBfWBZkf4vlUQdJ AQDaVyDK+TecbgZ3TaChrVYnA/B7ROPjGZRXDBYSt51f2AEAmCTywW+GIR/4oXVZDVxDzxwVeZGT k0k+W7dCCgtprQA= =PY1U -----END PGP SIGNATURE----- --kVTd25zOYWSAuonaq4zxs5YDS4ovbTLVw-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v8) Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Feb 2021 21:48: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: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161325283924543 (code B ref 45889); Sat, 13 Feb 2021 21:48:01 +0000 Received: (at 45889) by debbugs.gnu.org; 13 Feb 2021 21:47:19 +0000 Received: from localhost ([127.0.0.1]:35174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lB2l5-0006Nm-4j for submit@debbugs.gnu.org; Sat, 13 Feb 2021 16:47:19 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:17070) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lB2l2-0006Nb-Np for 45889@debbugs.gnu.org; Sat, 13 Feb 2021 16:47:18 -0500 Received: from nijino.local (217-149-165-242.nat.highway.telekom.at [217.149.165.242]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DdP8w6lStz3xr0; Sat, 13 Feb 2021 22:47:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1613252833; bh=4KmCgUZGQZLk1Pw+vDG2cLWx+FpDQPSnlVktu791a8s=; h=Subject:From:To:Date:In-Reply-To:References; b=sn+rYgy7AmfVOvi3BBwIEFY3bC/TkHW1XfrNWTZb35+l0fzu2Sp4lyfm0Aa8ed7SV kAXqI7vvIgp6Kan3vBAUIlwxdvzbWicGM6PjJZiu6HYj2+Y8r5bWPDYG6ifNo9Foag wjx48fuTWzx7rXWCr0J41j9wsOsEs058fPfaGeGA= Message-ID: <73f0495c29ee82c2a16a96cc2825f19bd88b4ab4.camel@student.tugraz.at> From: Leo Prikler Date: Sat, 13 Feb 2021 22:47:11 +0100 In-Reply-To: <3c07544c-97fe-88b1-2e80-ec5cfb87d4ec@raghavgururajan.name> References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> <8b239920351c99a887835c98fd9a3892b9cfd0f5.camel@student.tugraz.at> <3c07544c-97fe-88b1-2e80-ec5cfb87d4ec@raghavgururajan.name> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Raghav, Am Samstag, den 13.02.2021, 15:36 -0500 schrieb Raghav Gururajan: > Hi Leo! > > > Is cmake really needed? I know that meson falls back to cmake if > > pkg- > > config fails and also supports output to cmake, but meson/ninja > > should > > be the default. > > Yes, it is used to generate `.cmake` files inder '[out]/lib/cmake'. Fair enough. > > Could you try packaging those for Guix as well? > > They don't have dedicated build scripts. That may be an issue. You might want to check which of those are perhaps optional, so that you don't need to pull them in. For example it appears you're also deleting libcrashreporter-qt with no replacement. kmessagewidget appears to be a part of KDE core. If anything there is strictly necessary for building, we should perhaps define a package variant, that has a slightly patched kmessagewidget. qtlockedfile and qtsingleapplication appear to be part of [1], a sort of metapackage, from which you could spawn multiple descriptions. For qtokenizer, I am really not sure. > > As with your telegram patch, I personally think the ordering is > > wrong > > here. > > I changed it in v8. LGTM. > > You might want to regexp the middle part in case it is changed. > > I could use PKGCONFIG_GETVAR\\(.+\\) but that would conflict with > other > PKGCONFIG_GETVAR lines now or in future. Okay, but you can do something like PKGCONFIG_GETVAR\\(.+ _install_dir\\), assuming that such variables should generally only be bound once. To be honest, I don't know enough CMake to tell, whether that is a good idea, however. > > What does this achieve exactly? > > It configures the build-system to install modules in output "out" > instead of Qt's (input) path. In that case, the comment should probably read something along the lines of "Make sure, that is installed under $prefix." Regards, Leo [1] https://github.com/qtproject/qt-solutions From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v8) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Feb 2021 23:55: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.16132604823786 (code B ref 45889); Sat, 13 Feb 2021 23:55:01 +0000 Received: (at 45889) by debbugs.gnu.org; 13 Feb 2021 23:54:42 +0000 Received: from localhost ([127.0.0.1]:35237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lB4kG-0000yt-2N for submit@debbugs.gnu.org; Sat, 13 Feb 2021 18:54:42 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:47757) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lB4kC-0000yd-67 for 45889@debbugs.gnu.org; Sat, 13 Feb 2021 18:54:34 -0500 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 relay12.mail.gandi.net (Postfix) with ESMTPSA id 765D8200007; Sat, 13 Feb 2021 23:54:23 +0000 (UTC) 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> From: Raghav Gururajan Message-ID: <8f88bef4-cf4d-5bcc-e0bb-979dc0ce1efd@raghavgururajan.name> Date: Sat, 13 Feb 2021 18:54:21 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.7.1 MIME-Version: 1.0 In-Reply-To: <73f0495c29ee82c2a16a96cc2825f19bd88b4ab4.camel@student.tugraz.at> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="0KuSAMGl5B5bGDVH2nwyHdFvy2SqeqKs9" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0KuSAMGl5B5bGDVH2nwyHdFvy2SqeqKs9 Content-Type: multipart/mixed; boundary="vk9qLUdkoC0SWWFRdABo8iW7BeREwnXQh"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: <8f88bef4-cf4d-5bcc-e0bb-979dc0ce1efd@raghavgururajan.name> Subject: Re: Nextcloud Client (v8) 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> In-Reply-To: <73f0495c29ee82c2a16a96cc2825f19bd88b4ab4.camel@student.tugraz.at> --vk9qLUdkoC0SWWFRdABo8iW7BeREwnXQh Content-Type: multipart/mixed; boundary="------------C9F1CDB3FB35E8116BE169C9" Content-Language: en-US This is a multi-part message in MIME format. --------------C9F1CDB3FB35E8116BE169C9 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! > That may be an issue. You might want to check which of those are > perhaps optional, so that you don't need to pull them in. For example > it appears you're also deleting libcrashreporter-qt with no > replacement. I tried building with each one of them, but build fails without them=20 (except libcrashreporter-qt). > kmessagewidget appears to be a part of KDE core. If anything there is > strictly necessary for building, we should perhaps define a package > variant, that has a slightly patched kmessagewidget. qtlockedfile and > qtsingleapplication appear to be part of [1], a sort of metapackage, > from which you could spawn multiple descriptions. For qtokenizer, I am= > really not sure. Thanks for the info. This package doesn't have an option or code to use=20 packaged ones. > Okay, but you can do something like PKGCONFIG_GETVAR\\(.+ > _install_dir\\), assuming that such variables should generally only be > bound once. To be honest, I don't know enough CMake to tell, whether > that is a good idea, however. Changed in v9. > In that case, the comment should probably read something along the > lines of "Make sure, that is installed under $prefix." Changed in v9. v9 is attached. Regards, RG. --------------C9F1CDB3FB35E8116BE169C9 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 f1d8d53754578c01023535625d7f58ecbcd8fe96 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 56e53a73e2..e8fed74170 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.0 --------------C9F1CDB3FB35E8116BE169C9 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 8f8c9e98ffd7bbb16738d9bd5836fb723731c5e7 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 | 150 +++++++++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+) create mode 100644 gnu/packages/nextcloud.scm diff --git a/gnu/local.mk b/gnu/local.mk index ad6e02116e..56cf470a2d 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..2e1e694ad0 --- /dev/null +++ b/gnu/packages/nextcloud.scm @@ -0,0 +1,150 @@ +;;; 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 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.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"))= + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + `(begin + (let ((keep '( ;; Not available in Guix. + "QProgressIndicator" "kmessagewidget" "qtlocked= file" + "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") + #: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\\(dbus-1 session_bus_services_dir _in= stall_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) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("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+)))) --=20 2.30.0 --------------C9F1CDB3FB35E8116BE169C9-- --vk9qLUdkoC0SWWFRdABo8iW7BeREwnXQh-- --0KuSAMGl5B5bGDVH2nwyHdFvy2SqeqKs9 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYChmrQUDAAAAAAAKCRBfWBZkf4vlUYE3 AP9aWykzewi+TglaHy97gT8bciGKwTY+Yj/HqSgjTZYklwEA7kp3Xz5kQTejVw+CnG20qvCTYP3e uEdupJwDQR0d5AE= =BLCP -----END PGP SIGNATURE----- --0KuSAMGl5B5bGDVH2nwyHdFvy2SqeqKs9-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v9) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Feb 2021 00:49: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.16132636998596 (code B ref 45889); Sun, 14 Feb 2021 00:49:01 +0000 Received: (at 45889) by debbugs.gnu.org; 14 Feb 2021 00:48:19 +0000 Received: from localhost ([127.0.0.1]:35249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lB5a9-0002ES-Lp for submit@debbugs.gnu.org; Sat, 13 Feb 2021 19:48:19 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:52959) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lB5a7-0002EB-B4 for 45889@debbugs.gnu.org; Sat, 13 Feb 2021 19:48:13 -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 relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 352FE20002; Sun, 14 Feb 2021 00:48:02 +0000 (UTC) From: Raghav Gururajan 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> Message-ID: Date: Sat, 13 Feb 2021 19:47:59 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.7.1 MIME-Version: 1.0 In-Reply-To: <8f88bef4-cf4d-5bcc-e0bb-979dc0ce1efd@raghavgururajan.name> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="QZBAWLqHUHchO2oq14Bug8XAxrkIGdZCM" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --QZBAWLqHUHchO2oq14Bug8XAxrkIGdZCM Content-Type: multipart/mixed; boundary="VQhTBIqmheehCeoySJ6hGwtHM4Gm5c4VS"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: Subject: Re: Nextcloud Client (v9) 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: <8f88bef4-cf4d-5bcc-e0bb-979dc0ce1efd@raghavgururajan.name> --VQhTBIqmheehCeoySJ6hGwtHM4Gm5c4VS Content-Type: multipart/mixed; boundary="------------265C01500216CE7B61C2C12D" Content-Language: en-US This is a multi-part message in MIME format. --------------265C01500216CE7B61C2C12D Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! > v9 is attached. Attached wrong ones there, here are the correct ones. Regards, RG. --------------265C01500216CE7B61C2C12D 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 f1d8d53754578c01023535625d7f58ecbcd8fe96 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 56e53a73e2..e8fed74170 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.0 --------------265C01500216CE7B61C2C12D 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 0229444a24ba11a6764f5b6952a2aa9cd86e25eb 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 ad6e02116e..56cf470a2d 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..fac80485f7 --- /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.0 --------------265C01500216CE7B61C2C12D-- --VQhTBIqmheehCeoySJ6hGwtHM4Gm5c4VS-- --QZBAWLqHUHchO2oq14Bug8XAxrkIGdZCM Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYChzPwUDAAAAAAAKCRBfWBZkf4vlUUbH AP9yydkvx/yyqVxl2+tXTa8myWl6bc/vRu/VJWIeCCMgxQD+PNLBAW74xhDIGEKDBnL4XK6Hva8W 7l9zXCXuhMCyYgI= =l6k4 -----END PGP SIGNATURE----- --QZBAWLqHUHchO2oq14Bug8XAxrkIGdZCM-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v8) Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Feb 2021 10:54: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: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.16132999968334 (code B ref 45889); Sun, 14 Feb 2021 10:54:01 +0000 Received: (at 45889) by debbugs.gnu.org; 14 Feb 2021 10:53:16 +0000 Received: from localhost ([127.0.0.1]:35484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBF1g-0002AM-DF for submit@debbugs.gnu.org; Sun, 14 Feb 2021 05:53:16 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:54487) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBF1b-0002A6-DY for 45889@debbugs.gnu.org; Sun, 14 Feb 2021 05:53:15 -0500 Received: from nijino.local (217-149-165-242.nat.highway.telekom.at [217.149.165.242]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4Ddkbm3047z3xm9; Sun, 14 Feb 2021 11:53:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1613299988; bh=fXty/N+FHnA6Dhj1lW0P6msWirkpB0g8kjOPcIqd+i0=; h=Subject:From:To:Date:In-Reply-To:References; b=XlcnqAHWOMAU+XPc0gtjpFNIFs0iJbQwvsyyXe1jHoG+1fMfFYkO8UU0VzEiemfiE aM9uF/7lD0uZiBwV5zVEu6gruF9nu/5vvI9RTFbqtTWBDtzRwBVsqkS/k5QJicVrop rLDn4SR/Kc9Sm+oZNeIar0/n1u80BZ+w8FZ+ZUdE= Message-ID: From: Leo Prikler Date: Sun, 14 Feb 2021 11:53:07 +0100 In-Reply-To: <8f88bef4-cf4d-5bcc-e0bb-979dc0ce1efd@raghavgururajan.name> 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> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Raghav, Am Samstag, den 13.02.2021, 18:54 -0500 schrieb Raghav Gururajan: > Hi Leo! > > > That may be an issue. You might want to check which of those are > > perhaps optional, so that you don't need to pull them in. For > > example > > it appears you're also deleting libcrashreporter-qt with no > > replacement. > > I tried building with each one of them, but build fails without them > (except libcrashreporter-qt). Interesting. Is this due to CMakeLists picking up, that they're missing and not replacing them with core stuff? > > kmessagewidget appears to be a part of KDE core. If anything there > > is > > strictly necessary for building, we should perhaps define a package > > variant, that has a slightly patched kmessagewidget. qtlockedfile > > and > > qtsingleapplication appear to be part of [1], a sort of > > metapackage, > > from which you could spawn multiple descriptions. For qtokenizer, > > I am > > really not sure. > > Thanks for the info. This package doesn't have an option or code to > use packaged ones. 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. > > Okay, but you can do something like PKGCONFIG_GETVAR\\(.+ > > _install_dir\\), assuming that such variables should generally only > > be > > bound once. To be honest, I don't know enough CMake to tell, > > whether > > that is a good idea, however. > > Changed in v9. Note, that you're missing a space here. This would also match PKGCONFIG_GETVAR(pkg var foobar_install_dir). > > In that case, the comment should probably read something along the > > lines of "Make sure, that is installed under $prefix." > > Changed in v9. LGTM. Regards, Leo From unknown Sat Aug 16 18:44:36 2025 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. From: Raghav Gururajan 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-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v10) Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Feb 2021 22:27: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: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.16136871975301 (code B ref 45889); Thu, 18 Feb 2021 22:27:02 +0000 Received: (at 45889) by debbugs.gnu.org; 18 Feb 2021 22:26:37 +0000 Received: from localhost ([127.0.0.1]:48346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lCrkr-0001NR-El for submit@debbugs.gnu.org; Thu, 18 Feb 2021 17:26:37 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:65387) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lCrkp-0001NE-E1 for 45889@debbugs.gnu.org; Thu, 18 Feb 2021 17:26:36 -0500 Received: from nijino.local (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DhTnz1TqDz3wLw; Thu, 18 Feb 2021 23:26:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1613687191; bh=QUv+5H4fGPBdzevCSB7VvfC4jbberIoO99e1xF6NsNo=; h=Subject:From:To:Date:In-Reply-To:References; b=nEX+ftvDcVU5+jTDddw0XRVJSAhctXYgeMGkkuE6cU3ed9HPQOe8LieO7355oVvID v2K0ZIyk2YBiZw3xjCD45vD5JKDxcwc/xgDcL6GDtGsEIoQU1p6C83pGy76P247cvx U0NSyQ6ZF7ixE7pBlEaj0kILYxtZl1yqgGABp+gI= Message-ID: <29553b60ceb47530cd0bda7f84badb80b8daab74.camel@student.tugraz.at> From: Leo Prikler Date: Thu, 18 Feb 2021 23:26:30 +0100 In-Reply-To: <67f2ff73-c6e0-743f-d873-0a488fa05e31@raghavgururajan.name> 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> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Raghav! Am Donnerstag, den 18.02.2021, 15:23 -0500 schrieb Raghav Gururajan: > Hi Leo! > > > Interesting. Is this due to CMakeLists picking up, that they're > > missing and not replacing them with core stuff? > > > > 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. > https://github.com/nextcloud/desktop/issues/2929#issuecomment-780548919 Good to know. > So once they update the source in the next-release, I will update > the > package and remove the 3rdparty directory completely. :-) In the meantime, would you mind packaging those 3rdparty sources from their respective origins and add them in at build time? That way, all we'd need to transition from pseudo-unbundled to actually unbundled would be to drop one phase. > > Note, that you're missing a space here. This would also match > > PKGCONFIG_GETVAR(pkg var foobar_install_dir). > > Changed in v10. LGTM. Regards, Leo From unknown Sat Aug 16 18:44:36 2025 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: Sun, 21 Feb 2021 17:05: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.16139270752961 (code B ref 45889); Sun, 21 Feb 2021 17:05:01 +0000 Received: (at 45889) by debbugs.gnu.org; 21 Feb 2021 17:04:35 +0000 Received: from localhost ([127.0.0.1]:54707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDs9r-0000lh-DS for submit@debbugs.gnu.org; Sun, 21 Feb 2021 12:04:35 -0500 Received: from out2.migadu.com ([188.165.223.204]:54558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDs9n-0000lX-GF for 45889@debbugs.gnu.org; Sun, 21 Feb 2021 12:04:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1613927069; 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=dLWcJkULAUM3xAbC3P7mNbniEbLOFInW5xgDhTLRKsk=; b=Hp9RcsVESOLqy5/kDF6A1UoZSTlTKgVivL5S16LkxcU2aiWXLIj3ggrV/bJJEriYVwPJ/B 3zIFNFP5xovngY3l0Fypvl4MjSXoob1VEQjEY2jYuhDHfu4DewedCRO4MPO5R3A3wwGNr3 jt/70csKT7BpxAPbQ6W9swgjXqJcInAZFWIqJnQj3pq70Eg2qsX9hmdv8R1RAOWTZc9X6q zXbCO4Mj3lDI+7LAu7ID7oEp9prQlVrUf5bQLC+NQITQfPVCHqEZzK4l3v/fOfB5Et21ya wdddmxiJ5YenMzSIYcxj42b/SxT5xwNPxxLQx6u/puFbl19+v733mMbP72KKFg== 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> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Message-ID: <7d1a2db6-5da9-80f6-d160-128d2200935b@raghavgururajan.name> Date: Sun, 21 Feb 2021 12:04:27 -0500 MIME-Version: 1.0 In-Reply-To: <29553b60ceb47530cd0bda7f84badb80b8daab74.camel@student.tugraz.at> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ucSfUbYppc4egPyo72eMUgkL2xEXQqGjD" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ucSfUbYppc4egPyo72eMUgkL2xEXQqGjD Content-Type: multipart/mixed; boundary="sfS0VwKGz6OWyngQ3p0t5xlNEiL9kvMLH"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: <7d1a2db6-5da9-80f6-d160-128d2200935b@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> <67f2ff73-c6e0-743f-d873-0a488fa05e31@raghavgururajan.name> <29553b60ceb47530cd0bda7f84badb80b8daab74.camel@student.tugraz.at> In-Reply-To: <29553b60ceb47530cd0bda7f84badb80b8daab74.camel@student.tugraz.at> --sfS0VwKGz6OWyngQ3p0t5xlNEiL9kvMLH Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hi Leo! > In the meantime, would you mind packaging those 3rdparty sources from > their respective origins and add them in at build time? That way, all > we'd need to transition from pseudo-unbundled to actually unbundled > would be to drop one phase. I was about to start doing it via 'copy-inputs, then noticed the source=20 content differs with the ones at QtSolutions. The files of=20 QtSingleApplication and QtLockedFile at QtSolutions were not modified=20 for many years, whereas, the files of QtSingleApplication and=20 QtLockedFile at nextcloud was last modified in 2020. Regards, RG. --sfS0VwKGz6OWyngQ3p0t5xlNEiL9kvMLH-- --ucSfUbYppc4egPyo72eMUgkL2xEXQqGjD Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYDKSmwUDAAAAAAAKCRBfWBZkf4vlUTGI AQCPuUk9QsYTlBfpXn38MP7QB3qvNbzLzu6+TrFaZ2G38gEA86cXFM66rTKKoPxze7kWWDVtDk6i 3jBaHFYYzkNBkgM= =rRJT -----END PGP SIGNATURE----- --ucSfUbYppc4egPyo72eMUgkL2xEXQqGjD-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v10) Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Feb 2021 17:46: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: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.16139295516731 (code B ref 45889); Sun, 21 Feb 2021 17:46:02 +0000 Received: (at 45889) by debbugs.gnu.org; 21 Feb 2021 17:45:51 +0000 Received: from localhost ([127.0.0.1]:54754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDsnm-0001kV-Lr for submit@debbugs.gnu.org; Sun, 21 Feb 2021 12:45:50 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:58809) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDsnj-0001kK-Vj for 45889@debbugs.gnu.org; Sun, 21 Feb 2021 12:45:50 -0500 Received: from nijino.local (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DkCQc4wCJz1LLyX; Sun, 21 Feb 2021 18:45:44 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4DkCQc4wCJz1LLyX DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1613929544; bh=WEjaphk0IrOI/GmcO5OfObM+0BhOUc2RAHcBsZQ6yu0=; h=Subject:From:To:Date:In-Reply-To:References:From; b=UGBVs5x11IkGN8R6jUJqx1ZkLVeXhbFBrK1zT5O//0V4CsLqer7qsmaq9ejeQZAYp TUgSFdc3Lu84swTWVFL6yVW32Hlepp0bdxtYP3qNBz9qWkwlK/0kbOu5uyheg/VlXf DrSKDBpc9B6OH03+7BfCPXOACGExvPlVE6OjosLk= Message-ID: <1c216cbfd761c8ce77b2402cf9a88ad8772b2331.camel@student.tugraz.at> From: Leo Prikler Date: Sun, 21 Feb 2021 18:45:43 +0100 In-Reply-To: <7d1a2db6-5da9-80f6-d160-128d2200935b@raghavgururajan.name> 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> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Raghav, Am Sonntag, den 21.02.2021, 12:04 -0500 schrieb Raghav Gururajan: > Hi Leo! > > > In the meantime, would you mind packaging those 3rdparty sources > > from > > their respective origins and add them in at build time? That way, > > all > > we'd need to transition from pseudo-unbundled to actually unbundled > > would be to drop one phase. > > I was about to start doing it via 'copy-inputs, then noticed the > source > content differs with the ones at QtSolutions. The files of > QtSingleApplication and QtLockedFile at QtSolutions were not > modified > for many years, whereas, the files of QtSingleApplication and > QtLockedFile at nextcloud was last modified in 2020. 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. Regards, Leo From unknown Sat Aug 16 18:44:36 2025 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. From: Raghav Gururajan 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> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="67RN0QJt6mUevdIPGL8KtiUHox7rUNLyP" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --67RN0QJt6mUevdIPGL8KtiUHox7rUNLyP Content-Type: multipart/mixed; boundary="Q54PBRSlY6CtBpDAruEArrBf6Nc3cTJ2m"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> Subject: Re: Nextcloud Client (v11) 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> In-Reply-To: <1c216cbfd761c8ce77b2402cf9a88ad8772b2331.camel@student.tugraz.at> --Q54PBRSlY6CtBpDAruEArrBf6Nc3cTJ2m Content-Type: multipart/mixed; boundary="------------4904A1F3A3490658848EF73A" Content-Language: en-US This is a multi-part message in MIME format. --------------4904A1F3A3490658848EF73A Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable 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. --------------4904A1F3A3490658848EF73A Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-Add-appstream.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-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 2/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..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 --------------4904A1F3A3490658848EF73A 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 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 =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 --------------4904A1F3A3490658848EF73A-- --Q54PBRSlY6CtBpDAruEArrBf6Nc3cTJ2m-- --67RN0QJt6mUevdIPGL8KtiUHox7rUNLyP Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYDKhyAUDAAAAAAAKCRBfWBZkf4vlUd1H AP9fizgpyaw4FQO+0WvoFvzzWjzGZd2oJbyGE3RntxfP/AD9FfTbof/UC3zlBOOtOY61LaQWvN/o h1TAsAX+u6PVwAE= =+Dte -----END PGP SIGNATURE----- --67RN0QJt6mUevdIPGL8KtiUHox7rUNLyP-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v11) Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Feb 2021 18:23:03 +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: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161393175510178 (code B ref 45889); Sun, 21 Feb 2021 18:23:03 +0000 Received: (at 45889) by debbugs.gnu.org; 21 Feb 2021 18:22:35 +0000 Received: from localhost ([127.0.0.1]:54811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDtNL-0002e6-0p for submit@debbugs.gnu.org; Sun, 21 Feb 2021 13:22:35 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:58846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDtNH-0002dj-Aj for 45889@debbugs.gnu.org; Sun, 21 Feb 2021 13:22:33 -0500 Received: from nijino.local (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DkDF03pNYz3xQy; Sun, 21 Feb 2021 19:22:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1613931748; bh=XeT7Etf4YXFwOeX6YWc1GXRL4e0TVn6p29BUtAdH8qU=; h=Subject:From:To:Date:In-Reply-To:References; b=kyDYG6PBYb52rwSCB64iHI7jBT78+Kn3AFidHXqv7ms1DqgQi/gfu4h6Bl22oSKYz vVfofEZAiKJKO50aBXmCRON+prauen9boocmqQOMNATpaytpN67dT9RcIlTm3ci2HH liWnGoiyfKK6VoC4Q3NxVJoppvrr0m83ACu3y0pM= Message-ID: From: Leo Prikler Date: Sun, 21 Feb 2021 19:22:27 +0100 In-Reply-To: <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> 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> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Raghav, Am Sonntag, den 21.02.2021, 13:09 -0500 schrieb Raghav Gururajan: > 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! Just in case I've been unclear, "upstream" here means "not bundled". > I have attached v11. Did you by chance mess up the patch numbering? > +(define-module (gnu packages nextcloud) I just now noticed, that this would be a good fit for sync, which already hosts owncloud-client. > + (version "3.1.2") For the record, upstream updated to 3.1.3 three days ago. Time flies. Regards, Leo From unknown Sat Aug 16 18:44:36 2025 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:23:03 +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.161393176110191 (code B ref 45889); Sun, 21 Feb 2021 18:23:03 +0000 Received: (at 45889) by debbugs.gnu.org; 21 Feb 2021 18:22:41 +0000 Received: from localhost ([127.0.0.1]:54813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDtNR-0002eJ-9r for submit@debbugs.gnu.org; Sun, 21 Feb 2021 13:22:41 -0500 Received: from out2.migadu.com ([188.165.223.204]:19808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDtNI-0002ds-OK for 45889@debbugs.gnu.org; Sun, 21 Feb 2021 13:22:34 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1613931751; 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=tjAnrjId3mmzCW+fd9xhkotm5WWxWAhn/9NEqbbwm3E=; b=MFpUPU/Mejw1pmujCHWv7sD+sN3ledvsdRUGTpEUvxaqdK6/B917k8AzddGV2yIdcNHNOJ ovEcIg2vQPqHt8lCg0cJ29V7ubnSH8o1ucpwwQJ0FCvecpYYC5ROWzFEcCbh/NcYt2STzi yIoOLKNlTQgPrTFmRybOaaceSyDtu47lkZU81KA59/hjfghakr/mIuQ411HvwyvzVF1yUp dVwUBshT2rNVOGyOSi6blxbT4laQYSOdpJ52JFv/Z1UQgR2yrs25vvLLN/9ekX+VQWXDs7 TVVXsIw6MjQLkxv6qpR1IEwj4yF2mDSxO1N7ui+fcaoBcyBYqrtu9GbCYp09bA== From: Raghav Gururajan 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> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> Message-ID: <792b04ff-61bb-ab6f-46f7-9186be25ba7b@raghavgururajan.name> Date: Sun, 21 Feb 2021 13:22:29 -0500 MIME-Version: 1.0 In-Reply-To: <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="U80FFB4Yjn6d4ejDC5AzCkuaVM3xKk1xV" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --U80FFB4Yjn6d4ejDC5AzCkuaVM3xKk1xV Content-Type: multipart/mixed; boundary="xPVzXoScZHCsSQgBWASIq9jKOq21On3oh"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: <792b04ff-61bb-ab6f-46f7-9186be25ba7b@raghavgururajan.name> Subject: Re: Nextcloud Client (v11) 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> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> In-Reply-To: <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> --xPVzXoScZHCsSQgBWASIq9jKOq21On3oh Content-Type: multipart/mixed; boundary="------------A9F3F18DE345F53B1646D098" Content-Language: en-US This is a multi-part message in MIME format. --------------A9F3F18DE345F53B1646D098 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! > I have attached v11. Ignore v11. The build fails. There are missing classes in the=20 QtSolutions source. So v10 is the viable patch-set. Regards, RG. --------------A9F3F18DE345F53B1646D098 Content-Type: application/pgp-keys; name="OpenPGP_0x5F5816647F8BE551.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="OpenPGP_0x5F5816647F8BE551.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7NL= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYIADsCG= wMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX28v0AIZA= QAK CRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6SbGQD/UDytGjwnQ= 4nK YsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/NPVJhZ2hhdiBHdXJ1cmFqYW4gKEVkdWNhdGlvbikgP= GVk dWNhdGlvbkByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpjMs32pHWsF9YF= mR/ i+VRBQJgE0xGAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i+VRQcQBALNRe= 1V/ 5DKN8ZxyVQlzt4TdGUyNom7xJ6r23ANtcygxAQDBjw6NLXV3aYGDMVVmQPbdAnFiB/x1rpJsA= wB/ 1BSBDc05UmFnaGF2IEd1cnVyYWphbiAoRmluYW5jZSkgPGZpbmFuY2VAcmFnaGF2Z3VydXJha= mFu Lm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNMbwIbAwULCQgHAgYVC= gkI CwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUWnLAP914hb0IzSCiaj+XrcEBaIt/Q+KjRn2fj5A7= V6Z ucJJqwEA64eks7xjLBS3mpTpaGwdDtluJcR7G8XZJJdbdK2YyQ/NN1JhZ2hhdiBHdXJ1cmFqY= W4g KEhlYWx0aCkgPGhlYWx0aEByYWdoYXZndXJ1cmFqYW4ubmFtZT7CkAQTFggAOBYhBM0tXqqpj= Ms3 2pHWsF9YFmR/i+VRBQJgE0yhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEF9YFmR/i= +VR xdcA/3YxFzlKKHrTguDxE1tBWD31BUYlXWl351j6MB/U+tWdAPwJB8QD8janaddv3U5ZGzswf= hQv GGzx6SLcX0E253uNC80/UmFnaGF2IEd1cnVyYWphbiAoT2NjdXBhdGlvbikgPG9jY3VwYXRpb= 25A cmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCY= BNM ugIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUSrlAP0VJw8frvWHAGd6l= Zdy x1v+relUGB4DToqDgIMBQyG58gD+NU5t4h0IY6YaiQ+FPyJzdV62k15d9IDvTMYPvcWIpQPNP= 1Jh Z2hhdiBHdXJ1cmFqYW4gKFJlY3JlYXRpb24pIDxyZWNyZWF0aW9uQHJhZ2hhdmd1cnVyYWphb= i5u YW1lPsKQBBMWCAA4FiEEzS1eqqmMyzfakdawX1gWZH+L5VEFAmATTNkCGwMFCwkIBwIGFQoJC= AsC BBYCAwECHgECF4AACgkQX1gWZH+L5VHhbQD/b6jXWdQfxi+xzrs1+A0lvnihfUgQ0H/r5U2bO= w9d FIkA/0nCh0VJKX+YrySJhWugL7e8ItqwKADh0v05vO6qtlkAzTdSYWdoYXYgR3VydXJhamFuI= ChT b2NpYWwpIDxzb2NpYWxAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN= 9qR 1rBfWBZkf4vlUQUCYBNM8AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlU= dtv AQCKMxBdxwMUJdyigGWqrTuJUaLVL2dgvqGa0k39nsQA8gD+PH3LsQAaJ98xREKxYXMAszNnJ= RJR xYa9trfixyQbrw7NNVJhZ2hhdiBHdXJ1cmFqYW4gKFRyYWRlKSA8dHJhZGVAcmFnaGF2Z3Vyd= XJh amFuLm5hbWU+wpAEExYIADgWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYBNNHQIbAwULCQgHA= gYV CgkICwIEFgIDAQIeAQIXgAAKCRBfWBZkf4vlUQ+9AP0S/6S5PLshS/vz7ezRO2HokruaRiDhg= w0t yRM3LAefSQEA7rEBw9sSUsDgRILGKUi1ZzQq5AJ0F77KOXyurVqnywXOOARfZkIkEgorBgEEA= ZdV AQUBAQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNL= V6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDPp= sdD hpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU=3D =3DMROf -----END PGP PUBLIC KEY BLOCK----- --------------A9F3F18DE345F53B1646D098-- --xPVzXoScZHCsSQgBWASIq9jKOq21On3oh-- --U80FFB4Yjn6d4ejDC5AzCkuaVM3xKk1xV Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYDKk5QUDAAAAAAAKCRBfWBZkf4vlUW3E AQDSaeMQ/kT7qYgREydfHQoizTl91rI8Dh9qX4TcmzpAgQD9HB+lIbfTcy6pbe/69uzaXc9zzu7F hMEWkq/FjgLazwM= =zaTO -----END PGP SIGNATURE----- --U80FFB4Yjn6d4ejDC5AzCkuaVM3xKk1xV-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v12) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Feb 2021 18:51: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: Leo Prikler , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161393346112805 (code B ref 45889); Sun, 21 Feb 2021 18:51:02 +0000 Received: (at 45889) by debbugs.gnu.org; 21 Feb 2021 18:51:01 +0000 Received: from localhost ([127.0.0.1]:54862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDtol-0003KO-4U for submit@debbugs.gnu.org; Sun, 21 Feb 2021 13:51:00 -0500 Received: from out1.migadu.com ([91.121.223.63]:61007) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDtoh-0003KC-4M for 45889@debbugs.gnu.org; Sun, 21 Feb 2021 13:50:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1613933448; 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=QrWl7U8z/B/9ggnzOTvSRJS8NgdcT6oZt5jw8TFo5yc=; b=lCA40I55GSVmNfZVQKX//hnYyL94Y6YZmfXFxFQpGLn9nQDDXPag7MKIUdy4D/wrFmVX0b tL2j5NGe+7ZnoDUNUisGQ0MlXsFB7GNtXyoVl/y8UjlbRst1lUJOhM3IjGizRdtad5lz3S 3WcfVnx87PFDjhHZAIicWdc7GY2crL6h4j5Ol6U2Z+Co8kuF8mbT+SoVrr+Ve8tCa+g15p RyaJ3EFQ9ePWxgNkKIC/6u3oxi1TFUyqxPfGX/qzTTSUZZWAiwqaEqAKZhXqIQA2fpuBWb xxSRgJnV0joMf3S2XLO7R7zqubgmb7+4/N6fIXNhkHZCZGiiWiBBg4sI0Bwbqw== 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> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Message-ID: <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> Date: Sun, 21 Feb 2021 13:50:47 -0500 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="JAx364goLK8R0GHU5X2z9Tv1SWp1q3gng" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --JAx364goLK8R0GHU5X2z9Tv1SWp1q3gng Content-Type: multipart/mixed; boundary="UJkCwlSKNI6VX9pChx0ms4pyzjlhakADG"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> Subject: Re: Nextcloud Client (v12) 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> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> In-Reply-To: --UJkCwlSKNI6VX9pChx0ms4pyzjlhakADG Content-Type: multipart/mixed; boundary="------------C512EEE9E0F04795656C94E9" Content-Language: en-US This is a multi-part message in MIME format. --------------C512EEE9E0F04795656C94E9 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! >> +(define-module (gnu packages nextcloud) > I just now noticed, that this would be a good fit for sync, which > already hosts owncloud-client. This new module is for nextcloud suite of packages. nextcloud-client,=20 nextcloud-server, nextcloud-spreed, nextcloud-deck, nextcloud-news ...=20 nextcloud-foobar. >> + (version "3.1.2") > For the record, upstream updated to 3.1.3 three days ago. Time flies. Wow! Okay, I have made v12. Regards, RG. --------------C512EEE9E0F04795656C94E9 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 d4b271d3fcff56c27e6ee0222e688aad4b78a8eb 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 --------------C512EEE9E0F04795656C94E9 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 e0b64a0f8198fb48201c17e9459df8cae1da7a04 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..06a6f8fe20 --- /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.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 + (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 --------------C512EEE9E0F04795656C94E9-- --UJkCwlSKNI6VX9pChx0ms4pyzjlhakADG-- --JAx364goLK8R0GHU5X2z9Tv1SWp1q3gng Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYDKrhwUDAAAAAAAKCRBfWBZkf4vlUWO2 AP4oqKFql7S9IreJjj33/mCL0+cZVvn1NER6LTx7zCgxJQEAi/TlUxaMxcG3fV/2wxvWJ45NNI4G uYair1/vwaxJHgQ= =wjph -----END PGP SIGNATURE----- --JAx364goLK8R0GHU5X2z9Tv1SWp1q3gng-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v12) Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Feb 2021 19:38: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: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161393623016990 (code B ref 45889); Sun, 21 Feb 2021 19:38:01 +0000 Received: (at 45889) by debbugs.gnu.org; 21 Feb 2021 19:37:10 +0000 Received: from localhost ([127.0.0.1]:54898 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDuXW-0004Px-3J for submit@debbugs.gnu.org; Sun, 21 Feb 2021 14:37:10 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:30591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDuXS-0004Pm-Ua for 45889@debbugs.gnu.org; Sun, 21 Feb 2021 14:37:09 -0500 Received: from nijino.local (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DkFv31HLlz1LLyX; Sun, 21 Feb 2021 20:37:02 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4DkFv31HLlz1LLyX DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1613936223; bh=WXi9UeZDYr/HtNjx/IzUVHqW8mhlGLKFg6I/1pPaQ6g=; h=Subject:From:To:Date:In-Reply-To:References:From; b=lEMBUh5Apv1PSE7J48buw8u0zaDQQjt6gn/q79fZYESz2oy1mBFGHhikTgUpLuhQT uVBinp9RFdWhqpUBzJCjvkcs5GRUBpgWcvo2xpGAdrJ2VSWoK87hAeUbm2Zg9USobQ AGw1bKXKWXrLu2O70621jvT+++Ij8opk2kO04hdE= Message-ID: From: Leo Prikler Date: Sun, 21 Feb 2021 20:37:02 +0100 In-Reply-To: <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> 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> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Am Sonntag, den 21.02.2021, 13:50 -0500 schrieb Raghav Gururajan: > Hi Leo! > > > > +(define-module (gnu packages nextcloud) > > I just now noticed, that this would be a good fit for sync, which > > already hosts owncloud-client. > > This new module is for nextcloud suite of packages. nextcloud- > client, > nextcloud-server, nextcloud-spreed, nextcloud-deck, nextcloud-news > ... > nextcloud-foobar. Still seems pretty sync to me, especially since it's just the client for now. > There are missing classes in the QtSolutions source. (X) Doubt It appears the Nextcloud variant has an added namespace layer, that one should easily be able to strip via substitute*. I do wonder where that comes from, though, it seems to have been there "forever". Regards, Leo From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v13) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Feb 2021 17:30: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: Leo Prikler , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161401497913291 (code B ref 45889); Mon, 22 Feb 2021 17:30:02 +0000 Received: (at 45889) by debbugs.gnu.org; 22 Feb 2021 17:29:39 +0000 Received: from localhost ([127.0.0.1]:57471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEF1R-0003S4-IR for submit@debbugs.gnu.org; Mon, 22 Feb 2021 12:29:39 -0500 Received: from out0.migadu.com ([94.23.1.103]:43658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEF1K-0003Ro-GX for 45889@debbugs.gnu.org; Mon, 22 Feb 2021 12:29:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1614014956; 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=lmHDCD0STo4CfAFMmkavP7iHOeYjZnTqTdlCWMDI2H0=; b=e0nSdEVTDMMb3u7X/8oFe+PLlFk6bf1yGjKov6PaLLBH9VFiquzTkgq8LpddwV4BLk7n6b b8DAN51Suj85zXm6ojVKkvDgTSz2wtBcxzt6845jVvaIIHQ4cYvxMRs34frffzhlZ91mYJ Ic2htSlsioH3kCBdJpTrA39zhP2+eXwy2T3m5aJQJD95205fy/tzu6AZjN3MhwtAqrOtUy NPSWcywHUygi/anixKwofLiDDsc9e8nj9z081MsQzS1v3fO4KW273LzB57CcpE1WI3i4jO XwqkROG9/tT8gcWjVVtzb6xhmsIUDArArBsB7OOD1Ywg/DHq8xHg69cqMu4wHw== 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> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Message-ID: <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> Date: Mon, 22 Feb 2021 12:29:13 -0500 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="gtkrsgeZSeB9mKI86T3M6g6QM35X1X80D" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --gtkrsgeZSeB9mKI86T3M6g6QM35X1X80D Content-Type: multipart/mixed; boundary="ECGx26096zUS6dneWqVZyiUCms7jzavpb"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> Subject: Re: Nextcloud Client (v13) 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> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> In-Reply-To: --ECGx26096zUS6dneWqVZyiUCms7jzavpb Content-Type: multipart/mixed; boundary="------------5C61A9F70C2221494515FB4B" Content-Language: en-US This is a multi-part message in MIME format. --------------5C61A9F70C2221494515FB4B Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! > Still seems pretty sync to me, especially since it's just the client > for now. Circular-dependency when putting it in sync.scm. So we'll keep it as is=20 I guess. > (X) Doubt >=20 > It appears the Nextcloud variant has an added namespace layer, that one= > should easily be able to strip via substitute*. I do wonder where that= > comes from, though, it seems to have been there "forever". No idea! Thanks for fixing the build errors. Also, I cannot package them separately because the build script is not=20 viable. No libraries gets built, except for .o files. Also, INSTALL.txt=20 deals with Windows and MacOS. I have attached v13. Regards, RG. --------------5C61A9F70C2221494515FB4B 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 d4b271d3fcff56c27e6ee0222e688aad4b78a8eb 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 --------------5C61A9F70C2221494515FB4B 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 dd9028ea1babf23ad23c08d19c8146c77e937479 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 | 190 +++++++++++++++++++++++++++++++++++++ 2 files changed, 191 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..d172f3214f --- /dev/null +++ b/gnu/packages/nextcloud.scm @@ -0,0 +1,190 @@ +;;; 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.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 + (let ((keep '( ;; Not available in Guix. + "QProgressIndicator" + "kmessagewidget" "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) + (let* ((qtsolutions (assoc-ref inputs "qtsolutions"))) + (for-each + (lambda (dir) + (copy-recursively + (string-append qtsolutions "/" dir "/src") + (string-append "src/3rdparty/" dir))) + '("qtlockedfile" "qtsingleapplication"))) + (with-directory-excursion "src/gui" + (substitute* `("application.h" "application.cpp") + (("SharedTools::QtSingleApplication") "QtSingleApplicat= ion") + (("slotParseMessage\\(const QString &(msg)?.*\\)") + "slotParseMessage(const QString &msg)"))) + #t)) + (add-after 'unpack '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\\)") + "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-after 'patch-plugin-dirs 'fix-build + (lambda _ + (with-directory-excursion "src/gui" + (substitute* `("application.h" "application.cpp") + (("SharedTools::") + ""))) + #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) + ("qtsolutions" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/qtproject/qt-solutions") + (commit "9568abd142d581b67b86a5f63d823a34b0612702"))) + (file-name + (git-file-name "qtsolutions" "9568abd")) + (sha256 + (base32 "17fnmassflm3vxi0krpr6fff368jy38cby31a48rban4nqqmgx7= n")))) + ("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 --------------5C61A9F70C2221494515FB4B-- --ECGx26096zUS6dneWqVZyiUCms7jzavpb-- --gtkrsgeZSeB9mKI86T3M6g6QM35X1X80D Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYDPp6QUDAAAAAAAKCRBfWBZkf4vlUeFb APoD+CXP++w220kBjRuXYqWN8kR7DLfT4XnLsuVA27jWmgEA8CX8GVEm1Rsv3HVKpGFoq6WdpwO8 0ggJH5agRv/LpwA= =P/W0 -----END PGP SIGNATURE----- --gtkrsgeZSeB9mKI86T3M6g6QM35X1X80D-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v14) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Feb 2021 14:28: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.161409043418931 (code B ref 45889); Tue, 23 Feb 2021 14:28:01 +0000 Received: (at 45889) by debbugs.gnu.org; 23 Feb 2021 14:27:14 +0000 Received: from localhost ([127.0.0.1]:58610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEYef-0004vG-VB for submit@debbugs.gnu.org; Tue, 23 Feb 2021 09:27:14 -0500 Received: from out2.migadu.com ([188.165.223.204]:63066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEYec-0004v4-4e for 45889@debbugs.gnu.org; Tue, 23 Feb 2021 09:27:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1614090427; 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=79n4B4+cc0AwTTNH043H36lG6dU+W3eevCagPbY3csU=; b=YBAsEjTTTaE/hR4qK85ZSBV9VEEA4XuAmYOhgoQbuxCfwHvQqFvQHUqO4O3N3l8E4KUI6n xGIs3o45PSJd+wUkJvS0oazPW242yAMMgIlF0/plBM3Cliy1DLcyuxWnvwAURQA66w2ToW olixSnaZxmAO7Sq6r+cJXyI0sMBDXCIAPYtpKi5DgfMwx9x99k+4fGoVFXRxNBlOihEkha TNhomnIu/2za2eHA5k67rpqDx+1jQQHg7DvBIO1pgQ1goOe5KxOLkMWoAYUoIu7UcyFPUr b9Ooydx0YeNNAtdUUoMXVl05VeC/TzGyU1vJqR6fbxea+wBvk4znrlDXqitzjQ== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan 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> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> Message-ID: Date: Tue, 23 Feb 2021 09:27:04 -0500 MIME-Version: 1.0 In-Reply-To: <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="N11NMcwRwHKEaPU20gjE3k7T3E0Zn2rfT" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --N11NMcwRwHKEaPU20gjE3k7T3E0Zn2rfT Content-Type: multipart/mixed; boundary="C5DVWvrCRd0FD6g9Kmma2kC9OhQQJTedn"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: Subject: Re: Nextcloud Client (v14) 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> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> In-Reply-To: <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> --C5DVWvrCRd0FD6g9Kmma2kC9OhQQJTedn Content-Type: multipart/mixed; boundary="------------D7114CAEBD56A3E1DAB9085B" Content-Language: en-US This is a multi-part message in MIME format. --------------D7114CAEBD56A3E1DAB9085B Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable --------------D7114CAEBD56A3E1DAB9085B 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 d4b271d3fcff56c27e6ee0222e688aad4b78a8eb 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 --------------D7114CAEBD56A3E1DAB9085B 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 b3df8c3b3f5d3e3cc286b95df1928c81edba3556 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 23 Feb 2021 08:24:47 -0500 Subject: [PATCH 2/2] gnu: Add nextcloud-client. * gnu/packages/sync.scm (nextcloud-client): New variable. --- gnu/packages/sync.scm | 148 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index f3d6e9013c..a3a1dda240 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -28,6 +28,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) @@ -40,8 +41,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) @@ -49,14 +53,158 @@ #: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 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 + (let ((keep '( ;; Not available in Guix. + "QProgressIndicator" + "kmessagewidget" "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) + (let* ((qtsolutions (assoc-ref inputs "qtsolutions"))) + (for-each + (lambda (dir) + (copy-recursively + (string-append qtsolutions "/" dir "/src") + (string-append "src/3rdparty/" dir))) + '("qtlockedfile" "qtsingleapplication"))) + (with-directory-excursion "src/gui" + (substitute* `("application.h" "application.cpp") + (("SharedTools::QtSingleApplication") "QtSingleApplicat= ion") + (("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\\)") + "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) + ("qtsolutions" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/qtproject/qt-solutions") + (commit "9568abd142d581b67b86a5f63d823a34b0612702"))) + (file-name + (git-file-name "qtsolutions" "9568abd")) + (sha256 + (base32 "17fnmassflm3vxi0krpr6fff368jy38cby31a48rban4nqqmgx7= n")))) + ("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+)))) + (define-public megacmd (package (name "megacmd") --=20 2.30.1 --------------D7114CAEBD56A3E1DAB9085B-- --C5DVWvrCRd0FD6g9Kmma2kC9OhQQJTedn-- --N11NMcwRwHKEaPU20gjE3k7T3E0Zn2rfT Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYDUQuAUDAAAAAAAKCRBfWBZkf4vlUeFF AQCeuj8dkzad9F4jLAxD+CMAYNEd+7bizlEjIIU3vlKRFAEA+6YRmMvPg9y/KpgppKhNrMaOzFHp V6/8hL/bLaycXAY= =+IJj -----END PGP SIGNATURE----- --N11NMcwRwHKEaPU20gjE3k7T3E0Zn2rfT-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v14) Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Feb 2021 17:59: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: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.16141031397752 (code B ref 45889); Tue, 23 Feb 2021 17:59:02 +0000 Received: (at 45889) by debbugs.gnu.org; 23 Feb 2021 17:58:59 +0000 Received: from localhost ([127.0.0.1]:60472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEbxb-00020y-9B for submit@debbugs.gnu.org; Tue, 23 Feb 2021 12:58:59 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:29294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEbxZ-00020p-Gg for 45889@debbugs.gnu.org; Tue, 23 Feb 2021 12:58:58 -0500 Received: from nijino.local (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DlRcm55Z0z3xbj; Tue, 23 Feb 2021 18:58:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1614103128; bh=E6u2wJNej5lhIIoX29KF67Pk0e6ZQKAIbqD7eCDDjY8=; h=Subject:From:To:Date:In-Reply-To:References; b=WvG6HWsF00EWFOvx1fQ7zpWwa4hhej0hQYaFrAYVTS6zI8AmOqorkcG1KhITn/xcq /Ah36wOSS7cpu3Pui2BqM8LAJYf9gHzzId/sOVSEh5paCF3Bklrgewtd61SKvghz0B mn4521w4zpykfkUS9GHhXY8HqvBMq2CRX0sS0Cm0= Message-ID: From: Leo Prikler Date: Tue, 23 Feb 2021 18:58:48 +0100 In-Reply-To: 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> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Raghav, Am Dienstag, den 23.02.2021, 09:27 -0500 schrieb Raghav Gururajan: > + (let* ((qtsolutions (assoc-ref inputs "qtsolutions"))) > + (for-each > + (lambda (dir) > + (copy-recursively > + (string-append qtsolutions "/" dir "/src") > + (string-append "src/3rdparty/" dir))) > + '("qtlockedfile" "qtsingleapplication"))) > + (with-directory-excursion "src/gui" > + (substitute* `("application.h" "application.cpp") > + (("SharedTools::QtSingleApplication") > "QtSingleApplication") > + (("slotParseMessage\\(const QString &(msg)?.*\\)") > + "slotParseMessage(const QString &msg)"))) Being the one who helped review this, I of course know, what it does, but others might not, so this probably deserves a (short) comment. > + ("qtsolutions" > + ,(origin > + (method git-fetch) > + (uri > + (git-reference > + (url "https://github.com/qtproject/qt-solutions") > + (commit "9568abd142d581b67b86a5f63d823a34b0612702"))) > + (file-name > + (git-file-name "qtsolutions" "9568abd")) > + (sha256 > + (base32 > "17fnmassflm3vxi0krpr6fff368jy38cby31a48rban4nqqmgx7n")))) I'm still not convinced, that this can't be made a package or perhaps multiple packages, one per "solution". Each of the folder seems to contain a project file, which to be fair do have some non-Unix-related install declarations, but it should at least install a statically linked package *somewhere*. We can go from there. Alternatively, as I see this as a source, that will get copied around in the same way I copied libgd from gedit, you can at least extract the origin into a function in qt.scm, potentially named qt-solutions. Regards, Leo From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v15) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Mar 2021 06:02: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: Leo Prikler , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161526967012609 (code B ref 45889); Tue, 09 Mar 2021 06:02:02 +0000 Received: (at 45889) by debbugs.gnu.org; 9 Mar 2021 06:01:10 +0000 Received: from localhost ([127.0.0.1]:45416 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJVQX-0003HE-BF for submit@debbugs.gnu.org; Tue, 09 Mar 2021 01:01:10 -0500 Received: from out2.migadu.com ([188.165.223.204]:42715) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJVQT-0003Gf-SX for 45889@debbugs.gnu.org; Tue, 09 Mar 2021 01:01:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615269659; 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=AfT2XnWthwP8SS0C95P/9u6qiM3d83jJEuBj5Uc5bxM=; b=GcamaQTgD9KJopY2azOj/9zMykTf0D5inVoMY06HciPVIzWhR7a0/5zKW7t9mZHw28l3Fq RICc8wCYcLEEaHK7zB5XRaeIt5ZaYarUpDmYw9DYIul9YLR00a02mD5D4JNi0G7+cfqrUg 67hQVlF+Fe8PH+QFTmXANM+rZhOZQ1h5uI4V/tVBVkMrzA3YBFAga54ue8/qJka+9Witcf eJvzLwR18z0Q1E5SEuBhRvhxm9EhVcvcz3qjeKig0ORztPV+zQOBVj0rtCBZtul52BwEin RNNijmLAonAb41kCo92MDdTG0VtE/U2Yr+DyS9ZeXLevK3S4KwDa9r7EObCitA== 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> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Message-ID: Date: Tue, 9 Mar 2021 01:00:57 -0500 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="tuECwmRfA0o5AGWPm1zknAhjzu5LOP7J0" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --tuECwmRfA0o5AGWPm1zknAhjzu5LOP7J0 Content-Type: multipart/mixed; boundary="brIX6l409CyyPPlmx8pxa0ekh8oYCtegY"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: Subject: Re: Nextcloud Client (v15) 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> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> In-Reply-To: --brIX6l409CyyPPlmx8pxa0ekh8oYCtegY Content-Type: multipart/mixed; boundary="------------734CEDA8AE6584208D1214E7" Content-Language: en-US This is a multi-part message in MIME format. --------------734CEDA8AE6584208D1214E7 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! > I'm still not convinced, that this can't be made a package or perhaps > multiple packages, one per "solution". Each of the folder seems to > contain a project file, which to be fair do have some non-Unix-related > install declarations, but it should at least install a statically > linked package *somewhere*. We can go from there. >=20 > Alternatively, as I see this as a source, that will get copied around > in the same way I copied libgd from gedit, you can at least extract the= > origin into a function in qt.scm, potentially named qt-solutions. In attached v15, I have: [1] Packaged QtSolutions. [2] Removed QtLockedFile, QtSingleApplication, and KMessageWidget from=20 3rdparty. [3] Patched the source to use KMessageWidget from KWidgetsAddons, and,=20 to use QtLockedFile and QtSingleApplication from QtSolutions. \o/ Regards, RG. --------------734CEDA8AE6584208D1214E7 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 2630078c89b3aedd305f20754502dc32467a947c 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..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 --------------734CEDA8AE6584208D1214E7 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 0b33f8d10fc3de8652932b46a485b78e7aa305c3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 7 Mar 2021 10:44:55 -0500 Subject: [PATCH 2/3] gnu: Add qtsolutions. * gnu/packages/qt.scm (qtsolutions): New variable. --- gnu/packages/qt.scm | 110 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c49251053d..66483f1c48 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -105,6 +105,116 @@ #: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/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") + "") + ;; Generate libraries directly in output. + (("\\$\\$PWD") + (assoc-ref outputs "out"))) + ;; Disable building of examples. + (substitute* (find-files "." "\\.pro$") + (("SUBDIRS\\+=3Dexamples") + "")) + ;; Fix deprecated functions. + (substitute* "qtsoap/src/qtsoap.cpp" + (("toAscii") + "toLatin1")) + #t)) + (replace 'configure + (lambda _ + (for-each (lambda (solution) + (with-directory-excursion solution + (invoke "./configure" "-library") + (invoke "qmake"))) + (list + "qtlockedfile" + "qtpropertybrowser" + "qtservice" + "qtsingleapplication" + "qtsoap")) + #t)) + (replace 'build + (lambda _ + (for-each (lambda (solution) + (with-directory-excursion solution + (invoke "make"))) + (list + "qtlockedfile" + "qtpropertybrowser" + "qtservice" + "qtsingleapplication" + "qtsoap")) + #t)) + (replace 'install + (lambda args + (apply (assoc-ref copy:%standard-phases 'install) + #:install-plan + '(("qtlockedfile/src" "include/qtlockedfile" + #:include-regexp ("\\.h$")) + ("qtpropertybrowser/src" "include/qtpropertybrow= ser" + #:include-regexp ("\\.h$")) + ("qtservice/src" "include/qtservice" + #:include-regexp ("\\.h$")) + ("qtsingleapplication/src" "include/qtsingleappl= ication" + #:include-regexp ("\\.h$")) + ("qtsoap/src" "include/qtsoap" + #:include-regexp ("\\.h$"))) + args)))))) + (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 qite (let ((commit "75fb3b6bbd5c6a5a8fc35e08a6efbfb588ed546a") (revision "74")) --=20 2.30.1 --------------734CEDA8AE6584208D1214E7 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 7bc3348585c325208fab89232f720d81fbaa5d0a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 23 Feb 2021 08:24:47 -0500 Subject: [PATCH 3/3] gnu: Add nextcloud-client. * gnu/packages/sync.scm (nextcloud-client): New variable. --- gnu/packages/sync.scm | 159 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 76b822ecbc..964746b1b2 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -28,6 +28,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) @@ -40,8 +41,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) @@ -49,14 +53,169 @@ #: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 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 + (let* ((keep + ;; Not available in Guix. + (list + "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" + ((" \\.\\./3rdparty/qtlockedfile/?.*") + "") + ((" \\.\\./3rdparty/qtsingleapplication/?.*") + "") + ((" \\.\\./3rdparty/kmessagewidget/?.*") + "") + ((" list\\(APPEND 3rdparty_SRC \\.\\./3rdparty/?.*\\)= ") + "") + (("\\$\\{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/")) + (("\\$\\{synclib_NAME\\}") + (string-append "${synclib_NAME} " + "QtSolutions_LockedFile " + "QtSolutions_SingleApplication " + "KF5WidgetsAddons"))) + (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 + ;; All ThirdParty (except QtProgressIndicator) + license:lgpl2.1+ + ;; Others + license:gpl2+)))) + (define-public megacmd (package (name "megacmd") --=20 2.30.1 --------------734CEDA8AE6584208D1214E7-- --brIX6l409CyyPPlmx8pxa0ekh8oYCtegY-- --tuECwmRfA0o5AGWPm1zknAhjzu5LOP7J0 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYEcPGQUDAAAAAAAKCRBfWBZkf4vlUeW+ AP9wEUdpRD789Xt1uoIQ25yFgzMO9irLZFGWB9r9SVW8RAD6Au1ulioVM47lWhKksGWGXV2ZAtye aQVs7SgZ4R2vcQM= =p4dC -----END PGP SIGNATURE----- --tuECwmRfA0o5AGWPm1zknAhjzu5LOP7J0-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v15) Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Mar 2021 07:04: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: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161527339528722 (code B ref 45889); Tue, 09 Mar 2021 07:04:02 +0000 Received: (at 45889) by debbugs.gnu.org; 9 Mar 2021 07:03:15 +0000 Received: from localhost ([127.0.0.1]:45479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJWOh-0007TC-0l for submit@debbugs.gnu.org; Tue, 09 Mar 2021 02:03:15 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:27166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJWOe-0007T1-Pc for 45889@debbugs.gnu.org; Tue, 09 Mar 2021 02:03:13 -0500 Received: from nijino.local (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DvmPn49dcz1LLyL; Tue, 9 Mar 2021 08:03:09 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4DvmPn49dcz1LLyL DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1615273389; bh=UievUwLwDL9REDXB47FD/HRFPKpEm7Yi1mb99hIrOto=; h=Subject:From:To:Date:In-Reply-To:References:From; b=ijQZG9zASz68V9rLrS/H3vhh3HiYvAjvkhlKkbP5AcVUOTPWxUFkn6P/KXSI/DRlF mV+NSUxkmqu3MtXGrqfsCaXhwPH2wKLUhUzOPKbDiSfdbBZsbGJW54CoTnEal5sRJ3 iLp125fVSLyPae2ZHJNlXsgYIAuB4b17GMKXda2w= Message-ID: <31701971d849e72506ed4105c92b2ad85d3aa6be.camel@student.tugraz.at> From: Leo Prikler Date: Tue, 09 Mar 2021 08:03:08 +0100 In-Reply-To: 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> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Raghav, > Subject: [PATCH 2/3] gnu: Add qtsolutions. > + (version > + (git-version "0" revision commit)) > + (file-name > + (git-file-name name version)) > + (("qt5") > + "qt") > + (("-head") > + "") > + (("SUBDIRS\\+=examples") > + "")) 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. > + (("toAscii") > + "toLatin1")) Why not to UTF-8? Is the input already UTF-8 and we want to convert it to a single-byte character set? > + (("\\$\\$PWD") > + (assoc-ref outputs "out"))) You should install the shared libraries in the install phase. > + (list > + "qtlockedfile" > + "qtpropertybrowser" > + "qtservice" > + "qtsingleapplication" > + "qtsoap") Use '(...) for fixed input. > Subject: [PATCH 3/3] gnu: Add nextcloud-client. > + (commit > + (string-append "v" version))) > + ((" \\.\\./3rdparty/qtlockedfile/?.*") > + "") > + ((" \\.\\./3rdparty/qtsingleapplication/?.*") > + "") > + ((" \\.\\./3rdparty/kmessagewidget/?.*") > + "") > + ((" list\\(APPEND 3rdparty_SRC > \\.\\./3rdparty/?.*\\)") > + "") 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]*. > + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtlockedf > ile") > + (string-append (assoc-ref inputs "qtsolutions") > + "/include/qtlockedfile/")) > + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtsinglea > pplication") > + (string-append (assoc-ref inputs "qtsolutions") > + "/include/qtsingleapplication/")) > + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/kmessagew > idget") > + (string-append (assoc-ref inputs "kwidgetsaddons") > + "/include/KF5/KWidgetsAddons/")) LGTM, but probably deserves a comment. Also, you might skip the stuff leading up to /3rdparty, i.e. have ".*/3rdparty/qtlockedfile", etc. Perhaps this gives you enough wiggle room to do lockedfile and single application on the same line, but it doesn't hurt if it doesn't. > + (("\\$\\{synclib_NAME\\}") > + (string-append "${synclib_NAME} " > + "QtSolutions_LockedFile " > + "QtSolutions_SingleApplication " > + "KF5WidgetsAddons"))) Definitely deserves a comment and perhaps a less broad match? > + (substitute* '("application.h" "application.cpp") > + (("SharedTools::QtSingleApplication") > + "QtSingleApplication") > + (("slotParseMessage\\(const QString &(msg)?.*\\)") > + "slotParseMessage(const QString &msg)"))) Also deserves a comment about QtSingleApplication differences. > + (string-append "set(_install_dir > \"${CMAKE_INSTALL_PREFIX}" > + "/share/dbus-1/services\")"))) Would the raw string here exceed a line? > + ;; All ThirdParty (except QtProgressIndicator) > + license:lgpl2.1+ This is now just qtokenizer, right? Regards, Leo From unknown Sat Aug 16 18:44:36 2025 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. From: Raghav Gururajan 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-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v16) Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Mar 2021 11:40: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: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161528994731271 (code B ref 45889); Tue, 09 Mar 2021 11:40:02 +0000 Received: (at 45889) by debbugs.gnu.org; 9 Mar 2021 11:39:07 +0000 Received: from localhost ([127.0.0.1]:45797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJahf-00088J-2M for submit@debbugs.gnu.org; Tue, 09 Mar 2021 06:39:07 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:12094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJahd-000889-AF for 45889@debbugs.gnu.org; Tue, 09 Mar 2021 06:39:06 -0500 Received: from nijino.local (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DvtX56697z1LBCm; Tue, 9 Mar 2021 12:39:01 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4DvtX56697z1LBCm DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1615289942; bh=O7H/2FCQCkBotxrm2WUETTROQhcyX6d/XGL8/66kjKo=; h=Subject:From:To:Date:In-Reply-To:References:From; b=ABTRcUjRPY+YC9gD/YU1H5VpseciVCRr2p5cWfrNium0lU48HYWfr5nypSlKdtg5d E1tioUdtxl0fvGb3nuWN5jk4Mlu/PbuQxxU/etyxdqHE6/L4qlhbyfi2KimOeovzbg przGGfEbA5u+T+/cRLRPnw6wjWp82vhBWTrKgKTs= Message-ID: From: Leo Prikler Date: Tue, 09 Mar 2021 12:39:01 +0100 In-Reply-To: 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> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Raghav, Mostly LGTM. Am Dienstag, den 09.03.2021, 05:50 -0500 schrieb Raghav Gururajan: > > 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 > wherever synclib gets linked. Also, this patch is compatible with > current master, which is different from this version. Perhaps the comment should reflect that a little better. You might also want to expand that during the unvendoring in the snippet, so that it's less confusing. > + `(("src" ,(string-append > "include/" solution) > + #:include-regexp ("\\.h$")) I think you should unvendor dependencies between the solutions, so that you can put them in "include/" directly (like putting the solutions in "/lib"). Regards, Leo From unknown Sat Aug 16 18:44:36 2025 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 12:30: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.16152929603533 (code B ref 45889); Tue, 09 Mar 2021 12:30:01 +0000 Received: (at 45889) by debbugs.gnu.org; 9 Mar 2021 12:29:20 +0000 Received: from localhost ([127.0.0.1]:45878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJbUB-0000uq-Tj for submit@debbugs.gnu.org; Tue, 09 Mar 2021 07:29:20 -0500 Received: from out1.migadu.com ([91.121.223.63]:33577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJbU5-0000ud-V5 for 45889@debbugs.gnu.org; Tue, 09 Mar 2021 07:29:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615292948; 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=OmGLH3KGIg1Nm09yo74B3x5DOseAuYhv5Q+Zs5xKuPw=; b=notIWiK0Wr3VfwIU2yrruH7EGPpKEhpW3FUtWJRFRCXtlzZOwzAGvq7BApbym7uHMQBado KDmqTcJjN53u2AOpTKS2AYCfKiT3VSvCIwAEcthVkZ/D9uQaVzwzPmv5XOr30p9AlHn1Xp rbG9Qhwe8WWI7qRZGJGJLv+Hx5wZQTp9iwWF8K/qneQhfLBm72LI5pZCUViVtCgzJ8Pwwd smdqjGg93WVZNPM9FlVdhRXT9AGHhoYqqrU6DtRB1TRDnBUijWwKiPJzht7VEY6rpUSrvZ A5mwph56UsPPT+LrfOdE/dIjebhNjEIU6Zj7jsIzZt3q98bPWevz6mlR46Joyw== References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@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. From: Raghav Gururajan Message-ID: <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> Date: Tue, 9 Mar 2021 07:29:05 -0500 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="KdxQDh7O0ZHGYw74oCs2hpAP4eVBhCk8Q" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --KdxQDh7O0ZHGYw74oCs2hpAP4eVBhCk8Q Content-Type: multipart/mixed; boundary="0Q7R5X4OQEf0hBIrdUrM6o9Vn1JXrWdWJ"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> Subject: Re: Nextcloud Client (v16) 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> In-Reply-To: --0Q7R5X4OQEf0hBIrdUrM6o9Vn1JXrWdWJ Content-Type: multipart/mixed; boundary="------------97675E0BB44981AB8466FE1D" Content-Language: en-US This is a multi-part message in MIME format. --------------97675E0BB44981AB8466FE1D Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! > Perhaps the comment should reflect that a little better. You might > also want to expand that during the unvendoring in the snippet, so that= > it's less confusing. Done. > I think you should unvendor dependencies between the solutions, so that= > you can put them in "include/" directly (like putting the solutions in > "/lib"). Done. Please find the attached v17. Regards, RG. --------------97675E0BB44981AB8466FE1D 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 --------------97675E0BB44981AB8466FE1D 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 a957e967b10cb1ad87e5e01239b90b954f9eb532 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 | 95 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 11e69ff5db..96efbce7fc 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -105,6 +105,101 @@ #: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://github.com/qtproject/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 + ;; Remove an redundant header file, + ;; before it gets attempted for installation. + (delete-file "qtsingleapplication/src/qtlockedfile.h") + (for-each (lambda (solution) + (with-directory-excursion solution + (apply (assoc-ref copy:%standard-phases 'in= stall) + #:install-plan + '(("src" "include" + #: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 --------------97675E0BB44981AB8466FE1D 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 7264b154be9d54b451bb02fbd2b2fc8c8edf91e2 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 | 162 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index d7c9009f3b..cfeb5739fd 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,173 @@ #: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 references of deleted 3rdparties. + (("[ \t]*\\.\\./3rdparty/qtlockedfile/?.*\\.cpp") + "") + (("[ \t]*\\.\\./3rdparty/qtsingleapplication/?.*\\.cpp"= ) + "") + (("[ \t]*\\.\\./3rdparty/kmessagewidget/?.*\\.cpp") + "") + (("[ \t]*list\\(APPEND 3rdparty_SRC \\.\\./3rdparty/?.*= \\)") + "") + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtlockedfile"= ) + "") + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtsingleappli= cation") + "") + ;; Patch include reference of KMessageWidget, + ;; to point to KWidgetsAddons, instead of 3rdparty. + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/kmessagewidge= t") + (string-append (assoc-ref inputs "kwidgetsaddons") + "/include/KF5/KWidgetsAddons/")) + ;; Link libraries from inputs, that were deleted in 3rd= party, + ;; to wherever synclib gets linked. + (("\\$\\{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) + ("desktop-file-utils" ,desktop-file-utils) + ("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) + ("xdg-utils" ,xdg-utils) + ("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 --------------97675E0BB44981AB8466FE1D-- --0Q7R5X4OQEf0hBIrdUrM6o9Vn1JXrWdWJ-- --KdxQDh7O0ZHGYw74oCs2hpAP4eVBhCk8Q Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYEdqEQUDAAAAAAAKCRBfWBZkf4vlUVQG AP9v6xTOvSMG3tQjBI8vvSudtNzO8WA7/2db6cKc+V/0bQD/dXNKfVSRHbmq3LO+J+hMSTovGB2t 18yepkWq5JOeKww= =nBVZ -----END PGP SIGNATURE----- --KdxQDh7O0ZHGYw74oCs2hpAP4eVBhCk8Q-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v17) Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Mar 2021 12:44: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: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161529382312867 (code B ref 45889); Tue, 09 Mar 2021 12:44:01 +0000 Received: (at 45889) by debbugs.gnu.org; 9 Mar 2021 12:43:43 +0000 Received: from localhost ([127.0.0.1]:45891 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJbiB-0003LS-4E for submit@debbugs.gnu.org; Tue, 09 Mar 2021 07:43:43 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:7963) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJbi8-0003LJ-Ex for 45889@debbugs.gnu.org; Tue, 09 Mar 2021 07:43:41 -0500 Received: from nijino.local (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4Dvvyd0YJRz3wNk; Tue, 9 Mar 2021 13:43:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1615293817; bh=TPjI11fqhAq2FdC6/T0TumlMIltVWZjlJE8BEwouLT0=; h=Subject:From:To:Date:In-Reply-To:References; b=rYV9Qc5gmK9jrvL3h48zNrDq6PLtXhQzpKtZN2xbyPbEwgc8jWijQMGKrKPMSIETy Ep2vwE1rAVROJNL1QXIBSHfyQF3VCg0o855v2KcfaXKHyXoRtXwLBrU3z29Q3MYyFT E9NfJuZc9EfRgIVAlUjpF9IIKCRygou2k1ZLXHS0= Message-ID: <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> From: Leo Prikler Date: Tue, 09 Mar 2021 13:43:36 +0100 In-Reply-To: <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@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> <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Am Dienstag, den 09.03.2021, 07:29 -0500 schrieb Raghav Gururajan: > Hi Leo! > > > Perhaps the comment should reflect that a little better. You might > > also want to expand that during the unvendoring in the snippet, so > > that > > it's less confusing. > > Done. The comment certainly improved FSVO improved, but it somehow does not reduce my bikeshedding mood. In particular, I feel like we ought to do this in the snippet. > > I think you should unvendor dependencies between the solutions, so > > that > > you can put them in "include/" directly (like putting the solutions > > in > > "/lib"). > > Done. You just masked an install error without actually unvendoring dependencies. Regards, Leo From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v18) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Mar 2021 15:17: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.161530299129562 (code B ref 45889); Tue, 09 Mar 2021 15:17:01 +0000 Received: (at 45889) by debbugs.gnu.org; 9 Mar 2021 15:16:31 +0000 Received: from localhost ([127.0.0.1]:47707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJe5y-0007gf-Nf for submit@debbugs.gnu.org; Tue, 09 Mar 2021 10:16:31 -0500 Received: from out0.migadu.com ([94.23.1.103]:43075) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJe5t-0007g1-SD for 45889@debbugs.gnu.org; Tue, 09 Mar 2021 10:16:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615302979; 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=eA2y12eIuLBa0KMDcN7+Vzeg5UStL7eE5gxvQezI/rE=; b=DvnT0T9wnfppakVoLQYWAGSTtA7vM4RrMHndob4ANAJ56+BkYxFVrvRLR6jBkTTUNabTNv WMUbQshswPodjWZVnSQLJpOXfmAC/4scEiEnG+WSggVgXZhsV0VcBbI6Ic95lpJxH4tyhU uyk4G7gzq8DtbyLbbG8R3DYQfmshYiqEgbcvNPmk0Uk2oRV6Sj/Vj/mV3lETbvNEbOiygY wb/l3D5HK+Ue0Gf6E1sMTD+XPmRbKHe5oHPzhQJNaf+edlm+/ppbvUhK5QxV3BDpgxDkch /fsmRtEn9+tTiTYm1/kF6s9p+sR2VrHpXJkI8LjnkkhtK/IIH+cRJ0nfXGfKSQ== References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@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> <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Message-ID: <899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name> Date: Tue, 9 Mar 2021 10:16:17 -0500 MIME-Version: 1.0 In-Reply-To: <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="XbOLEGcWrDZE9FQLEsqdhWpYi6CdyXyVy" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --XbOLEGcWrDZE9FQLEsqdhWpYi6CdyXyVy Content-Type: multipart/mixed; boundary="0AyAukVvB2FmliSzHdEDOVlSDVPL3PI83"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: <899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name> Subject: Re: Nextcloud Client (v18) References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@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> <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> In-Reply-To: <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> --0AyAukVvB2FmliSzHdEDOVlSDVPL3PI83 Content-Type: multipart/mixed; boundary="------------6DA635B4E53D6D526F390CE0" Content-Language: en-US This is a multi-part message in MIME format. --------------6DA635B4E53D6D526F390CE0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! > The comment certainly improved FSVO improved, but it somehow does not > reduce my bikeshedding mood. In particular, I feel like we ought to do= > this in the snippet. Moved to snippet. > You just masked an install error without actually unvendoring > dependencies. Done. Please find the attached v18. Regards, RG. --------------6DA635B4E53D6D526F390CE0 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 --------------6DA635B4E53D6D526F390CE0 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 583680270594522b0061d8c5a0f13067180de7a8 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 | 120 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 11e69ff5db..4ff1e6a005 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -105,6 +105,126 @@ #: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://github.com/qtproject/qt-solutions") + (commit commit))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "17fnmassflm3vxi0krpr6fff368jy38cby31a48rban4nqqmgx7n"= )) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + ;; Unvendor QtLockFile from QtSingleApplication. + `(begin + (with-directory-excursion "qtsingleapplication/src" + (for-each delete-file + (find-files "." "qtlockedfile.*\\.(h|cpp)")) + (substitute* "qtsingleapplication.pri" + ;; Add include path of LockedFile. + (("INCLUDEPATH \\+=3D") + "INCLUDEPATH +=3D ../../qtlockedfile/src") + ;; Link library of LockedFile. + (("LIBS \\+=3D") + "LIBS +=3D -lQtSolutions_LockedFile")) + (substitute* '("qtlocalpeer.h" "qtlocalpeer.cpp") + ;; Remove references to deleted LockedFile sources. + (("#include \"qtlockedfile.cpp\"") + "") + (("#include \"qtlockedfile_win.cpp\"") + "") + (("#include \"qtlockedfile_unix.cpp\"") + "") + ;; Fix LockedFile API. + (("QtLP_Private::QtLockedFile") + "QtLockedFile"))) + #t)))) + (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" "include" + #: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 --------------6DA635B4E53D6D526F390CE0 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 573af53f9a5b69b857daefe3d6471eef42783782 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 | 158 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index d7c9009f3b..875af6da5a 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,169 @@ #: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))))) + (with-directory-excursion "src/gui" + (substitute* "CMakeLists.txt" + ;; Remove references of deleted 3rdparties. + (("[ \t]*\\.\\./3rdparty/qtlockedfile/?.*\\.cpp") + "") + (("[ \t]*\\.\\./3rdparty/qtsingleapplication/?.*\\.cpp") + "") + (("[ \t]*\\.\\./3rdparty/kmessagewidget/?.*\\.cpp") + "") + (("[ \t]*list\\(APPEND 3rdparty_SRC \\.\\./3rdparty/?.*\\= )") + "") + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtlockedfile") + "") + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtsingleapplica= tion") + "") + ;; Patch include reference of KMessageWidget, + ;; to point to KWidgetsAddons, instead of 3rdparty. + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/kmessagewidget"= ) + "@kwidgetsaddons@/include/KF5/KWidgetsAddons/") + ;; Link libraries from inputs, that were deleted in 3rdpa= rty, + ;; to wherever synclib gets linked. + (("\\$\\{synclib_NAME\\}") + (string-append "${synclib_NAME} " + "QtSolutions_LockedFile " + "QtSolutions_SingleApplication " + "KF5WidgetsAddons"))) + ;; Fix compatibility with QtSingleApplication from QtSoluti= ons. + (substitute* '("application.h" "application.cpp") + (("SharedTools::QtSingleApplication") + "QtSingleApplication") + (("slotParseMessage\\(const QString &(msg)?.*\\)") + "slotParseMessage(const QString &msg)"))) + #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-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) + ("desktop-file-utils" ,desktop-file-utils) + ("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) + ("xdg-utils" ,xdg-utils) + ("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 --------------6DA635B4E53D6D526F390CE0-- --0AyAukVvB2FmliSzHdEDOVlSDVPL3PI83-- --XbOLEGcWrDZE9FQLEsqdhWpYi6CdyXyVy Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYEeRQQUDAAAAAAAKCRBfWBZkf4vlUSEz AQCJ3dhjlyUOhJirNLG2v4rWBsx9nsi76Kmi5tE9gGmDVgEAtp2SpCvhzY54WhTLrBTiOcq+3syE xmR/CvjiB35Oagg= =ss0H -----END PGP SIGNATURE----- --XbOLEGcWrDZE9FQLEsqdhWpYi6CdyXyVy-- From unknown Sat Aug 16 18:44:36 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Raghav Gururajan Subject: bug#45889: closed (Re: Nextcloud Client (v18)) Message-ID: References: <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> X-Gnu-PR-Message: they-closed 45889 X-Gnu-PR-Package: guix-patches Reply-To: 45889@debbugs.gnu.org Date: Tue, 09 Mar 2021 23:25:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1615332302-10297-1" This is a multi-part message in MIME format... ------------=_1615332302-10297-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #45889: Nextcloud Client which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 45889@debbugs.gnu.org. --=20 45889: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D45889 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1615332302-10297-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 45889-done) by debbugs.gnu.org; 9 Mar 2021 23:24:16 +0000 Received: from localhost ([127.0.0.1]:48221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJli4-0002f4-93 for submit@debbugs.gnu.org; Tue, 09 Mar 2021 18:24:16 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:60129) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJli1-0002es-9l for 45889-done@debbugs.gnu.org; Tue, 09 Mar 2021 18:24:14 -0500 Received: from nijino.local (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DwB9j6Y3fz1LLyL; Wed, 10 Mar 2021 00:24:09 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4DwB9j6Y3fz1LLyL DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1615332250; bh=ZrTlzcUyIyQqbsQme/tUPbDHzNOsZjEVSowKNQ7Dt3E=; h=Subject:From:To:Date:In-Reply-To:References:From; b=Iul0UJr1w/gRmUer80K3KA9iY3XUjUs0VQCutVRHCEGea8jCGGC4OF1SjR+OVdBzu Kc2WQcTBkxiBiAawz0/y0claVR7bQWGMF+scuaNtOfA/bsjGOoQ99AFulAItPRoBQe 3cZ1+oRxYZ9//xQkemG9TyIuAt5A4w34RxJ8Ibfs= Message-ID: <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> Subject: Re: Nextcloud Client (v18) From: Leo Prikler To: Raghav Gururajan , 45889-done@debbugs.gnu.org Date: Wed, 10 Mar 2021 00:24:09 +0100 In-Reply-To: <899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name> References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@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> <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> <899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45889-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Am Dienstag, den 09.03.2021, 10:16 -0500 schrieb Raghav Gururajan: > Hi Leo! > > > The comment certainly improved FSVO improved, but it somehow does > > not > > reduce my bikeshedding mood. In particular, I feel like we ought > > to do > > this in the snippet. > > Moved to snippet. > > > You just masked an install error without actually unvendoring > > dependencies. > > Done. > > Please find the attached v18. I've applied some cosmetic and less cosmetic changes, reviewed the licenses and pushed nextcloud as 82a2f182c59cd9adef4991e0adfb575fec95e52d. Regards, Leo ------------=_1615332302-10297-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 15 Jan 2021 10:09:50 +0000 Received: from localhost ([127.0.0.1]:39937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0M36-0000jW-0X for submit@debbugs.gnu.org; Fri, 15 Jan 2021 05:09:50 -0500 Received: from lists.gnu.org ([209.51.188.17]:38804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0M32-0000jN-Dw for submit@debbugs.gnu.org; Fri, 15 Jan 2021 05:09:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0M32-0003nY-9R for guix-patches@gnu.org; Fri, 15 Jan 2021 05:09:40 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:34147) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0M2z-0000w1-5N for guix-patches@gnu.org; Fri, 15 Jan 2021 05:09:40 -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 25E9DFF81B for ; Fri, 15 Jan 2021 10:09:32 +0000 (UTC) To: guix-patches@gnu.org From: Raghav Gururajan Subject: Nextcloud Desktop Message-ID: Date: Fri, 15 Jan 2021 05:09:31 -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="------------0E158249476BFC847837A61B" Content-Language: en-US Received-SPF: pass client-ip=217.70.183.199; envelope-from=rg@raghavgururajan.name; helo=relay9-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) This is a multi-part message in MIME format. --------------0E158249476BFC847837A61B Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Hello Guix! Please find the attached patch-set to add Nextcloud desktop application to guix. Regards, RG. --------------0E158249476BFC847837A61B 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 --------------0E158249476BFC847837A61B 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 aa2f1809b0d7250d10086211cd23a6e5a4e86d94 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 | 145 +++++++++++++++++++++++++++++++++++++ 2 files changed, 146 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..e8280feace --- /dev/null +++ b/gnu/packages/nextcloud.scm @@ -0,0 +1,145 @@ +;;; 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") + (("\\$\\{KDE_INSTALL_KSERVICES5DIR\\}") + (string-append + (assoc-ref outputs "out") + "/lib/qt5/plugins")) + (("\\$\\{KDE_INSTALL_PLUGINDIR\\}") + (string-append + (assoc-ref outputs "out") + "/lib/qt5/plugins"))) + #t)) + (add-before 'build 'gate + (lambda _ + #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) + ("qtwebengine" ,qtwebengine) + ("qtwebkit" ,qtwebkit) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) + (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 --------------0E158249476BFC847837A61B-- ------------=_1615332302-10297-1-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v18) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 03:48: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-done@debbugs.gnu.org Received: via spool by 45889-done@debbugs.gnu.org id=D45889.16153480222483 (code D ref 45889); Wed, 10 Mar 2021 03:48:01 +0000 Received: (at 45889-done) by debbugs.gnu.org; 10 Mar 2021 03:47:02 +0000 Received: from localhost ([127.0.0.1]:48409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJpoL-0000dp-R4 for submit@debbugs.gnu.org; Tue, 09 Mar 2021 22:47:02 -0500 Received: from out1.migadu.com ([91.121.223.63]:10444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJpoH-0000dV-Q2 for 45889-done@debbugs.gnu.org; Tue, 09 Mar 2021 22:47:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615348016; 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=9gzHsEV8Kx6/4pr2gZ6KDgwwjqb43Ak2JReS/kcOX60=; b=Ux4acj1EXXuUae/axCP1PZmfb+5sB1feoaX2F/iwhPwAXQ1N8ITYQiD7nSTfpfEkTUPOvs r4tORo+ZAMynpiW+it4F93yl1CwK1uRZHi1vEqmIDXwY61bkGXibCeYgCjwUthCJV9DkMb 9h5d05ulIGK+kYnHukpUoi/StOdKlMGyg/PxKBKV/sOWpUX2q3GHJ+QQ/BCD14s1gyZt54 Yanzir+yoDK51GDuYq/GhET+E1+ZP7ciTooNwWFNLE62Cv6fVXPACN2sXgeiJWnyeQWeyB IdtD1Jnt1ktnq98R+KZT6b36PD4190I0vIrE9cfIVhDls5wEkOvG7T5m6dZk7Q== References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> <31701971d849e72506ed4105c92b2ad85d3aa6be.camel@student.tugraz.at> <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> <899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name> <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Message-ID: <69ce413a-cb2b-b0de-d12d-0c9bfa353ade@raghavgururajan.name> Date: Tue, 9 Mar 2021 22:46:53 -0500 MIME-Version: 1.0 In-Reply-To: <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="0uOntyeOR6bdCM1X2zMSb8IVj8Mk30xlE" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0uOntyeOR6bdCM1X2zMSb8IVj8Mk30xlE Content-Type: multipart/mixed; boundary="RutWaeKA4OFVkskgvdwf2bgTPUulzDnQW"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889-done@debbugs.gnu.org Message-ID: <69ce413a-cb2b-b0de-d12d-0c9bfa353ade@raghavgururajan.name> Subject: Re: Nextcloud Client (v18) References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@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> <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> <899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name> <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> In-Reply-To: <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> --RutWaeKA4OFVkskgvdwf2bgTPUulzDnQW Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hi Leo! >> Please find the attached v18. > I've applied some cosmetic and less cosmetic changes, reviewed the > licenses and pushed nextcloud as > 82a2f182c59cd9adef4991e0adfb575fec95e52d. Thanks so much for helping me with every step of the way. I appreciate=20 it. :-) Regards, RG. --RutWaeKA4OFVkskgvdwf2bgTPUulzDnQW-- --0uOntyeOR6bdCM1X2zMSb8IVj8Mk30xlE Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYEhBLQUDAAAAAAAKCRBfWBZkf4vlURPY APwMX00rMk1NbBdlDmeM+ZuBJ/Mm2ppzEfFCvJbSmNihXAEAm/Eo2fhVgWbCMX0PgJh57OW63zq3 Jd9bb4lqCugeCg8= =Eq54 -----END PGP SIGNATURE----- --0uOntyeOR6bdCM1X2zMSb8IVj8Mk30xlE-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v18) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Mar 2021 06:46: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.16154451144971 (code B ref 45889); Thu, 11 Mar 2021 06:46:01 +0000 Received: (at 45889) by debbugs.gnu.org; 11 Mar 2021 06:45:14 +0000 Received: from localhost ([127.0.0.1]:52452 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKF4M-0001I7-Hp for submit@debbugs.gnu.org; Thu, 11 Mar 2021 01:45:14 -0500 Received: from out0.migadu.com ([94.23.1.103]:12089) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKF4J-0001Hw-Di for 45889@debbugs.gnu.org; Thu, 11 Mar 2021 01:45:13 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615445108; 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=YKG1geAnyqz2VUGTsncHEsjA8XRgYOw5lNobtBu7iNM=; b=HZdz5vcF3CYZwKbAtxZ0SiD/hfRcdRhcjBB8oDfEp/Tq3dJXup/7qKTdb6XahlCO7AmEqD S+payXfTE1ebiPczfOCS4Phm9j/IJlBWzddhzz2+7XYjR0KahKlHP+Zzr2q7lrFSQ0eJvi sUx9y474vwEnQSzjoeI1iXdOQe6wT0QIaCuYfphYoQPwNMbx7XMYYnxCmTdAtAk+2osr4f Hf8XZHRfgMNKVNnbwXjQ7AFfM+Isv766BqPnb7xkTi9GSUVhJn7WGD2GFZo50NKCzPnAaN gYqcYrbsJCFOcGjYAC+NvrYgmaebGlKsx4s3z2LTKBGYLPM2IL7VVFAzKApuRg== From: Raghav Gururajan References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> <31701971d849e72506ed4105c92b2ad85d3aa6be.camel@student.tugraz.at> <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> <899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name> <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> <69ce413a-cb2b-b0de-d12d-0c9bfa353ade@raghavgururajan.name> Message-ID: Date: Thu, 11 Mar 2021 01:45:06 -0500 MIME-Version: 1.0 In-Reply-To: <69ce413a-cb2b-b0de-d12d-0c9bfa353ade@raghavgururajan.name> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="IiYOm28dE04hX3JNmFFhVKFML7XgpEY9I" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --IiYOm28dE04hX3JNmFFhVKFML7XgpEY9I Content-Type: multipart/mixed; boundary="qzUKiMFimm0Uzcvab4SB1japgaU49ZVKN"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: Subject: Re: Nextcloud Client (v18) References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> <31701971d849e72506ed4105c92b2ad85d3aa6be.camel@student.tugraz.at> <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> <899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name> <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> <69ce413a-cb2b-b0de-d12d-0c9bfa353ade@raghavgururajan.name> In-Reply-To: <69ce413a-cb2b-b0de-d12d-0c9bfa353ade@raghavgururajan.name> --qzUKiMFimm0Uzcvab4SB1japgaU49ZVKN Content-Type: multipart/mixed; boundary="------------3AF8C24ACD82C10D4781A7B6" Content-Language: en-US This is a multi-part message in MIME format. --------------3AF8C24ACD82C10D4781A7B6 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! >>> Please find the attached v18. >> I've applied some cosmetic and less cosmetic changes, reviewed the >> licenses and pushed nextcloud as >> 82a2f182c59cd9adef4991e0adfb575fec95e52d. >=20 > Thanks so much for helping me with every step of the way. I appreciate = > it. :-) I have named the package wrong. Could you please merge the attached=20 patch please? Thank you! Regards, RG. --------------3AF8C24ACD82C10D4781A7B6 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-Rename-nextcloud-client-to-nextcloud-desktop.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0001-gnu-Rename-nextcloud-client-to-nextcloud-desktop.patch" =46rom 587bda258971642915e19b7017d99b15c3ea7308 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 01:39:49 -0500 Subject: [PATCH] gnu: Rename "nextcloud-client" to "nextcloud-desktop". * gnu/packages/sync.scm (nextcloud-client): Rename to nextcloud-desktop. --- gnu/packages/sync.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 2b64117dc6..d8e0855e06 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -68,9 +68,9 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages tls)) =20 -(define-public nextcloud-client +(define-public nextcloud-desktop (package - (name "nextcloud-client") + (name "nextcloud-desktop") (version "3.1.3") (source (origin --=20 2.30.1 --------------3AF8C24ACD82C10D4781A7B6-- --qzUKiMFimm0Uzcvab4SB1japgaU49ZVKN-- --IiYOm28dE04hX3JNmFFhVKFML7XgpEY9I Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYEm8cgUDAAAAAAAKCRBfWBZkf4vlUWcs APsH/jZu4GFmHBLd+XDyxxMdVkjcP8JbyToEb5QQiVFRxwD+LGHctFg6X3BvI/wXqw6E3rnHwZK0 X/q7d5FYwi4aiww= =TvAF -----END PGP SIGNATURE----- --IiYOm28dE04hX3JNmFFhVKFML7XgpEY9I-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v18) Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Mar 2021 06:50: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: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.16154453785357 (code B ref 45889); Thu, 11 Mar 2021 06:50:02 +0000 Received: (at 45889) by debbugs.gnu.org; 11 Mar 2021 06:49:38 +0000 Received: from localhost ([127.0.0.1]:52456 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKF8c-0001OL-3W for submit@debbugs.gnu.org; Thu, 11 Mar 2021 01:49:38 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:42465) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKF8Z-0001OB-OW for 45889@debbugs.gnu.org; Thu, 11 Mar 2021 01:49:36 -0500 Received: from nijino.local (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4Dx0176hFfz1LBCm; Thu, 11 Mar 2021 07:49:31 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4Dx0176hFfz1LBCm DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1615445372; bh=v4a8wX5cu6lb2ofClPjbeAf5ag4lirmFrOVd2OWEQz4=; h=Subject:From:To:Date:In-Reply-To:References:From; b=pC2vBbs/ttFJicuxKWhJ62Jp+HNR0ugS+K90IBApMZ0jSg+/S837OVcvcC8dSk/Sp ppDZwK4vXlkUD1DDNd1G0qo8K5cqU7K8EkMC/+Mee/PgIpQwoT3TVaUmUw93JkPHeQ O5F2plg9bVHnDgC6JpTQkgM0Lg0jP7eKnWQMUZ8M= Message-ID: <4872912a500463eff900bd0e2d3cceb11da42e43.camel@student.tugraz.at> From: Leo Prikler Date: Thu, 11 Mar 2021 07:49:31 +0100 In-Reply-To: References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> <31701971d849e72506ed4105c92b2ad85d3aa6be.camel@student.tugraz.at> <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> <899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name> <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> <69ce413a-cb2b-b0de-d12d-0c9bfa353ade@raghavgururajan.name> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Am Donnerstag, den 11.03.2021, 01:45 -0500 schrieb Raghav Gururajan: > Hi Leo! > > > > > Please find the attached v18. > > > I've applied some cosmetic and less cosmetic changes, reviewed > > > the > > > licenses and pushed nextcloud as > > > 82a2f182c59cd9adef4991e0adfb575fec95e52d. > > > > Thanks so much for helping me with every step of the way. I > > appreciate > > it. :-) > > I have named the package wrong. Could you please merge the attached > patch please? I don't see the name "nextcloud-client" as particularly problematic. It follows the same scheme as owncloud-client, which it is a fork of IIUC. What would be the reason to prefer nextcloud-desktop? Regards, Leo From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v18) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Mar 2021 07:46: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: Leo Prikler , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161544870410597 (code B ref 45889); Thu, 11 Mar 2021 07:46:02 +0000 Received: (at 45889) by debbugs.gnu.org; 11 Mar 2021 07:45:04 +0000 Received: from localhost ([127.0.0.1]:52529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKG0G-0002kr-0w for submit@debbugs.gnu.org; Thu, 11 Mar 2021 02:45:04 -0500 Received: from out0.migadu.com ([94.23.1.103]:19288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKG0D-0002k8-DB for 45889@debbugs.gnu.org; Thu, 11 Mar 2021 02:45:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615448699; 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=CqDk8RcdCRB0K9ZHs7FWfH1keV4lD+kiYXnErG109xM=; b=C3iBtMczkRBWo3VyfA5MEHOeYZFKeU9sc1UVbWnju6VtE46Y+wWh3j6jJuUxqPBD3hu9eZ NczvYFDb3qYBdGWoYU1S+6tTSp5Qc3r9WitGBJ2FotZHQRElkt9SPj0k5EktbLOOPA23DG A1BICiCnlgyoXIh8WFxK6EIsErvcFhNdf2p+F3BP3tBHvFh0R4s69YuQI5dlKyi7mKhbQC WJfDR9xu8qKDmy2EDIJCm5yXHQdSq4cEStmzueQhDSlggHjotbH2y2QB6XFm0RG9dpSEP5 fQPwS+LM5PrnixD2pN2nfhj9Cet9cWy+iqSVs00jW9UUMcq/NSqSJpTNDoPnVw== References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> <31701971d849e72506ed4105c92b2ad85d3aa6be.camel@student.tugraz.at> <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> <899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name> <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> <69ce413a-cb2b-b0de-d12d-0c9bfa353ade@raghavgururajan.name> <4872912a500463eff900bd0e2d3cceb11da42e43.camel@student.tugraz.at> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Message-ID: <36cbcaf5-c39a-6bfe-52d4-5209a93a3138@raghavgururajan.name> Date: Thu, 11 Mar 2021 02:44:57 -0500 MIME-Version: 1.0 In-Reply-To: <4872912a500463eff900bd0e2d3cceb11da42e43.camel@student.tugraz.at> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="95cVy4VpU39qVqygx1lNuikuhUJcQzorc" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --95cVy4VpU39qVqygx1lNuikuhUJcQzorc Content-Type: multipart/mixed; boundary="p2pL5OzIQ6f1wimJ3fuYF7Lux784L1ciA"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 45889@debbugs.gnu.org Message-ID: <36cbcaf5-c39a-6bfe-52d4-5209a93a3138@raghavgururajan.name> Subject: Re: Nextcloud Client (v18) References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> <31701971d849e72506ed4105c92b2ad85d3aa6be.camel@student.tugraz.at> <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> <899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name> <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> <69ce413a-cb2b-b0de-d12d-0c9bfa353ade@raghavgururajan.name> <4872912a500463eff900bd0e2d3cceb11da42e43.camel@student.tugraz.at> In-Reply-To: <4872912a500463eff900bd0e2d3cceb11da42e43.camel@student.tugraz.at> --p2pL5OzIQ6f1wimJ3fuYF7Lux784L1ciA Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hi Leo! > I don't see the name "nextcloud-client" as particularly problematic. > It follows the same scheme as owncloud-client, which it is a fork of > IIUC. What would be the reason to prefer nextcloud-desktop? The upstream uses the name 'desktop' (nextcloud/desktop in contrast to=20 owncloud/client). Also, It will be distinct from nextcloud-cli, if we get one in guix. Regards, RG. --p2pL5OzIQ6f1wimJ3fuYF7Lux784L1ciA-- --95cVy4VpU39qVqygx1lNuikuhUJcQzorc Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYEnKeQUDAAAAAAAKCRBfWBZkf4vlUT1c AQCJVCuyzgWX+syDhNLbhbMD40d8gDCyWg3wQib7mSu4ogD/fwYh3g4eIX4Uf95EwCkjDR8Swoxx A8casFsTLtlfgQ4= =1335 -----END PGP SIGNATURE----- --95cVy4VpU39qVqygx1lNuikuhUJcQzorc-- From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v18) Resent-From: david larsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Mar 2021 09:26: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: 45889@debbugs.gnu.org, leo.prikler@student.tugraz.at, rg@raghavgururajan.name Cc: Guix-patches , 45889-done@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161554114129429 (code B ref 45889); Fri, 12 Mar 2021 09:26:01 +0000 Received: (at 45889) by debbugs.gnu.org; 12 Mar 2021 09:25:41 +0000 Received: from localhost ([127.0.0.1]:56036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKe3B-0007eW-63 for submit@debbugs.gnu.org; Fri, 12 Mar 2021 04:25:41 -0500 Received: from server0.selfhosted.xyz ([217.64.149.7]:43004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKe38-0007eC-Fc; Fri, 12 Mar 2021 04:25:39 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1615541132; bh=XUCvI1j8LdYaRIUnBVVAJpzeKCc66BhKGYdwkZKju80=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=yQYTzAeskCvkP0PR8eht7g7XfnPrB+HRerzbPNnyhCBsTpVulNr3y+LU+NLPnU3hw LIBPsoKe5LFp+Av/rpmqFJs7+3B/zLfSWDuFeWLk73/SX6xpmF7s9nXU7G1ZZqzaHG yiOXRd3mkQMZOskUNOkkB6M7u6p00SaWQhPw08vNion4uISzOvhTTw2MwOdatmezoX v2ZEyvCl+JDpDYer881OfvXKwcrVzQYsUEFHUqJ5OT8Kp3ecoHDFUXwLc9Wj6uD3TE FIFeGUhfY6zm2aMbPXwNNNQ26nsH7PivYceX/a7w0hozAw9rFhUOGo1Y1AkSf5BGhv 66ffbEXv2iyLQ== X-Fuglu-Suspect: 9e1b92459b4b4e5ebad59e1800fb3b22 X-Fuglu-Spamstatus: NO Received: from [127.0.0.1] (localhost [127.0.0.1]) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Fri, 12 Mar 2021 10:25:26 +0100 From: david larsson In-Reply-To: <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@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> <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> <899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name> <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> Message-ID: <31b6267165d774f283c35a6ec6f7c232@selfhosted.xyz> X-Sender: david.larsson@selfhosted.xyz X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) On 2021-03-10 00:24, Leo Prikler wrote: > Am Dienstag, den 09.03.2021, 10:16 -0500 schrieb Raghav Gururajan: >> Hi Leo! >> >> > The comment certainly improved FSVO improved, but it somehow does >> > not >> > reduce my bikeshedding mood. In particular, I feel like we ought >> > to do >> > this in the snippet. >> >> Moved to snippet. >> >> > You just masked an install error without actually unvendoring >> > dependencies. >> >> Done. >> >> Please find the attached v18. > I've applied some cosmetic and less cosmetic changes, reviewed the > licenses and pushed nextcloud as > 82a2f182c59cd9adef4991e0adfb575fec95e52d. > > Regards, > Leo This is great news! I have really been looking forward to this. Thank you both for almost 3 months of great work on this! Best regards, David From unknown Sat Aug 16 18:44:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v18) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Mar 2021 09:48: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: david larsson , 45889@debbugs.gnu.org, leo.prikler@student.tugraz.at Cc: Guix-patches , 45889-done@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161554246431478 (code B ref 45889); Fri, 12 Mar 2021 09:48:02 +0000 Received: (at 45889) by debbugs.gnu.org; 12 Mar 2021 09:47:44 +0000 Received: from localhost ([127.0.0.1]:56062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKeOV-0008BY-Q8 for submit@debbugs.gnu.org; Fri, 12 Mar 2021 04:47:43 -0500 Received: from out1.migadu.com ([91.121.223.63]:40719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKeOS-0008BJ-Mx; Fri, 12 Mar 2021 04:47:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615542459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=yZiqEYBXWZz2AgH+VxCXjhdoFm6E3D0vR0aFrkytv/4=; b=q34VE/fRVPsAdj3gymXfekyRqChVjbT5gLf8hSTc+MVPy0i3Qy9iWOM3luNS88AB74I9qL JkZ+slx9l+6XIgY7105ppOq3hYLiAsTuAp+ttNlcNQp93dBLzqm8XT0VX52sIprGIyfGrC N1gME0pbBqT0x2fe//E3cxF2qNyt7WNc/Vw1ugvY6qrFZ62+12vZ4S00r0iVzAeX0W7TDo hYl0ctX4UEA5UxqGEZH6vDTZm7lVRomexK50MbDkztEEN9mMNo3l0pkKbG0ZdDhhPNiNdq /mkI+6+rpZYcEhDrIZRIch1+xIL7Mh6I12qRt+VjD21g7f416p+ILIMw2zgiYg== References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> <31701971d849e72506ed4105c92b2ad85d3aa6be.camel@student.tugraz.at> <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> <899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name> <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> <31b6267165d774f283c35a6ec6f7c232@selfhosted.xyz> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Message-ID: <7998656e-341e-71b4-4217-7565b2a927d9@raghavgururajan.name> Date: Fri, 12 Mar 2021 04:47:36 -0500 MIME-Version: 1.0 In-Reply-To: <31b6267165d774f283c35a6ec6f7c232@selfhosted.xyz> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="JGLaGls5POiptGgHN2N4Vwqmuwfs38YvW" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --JGLaGls5POiptGgHN2N4Vwqmuwfs38YvW Content-Type: multipart/mixed; boundary="vvS6T965f8e5EDNqF0qxMNvLMlHdomfQL"; protected-headers="v1" From: Raghav Gururajan To: david larsson , 45889@debbugs.gnu.org, leo.prikler@student.tugraz.at Cc: 45889-done@debbugs.gnu.org, Guix-patches Message-ID: <7998656e-341e-71b4-4217-7565b2a927d9@raghavgururajan.name> Subject: Re: bug#45889: Nextcloud Client (v18) References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@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> <49a02ef9-be2a-1abf-3b2c-bb99471620ee@raghavgururajan.name> <078fd1ea26421b2939f5691fd69f098b8bf52856.camel@student.tugraz.at> <899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name> <9cf48e290f86798fc3c82a574ef52572a0566b7f.camel@student.tugraz.at> <31b6267165d774f283c35a6ec6f7c232@selfhosted.xyz> In-Reply-To: <31b6267165d774f283c35a6ec6f7c232@selfhosted.xyz> --vvS6T965f8e5EDNqF0qxMNvLMlHdomfQL Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hi David! > This is great news! I have really been looking forward to this. Thank=20 > you both for almost 3 months of great work on this! :-) It's in, https://guix.gnu.org/en/packages/nextcloud-client-3.1.3/ Regards, RG. --vvS6T965f8e5EDNqF0qxMNvLMlHdomfQL-- --JGLaGls5POiptGgHN2N4Vwqmuwfs38YvW Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYEs4uAUDAAAAAAAKCRBfWBZkf4vlUa8z AQC239ejDTljG1ACLZ+mCl5CBqtyq4paMg80irlVPzn/yQEA8mu39iNr9a0Aorvhz7Wk/DaCyi/S M2aMrD51A4/pzQ8= =+lwD -----END PGP SIGNATURE----- --JGLaGls5POiptGgHN2N4Vwqmuwfs38YvW--