From 2647f0dfd10bc33226deafc25472f30d395c6d63 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@disroot.org>
Date: Wed, 22 Oct 2025 19:57:56 +0530
Subject: gnu: nextcloud-client: Fix GUI not working.

* gnu/packages/sync.scm (nextcloud-client)[source]<snippet>: Keep the bundled
qtlockfile and qtsingleapplication.
[inputs]: Remove qtsolutions.

Change-Id: Iea269b8c8a08d9cefb9f9a8138181cb314589c9d
---
 gnu/packages/sync.scm | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index c586e689b9e..0b82d8ffbba 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -99,8 +99,11 @@
        (snippet
         '(begin
            ;; QProgressIndicator is not available in Guix.
-           ;; FIXME: Fix building with the system kirigami.
-           (let* ((keep '("QProgressIndicator" "kirigami")))
+           ;; FIXME: Fix building with the system kirigami and qtsolutions.
+           (let* ((keep '("QProgressIndicator"
+                          "kirigami"
+                          "qtlockedfile"
+                          "qtsingleapplication")))
              (with-directory-excursion "src/3rdparty"
                (for-each delete-file-recursively
                          (lset-difference string=?
@@ -109,18 +112,8 @@
            (with-directory-excursion "src/gui"
              (substitute* "CMakeLists.txt"
                ;; Remove references of deleted 3rdparties.
-               (("[ \t]*\\.\\./3rdparty/qtlockedfile/?.*\\.(cpp|h)")
-                "")
-               (("[ \t]*\\.\\./3rdparty/qtsingleapplication/?.*\\.(cpp|h)")
-                "")
                (("[ \t]*\\.\\./3rdparty/kmessagewidget/?.*\\.(cpp|h)")
                 "")
-               (("[ \t]*list\\(APPEND 3rdparty_SRC \\.\\./3rdparty/?.*\\)")
-                "")
-               (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtlockedfile")
-                "")
-               (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtsingleapplication")
-                "")
                (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/kmessagewidget")
                 ;; For this, we rely on build inputs, so let's just replace
                 ;; them by an autoconf-style variable.
@@ -129,15 +122,7 @@
                ;; no longer are post-vendoring.
                (("KF6::Archive")
                 (string-append "KF6::Archive "
-                               "QtSolutions_LockedFile "
-                               "QtSolutions_SingleApplication "
-                               "KF6WidgetsAddons")))
-             ;; Fix compatibility with QtSingleApplication from QtSolutions.
-             (substitute* '("application.h" "application.cpp")
-               (("SharedTools::QtSingleApplication")
-                "QtSingleApplication")
-               (("slotParseMessage\\(const QString &(msg)?.*\\)")
-                "slotParseMessage(const QString &msg)")))
+                               "KF6WidgetsAddons"))))
            #t))))
     (build-system qt-build-system)
     (arguments
@@ -245,7 +230,6 @@
            qt5compat
            qtdeclarative
            qtkeychain-qt6
-           qtsolutions
            qtsvg
            qtwayland
            qtwebchannel
-- 
cgit v1.3