me
/
guix
Archived
1
0
Fork 0
Code

gnu: nextcloud-client: Update to 3.8.2. 

* gnu/packages/sync.scm (nextcloud-client): Update to 3.8.2.
[snippets]: Keep 3rd-party files from kirigami. Remove more references of
deleted 3rd parties.  Adjust substitute for new code.
[configure-flags]: Disable building the updater.
[phases]<patch-cmake>: Adjust substitute for new code.
<check>: Use custom phase to disable a failing test.
[inputs]: Add dbus and karchive.
[native-inputs]: Add librsvg-for-system.
master
Hartmut Goebel 2023-06-06 16:25:41 +02:00
parent 1d471bbe44
commit 246445b20d
No known key found for this signature in database
GPG Key ID: 634A8DFFD3F631DF
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/packages/sync.scm
View File

@ -76,7 +76,7 @@
(define-public nextcloud-client (define-public nextcloud-client
(package (package
(name "nextcloud-client") (name "nextcloud-client")
(version "3.2.0") (version "3.8.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -87,14 +87,14 @@
(file-name (file-name
(git-file-name name version)) (git-file-name name version))
(sha256 (sha256
(base32 "137h65sn4ixspbblvn0r2ngg8234yk582bppkkr87c3krfp21gx4")) (base32 "0gmj217jmmx13wwb096prwzn3njv616njk1id97g6lrbn969fcnn"))
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 ftw) (ice-9 ftw)
(srfi srfi-1))) (srfi srfi-1)))
(snippet (snippet
'(begin '(begin
;; Not available in Guix. ;; Not available in Guix.
(let* ((keep '("QProgressIndicator" "qtokenizer"))) (let* ((keep '("QProgressIndicator" "qtokenizer" "kirigami")))
(with-directory-excursion "src/3rdparty" (with-directory-excursion "src/3rdparty"
(for-each delete-file-recursively (for-each delete-file-recursively
(lset-difference string=? (lset-difference string=?
@ -103,11 +103,11 @@
(with-directory-excursion "src/gui" (with-directory-excursion "src/gui"
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
;; Remove references of deleted 3rdparties. ;; Remove references of deleted 3rdparties.
(("[ \t]*\\.\\./3rdparty/qtlockedfile/?.*\\.cpp") (("[ \t]*\\.\\./3rdparty/qtlockedfile/?.*\\.(cpp|h)")
"") "")
(("[ \t]*\\.\\./3rdparty/qtsingleapplication/?.*\\.cpp") (("[ \t]*\\.\\./3rdparty/qtsingleapplication/?.*\\.(cpp|h)")
"") "")
(("[ \t]*\\.\\./3rdparty/kmessagewidget/?.*\\.cpp") (("[ \t]*\\.\\./3rdparty/kmessagewidget/?.*\\.(cpp|h)")
"") "")
(("[ \t]*list\\(APPEND 3rdparty_SRC \\.\\./3rdparty/?.*\\)") (("[ \t]*list\\(APPEND 3rdparty_SRC \\.\\./3rdparty/?.*\\)")
"") "")
@ -121,8 +121,8 @@
"@kwidgetsaddons@") "@kwidgetsaddons@")
;; Expand libraries, that used to be statically linked, but ;; Expand libraries, that used to be statically linked, but
;; no longer are post-vendoring. ;; no longer are post-vendoring.
(("\\$\\{synclib_NAME\\}") (("KF5::Archive")
(string-append "${synclib_NAME} " (string-append "KF5::Archive "
"QtSolutions_LockedFile " "QtSolutions_LockedFile "
"QtSolutions_SingleApplication " "QtSolutions_SingleApplication "
"KF5WidgetsAddons"))) "KF5WidgetsAddons")))
@ -137,7 +137,7 @@
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (list
"-DUNIT_TESTING=ON") "-DUNIT_TESTING=ON" "-DBUILD_UPDATER=OFF")
#:imported-modules #:imported-modules
((guix build glib-or-gtk-build-system) ((guix build glib-or-gtk-build-system)
,@%qt-build-system-modules) ,@%qt-build-system-modules)
@ -151,7 +151,7 @@
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Patch install directory for dbus service files. ;; Patch install directory for dbus service files.
(substitute* "shell_integration/libcloudproviders/CMakeLists.txt" (substitute* "shell_integration/libcloudproviders/CMakeLists.txt"
(("PKGCONFIG_GETVAR\\(.+ _install_dir\\)") (("pkg_get_variable\\(_install_dir dbus-1 .*\\)")
(string-append "set(_install_dir \"${CMAKE_INSTALL_PREFIX}" (string-append "set(_install_dir \"${CMAKE_INSTALL_PREFIX}"
"/share/dbus-1/services\")"))) "/share/dbus-1/services\")")))
(substitute* "shell_integration/dolphin/CMakeLists.txt" (substitute* "shell_integration/dolphin/CMakeLists.txt"
@ -161,6 +161,11 @@
(("@kwidgetsaddons@") (("@kwidgetsaddons@")
(search-input-directory inputs (search-input-directory inputs
"/include/KF5/KWidgetsAddons/"))))) "/include/KF5/KWidgetsAddons/")))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(setenv "QT_QPA_PLATFORM" "offscreen")
(invoke "ctest" "-E" "SyncXAttrTest"))))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
;; Tests write to $HOME. ;; Tests write to $HOME.
@ -176,6 +181,7 @@
("doxygen" ,doxygen) ("doxygen" ,doxygen)
("extra-cmake-modules" ,extra-cmake-modules) ("extra-cmake-modules" ,extra-cmake-modules)
("glib:bin" ,glib "bin") ("glib:bin" ,glib "bin")
("librsvg" ,(librsvg-for-system))
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python-wrapper) ("python" ,python-wrapper)
@ -183,8 +189,10 @@
("ruby" ,ruby))) ("ruby" ,ruby)))
(inputs (inputs
(list appstream (list appstream
dbus
desktop-file-utils desktop-file-utils
glib glib
karchive
kconfig kconfig
kcoreaddons kcoreaddons
kio kio