gnu: owncloud-client: Update to 2.7.5.3180.
* gnu/packages/sync.scm (owncloud-client): Update to 2.7.5.3180. [native-inputs]: Add cmake-extra-modules. [arguments]: Fix `delete-failing-tests' phase. [source]: Remove no longer needed snippet. * gnu/packages/patches/owncloud-disable-updatecheck.patch: Update patch.
This commit is contained in:
parent
8765b22c71
commit
bf645c7fb1
|
@ -14,11 +14,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||||
if (connection.isEmpty())
|
if (connection.isEmpty())
|
||||||
con = defaultConnection();
|
con = defaultConnection();
|
||||||
|
|
||||||
- QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, false);
|
- QVariant fallback = getValue(skipUpdateCheckC(), con, false);
|
||||||
+ QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, true);
|
+ QVariant fallback = getValue(skipUpdateCheckC(), con, true);
|
||||||
fallback = getValue(QLatin1String(skipUpdateCheckC), QString(), fallback);
|
fallback = getValue(skipUpdateCheckC(), QString(), fallback);
|
||||||
|
|
||||||
QVariant value = getPolicySetting(QLatin1String(skipUpdateCheckC), fallback);
|
QVariant value = getPolicySetting(skipUpdateCheckC(), fallback);
|
||||||
- return value.toBool();
|
- return value.toBool();
|
||||||
+ if ( !value.toBool() )
|
+ if ( !value.toBool() )
|
||||||
+ qDebug() << "Guix has disabled the UpdateCheck mechanism.";
|
+ qDebug() << "Guix has disabled the UpdateCheck mechanism.";
|
||||||
|
|
|
@ -43,6 +43,7 @@ (define-module (gnu packages sync)
|
||||||
#:use-module (gnu packages glib)
|
#:use-module (gnu packages glib)
|
||||||
#:use-module (gnu packages golang)
|
#:use-module (gnu packages golang)
|
||||||
#:use-module (gnu packages image)
|
#:use-module (gnu packages image)
|
||||||
|
#:use-module (gnu packages kde-frameworks)
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages lua)
|
#:use-module (gnu packages lua)
|
||||||
#:use-module (gnu packages pcre)
|
#:use-module (gnu packages pcre)
|
||||||
|
@ -153,27 +154,18 @@ (define-public megatools
|
||||||
(define-public owncloud-client
|
(define-public owncloud-client
|
||||||
(package
|
(package
|
||||||
(name "owncloud-client")
|
(name "owncloud-client")
|
||||||
(version "2.5.3.11470")
|
(version "2.7.5.3180")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://download.owncloud.com/desktop/stable/"
|
(uri (string-append "https://download.owncloud.com/desktop/ownCloud/stable/"
|
||||||
"owncloudclient-" version ".tar.xz"))
|
version "/source/ownCloud-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n"))
|
(base32 "13vlkmkr3i99ww3fkps7lwrx6vgr43rvmjcpsix259rj7f2ikkrp"))
|
||||||
(patches (search-patches "owncloud-disable-updatecheck.patch"))
|
(patches (search-patches "owncloud-disable-updatecheck.patch"))))
|
||||||
(modules '((guix build utils)))
|
;; TODO: unbundle qprogessindicator, qlockedfile, qtokenizer and
|
||||||
(snippet
|
;; qtsingleapplication which have not yet been packaged, but all are
|
||||||
'(begin
|
;; explicitly used from the 3rdparty folder during build.
|
||||||
;; libcrashreporter-qt has its own bundled dependencies
|
|
||||||
(delete-file-recursively "src/3rdparty/libcrashreporter-qt")
|
|
||||||
(delete-file-recursively "src/3rdparty/sqlite3")
|
|
||||||
;; qprogessindicator, qlockedfile, qtokenizer and
|
|
||||||
;; qtsingleapplication have not yet been packaged, but all are
|
|
||||||
;; explicitly used from the 3rdparty folder during build.
|
|
||||||
;; We can also remove the macgoodies folder
|
|
||||||
(delete-file-recursively "src/3rdparty/qtmacgoodies")
|
|
||||||
#t))))
|
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:phases
|
||||||
|
@ -182,7 +174,7 @@ (define-public owncloud-client
|
||||||
;; "Could not create autostart folder"
|
;; "Could not create autostart folder"
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "test/CMakeLists.txt"
|
(substitute* "test/CMakeLists.txt"
|
||||||
(("owncloud_add_test\\(Utility \"\"\\)" test)
|
(("owncloud_add_test\\(Utility\\)" test)
|
||||||
(string-append "#" test)))
|
(string-append "#" test)))
|
||||||
#t))
|
#t))
|
||||||
(add-after 'unpack 'dont-embed-store-path
|
(add-after 'unpack 'dont-embed-store-path
|
||||||
|
@ -197,6 +189,7 @@ (define-public owncloud-client
|
||||||
"-DNO_SHIBBOLETH=1")))
|
"-DNO_SHIBBOLETH=1")))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("cmocka" ,cmocka)
|
`(("cmocka" ,cmocka)
|
||||||
|
("extra-cmake-modules" ,extra-cmake-modules)
|
||||||
("perl" ,perl)
|
("perl" ,perl)
|
||||||
("pkg-config" ,pkg-config)
|
("pkg-config" ,pkg-config)
|
||||||
("qtlinguist" ,qttools)))
|
("qtlinguist" ,qttools)))
|
||||||
|
|
Loading…
Reference in a new issue