aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/owncloud.scm32
1 files changed, 22 insertions, 10 deletions
diff --git a/gnu/packages/owncloud.scm b/gnu/packages/owncloud.scm
index f755df4f0b..6b40bd3ada 100644
--- a/gnu/packages/owncloud.scm
+++ b/gnu/packages/owncloud.scm
@@ -21,27 +21,26 @@
#:use-module (guix build-system cmake)
#:use-module (guix download)
#:use-module (guix packages)
+ #:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
#:use-module (gnu packages linux)
#: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 tls))
(define-public owncloud-client
(package
(name "owncloud-client")
- (version "2.2.2")
+ (version "2.2.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.owncloud.com/desktop/stable/"
"owncloudclient-" version ".tar.xz"))
(sha256
- (base32 "0m0pxv12w72qqgxim9fh8w3bgkgnhpjyay8ldll3nnzq1jmhk09n"))
+ (base32 "1lz7v5sscj5489panz5ng372g9l66ng0srx6xaz8drnsgi7m64zk"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -71,16 +70,29 @@
"src/crashreporter/CMakeLists.txt"
"src/gui/CMakeLists.txt")
;; This has the same issue as the substitution above.
- (("\\/\\$\\{APPLICATION_EXECUTABLE\\}\\\"") "\"")))))))
- (native-inputs `(("pkg-config" ,pkg-config)))
+ (("\\/\\$\\{APPLICATION_EXECUTABLE\\}\\\"") "\""))
+ #t))
+ (add-after 'unpack 'delete-failing-tests
+ ;; These tests fail for no apparent reason
+ (lambda _
+ (substitute* "test/CMakeLists.txt"
+ (("owncloud_add_test\\(FileSystem \"\"\\)" test)
+ (string-append "#" test))
+ (("owncloud_add_test\\(Utility \"\"\\)" test)
+ (string-append "#" test)))
+ #t)))
+ #:configure-flags '("-DUNIT_TESTING=ON")))
+ (native-inputs
+ `(("cmocka" ,cmocka)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("qtlinguist" ,qttools)))
(inputs
`(("inotify-tools" ,inotify-tools)
("openssl" ,openssl)
- ("perl" ,perl)
- ("python-wrapper" ,python-wrapper)
- ("qt" ,qt)
+ ("qtbase" ,qtbase)
("qtkeychain" ,qtkeychain)
- ("ruby" ,ruby)
+ ("qtwebkit" ,qtwebkit)
("sqlite" ,sqlite)
("zlib" ,zlib)))
(home-page "https://owncloud.org")