TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: owncloud-client: Update to 2.7.5.3180.

Browse source 
* 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:
Julien Lepiller 2021-02-07 02:36:24 +01:00
parent 8765b22c71
commit bf645c7fb1
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
2 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/patches/owncloud-disable-updatecheck.patch
View file

@ -14,11 +14,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if (connection.isEmpty())
con = defaultConnection();
- QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, false);
+ QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, true);
fallback = getValue(QLatin1String(skipUpdateCheckC), QString(), fallback);
- QVariant fallback = getValue(skipUpdateCheckC(), con, false);
+ QVariant fallback = getValue(skipUpdateCheckC(), con, true);
fallback = getValue(skipUpdateCheckC(), QString(), fallback);
QVariant value = getPolicySetting(QLatin1String(skipUpdateCheckC), fallback);
QVariant value = getPolicySetting(skipUpdateCheckC(), fallback);
- return value.toBool();
+ if ( !value.toBool() )
+ qDebug() << "Guix has disabled the UpdateCheck mechanism.";

29
gnu/packages/sync.scm
View file

@ -43,6 +43,7 @@ (define-module (gnu packages sync)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang)
#:use-module (gnu packages image)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
#:use-module (gnu packages pcre)
@ -153,27 +154,18 @@ (define-public megatools
(define-public owncloud-client
(package
(name "owncloud-client")
(version "2.5.3.11470")
(version "2.7.5.3180")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.owncloud.com/desktop/stable/"
"owncloudclient-" version ".tar.xz"))
(uri (string-append "https://download.owncloud.com/desktop/ownCloud/stable/"
version "/source/ownCloud-" version ".tar.xz"))
(sha256
(base32 "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n"))
(patches (search-patches "owncloud-disable-updatecheck.patch"))
(modules '((guix build utils)))
(snippet
'(begin
;; 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))))
(base32 "13vlkmkr3i99ww3fkps7lwrx6vgr43rvmjcpsix259rj7f2ikkrp"))
(patches (search-patches "owncloud-disable-updatecheck.patch"))))
;; TODO: unbundle qprogessindicator, qlockedfile, qtokenizer and
;; qtsingleapplication which have not yet been packaged, but all are
;; explicitly used from the 3rdparty folder during build.
(build-system cmake-build-system)
(arguments
`(#:phases
@ -182,7 +174,7 @@ (define-public owncloud-client
;; "Could not create autostart folder"
(lambda _
(substitute* "test/CMakeLists.txt"
(("owncloud_add_test\\(Utility \"\"\\)" test)
(("owncloud_add_test\\(Utility\\)" test)
(string-append "#" test)))
#t))
(add-after 'unpack 'dont-embed-store-path
@ -197,6 +189,7 @@ (define-public owncloud-client
"-DNO_SHIBBOLETH=1")))
(native-inputs
`(("cmocka" ,cmocka)
("extra-cmake-modules" ,extra-cmake-modules)
("perl" ,perl)
("pkg-config" ,pkg-config)
("qtlinguist" ,qttools)))