diff mbox series

[bug#45889] Nextcloud Client (v18)

Message ID 899fd264-18bf-44b2-2175-1dfc6a64b9c0@raghavgururajan.name
State Accepted
Headers show
Series [bug#45889] Nextcloud Client (v18) | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Raghav Gururajan March 9, 2021, 3:16 p.m. UTC
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.

Comments

Leo Prikler March 9, 2021, 11:24 p.m. UTC | #1
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
Raghav Gururajan March 10, 2021, 3:46 a.m. UTC | #2
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. :-)

Regards,
RG.
Leo Prikler March 11, 2021, 6:49 a.m. UTC | #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
Raghav Gururajan March 11, 2021, 7:44 a.m. UTC | #4
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 
owncloud/client).

Also, It will be distinct from nextcloud-cli, if we get one in guix.

Regards,
RG.
david larsson March 12, 2021, 9:25 a.m. UTC | #5
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
Raghav Gururajan March 12, 2021, 9:47 a.m. UTC | #6
Hi David!

> This is great news! I have really been looking forward to this. Thank 
> 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.
diff mbox series

Patch

From 573af53f9a5b69b857daefe3d6471eef42783782 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
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))
 
+(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=?
+                                          (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/qtsingleapplication")
+                "")
+               ;; 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 3rdparty,
+               ;; to wherever synclib gets linked.
+               (("\\$\\{synclib_NAME\\}")
+                (string-append "${synclib_NAME} "
+                               "QtSolutions_LockedFile "
+                               "QtSolutions_SingleApplication "
+                               "KF5WidgetsAddons")))
+             ;; Fix compatibility with QtSingleApplication from QtSolutions.
+             (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=ON"
+        ;; Upstream Bug: https://github.com/nextcloud/desktop/issues/2885
+        "-DNO_SHIBBOLETH=ON")
+       #:imported-modules
+       ((guix build glib-or-gtk-build-system)
+        ,@%qt-build-system-modules)
+       #:modules
+       (((guix build glib-or-gtk-build-system)
+         #:prefix glib-or-gtk:)
+        (guix build qt-build-system)
+        (guix build utils))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-cmake
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Patch install directory for dbus service files.
+             (substitute* "shell_integration/libcloudproviders/CMakeLists.txt"
+               (("PKGCONFIG_GETVAR\\(.+ _install_dir\\)")
+                (string-append "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)
+       ("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")
-- 
2.30.1