From patchwork Tue Jun 6 14:41:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 50736 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1B9AF27BBE9; Tue, 6 Jun 2023 15:42:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7654D27BBE2 for ; Tue, 6 Jun 2023 15:42:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6Xsu-0004oK-TE; Tue, 06 Jun 2023 10:42:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6Xso-0004no-HS for guix-patches@gnu.org; Tue, 06 Jun 2023 10:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6Xso-0003Q1-97 for guix-patches@gnu.org; Tue, 06 Jun 2023 10:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q6Xsn-0003F0-NX for guix-patches@gnu.org; Tue, 06 Jun 2023 10:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63927] [PATCH] gnu: nextcloud-client: Update to 3.8.2. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Jun 2023 14:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63927 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63927@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168606251512444 (code B ref -1); Tue, 06 Jun 2023 14:42:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jun 2023 14:41:55 +0000 Received: from localhost ([127.0.0.1]:52774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6Xsg-0003Ed-Ne for submit@debbugs.gnu.org; Tue, 06 Jun 2023 10:41:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:57342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6Xsa-0003ER-3q for submit@debbugs.gnu.org; Tue, 06 Jun 2023 10:41:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6XsZ-0004ma-TJ for guix-patches@gnu.org; Tue, 06 Jun 2023 10:41:47 -0400 Received: from mout.kundenserver.de ([217.72.192.75]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6XsX-0003NS-3j for guix-patches@gnu.org; Tue, 06 Jun 2023 10:41:47 -0400 Received: from hermia.goebel-consult.de ([87.176.157.31]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MyKYE-1qGXDr19W0-00yhGQ for ; Tue, 06 Jun 2023 16:41:39 +0200 Received: from lenashee.fritz.box (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id F2C345F5F5; Tue, 6 Jun 2023 16:41:45 +0200 (CEST) From: Hartmut Goebel Date: Tue, 6 Jun 2023 16:41:36 +0200 Message-Id: <10932aa8bf76380ed218881f2586ae3ca3e22cff.1686062484.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.30.9 MIME-Version: 1.0 X-Provags-ID: V03:K1:z1Cum0/mhXuzeB8LrKG1lFi7Yd4uP/nbc0VML5Tz92HcSUuiy8L oyOGk13ryMYYtnA3242CfCja9gbBSx9/fQ1XnZoi7m0/eQHpTrwlBol3m/m5in776DFHTB/ TBl4y/UVQqzyEJSIiSDvr2RFKXfVRly8VbEPreUSN1KNGi/buG17yM1HfJ8pN78KuPKSlov 71mlgg1IxKlbtbJwEn0fA== UI-OutboundReport: notjunk:1;M01:P0:B0V9rMbd4I8=;pYrUQktDtceaJ6/7hsU1VAxT7cu acx1Gyj4gw0UD7UpzMrVN4NnE9ijRDQXs8r2/Uwwv8UoogG3cRQEur3xmeBfbiDXbYaY8LSXj 9M2MirDBMeijH1hD1hW50h8wiJWiqLYKuxOfNNe3x0oIZCLlEvXHMWqWHiT0gAX1D8ijdVb8l ArrLFFlfvTqhy4769RhvZxShiXNdS+IHoRsTmXZlY9VPugWSIWaAKbcECLzPbA1WgiKe4xZwo w06lkHcCRoXhADDO4YWRqs124pCMOlNQ0u74sTFNEqYWWHsGQJPaJScO8LH/FSLypMdPaLnbf KlG+l6tFRgco/JjEROciLbHNzudZg8RodbzIAYBfZ/gQiRE+2woLliehCSj03hQWnac8RjrvZ xiB9IFJvhm25/XhYkBmRx+rky5CFtp+cAYgFt/DWU2xaUhomtJ4Rrx5opGAdaRMFvjHFGCqZ0 oGppqNBVLCCIpDKVoNf8tXfQX2sWA+Ko7BhPaY/sXSzrAFwezUUBkanHbeHWwrDqL6lAkJVZC 3253QiHWe1SR825b1cNZ/8w2t5/sOQPjUmgM3WOeQhDpauyH5knvYc0S9a8QPG0Om+aDuDu8a MLIskr+UTJdfzrHkCxc8gc7BX4U28mIEz8KYCME3HyK+qH/35iUuzg/EDlNN5TFFadCB7SO32 hE1/fqrnIsX4YUxhRBBoo1B25acWgwXeP66ckN1SDw== Received-SPF: pass client-ip=217.72.192.75; envelope-from=h.goebel@crazy-compilers.com; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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]: Adjust substitute for new code. : Use custom phase to disable a failing test. [inputs]: Add dbus and karchive. [native-inputs]: Add librsvg. --- gnu/packages/sync.scm | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) base-commit: 1a2eb26286c72ac2754969f53f5833b053b96b67 diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 75cd67fd2d..cce800d596 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -76,7 +76,7 @@ (define-public nextcloud-client (package (name "nextcloud-client") - (version "3.2.0") + (version "3.8.2") (source (origin (method git-fetch) @@ -87,14 +87,14 @@ (file-name (git-file-name name version)) (sha256 - (base32 "137h65sn4ixspbblvn0r2ngg8234yk582bppkkr87c3krfp21gx4")) + (base32 "0gmj217jmmx13wwb096prwzn3njv616njk1id97g6lrbn969fcnn")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet '(begin ;; Not available in Guix. - (let* ((keep '("QProgressIndicator" "qtokenizer"))) + (let* ((keep '("QProgressIndicator" "qtokenizer" "kirigami"))) (with-directory-excursion "src/3rdparty" (for-each delete-file-recursively (lset-difference string=? @@ -103,11 +103,11 @@ (with-directory-excursion "src/gui" (substitute* "CMakeLists.txt" ;; 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/?.*\\)") "") @@ -121,8 +121,8 @@ "@kwidgetsaddons@") ;; Expand libraries, that used to be statically linked, but ;; no longer are post-vendoring. - (("\\$\\{synclib_NAME\\}") - (string-append "${synclib_NAME} " + (("KF5::Archive") + (string-append "KF5::Archive " "QtSolutions_LockedFile " "QtSolutions_SingleApplication " "KF5WidgetsAddons"))) @@ -137,7 +137,7 @@ (arguments `(#:configure-flags (list - "-DUNIT_TESTING=ON") + "-DUNIT_TESTING=ON" "-DBUILD_UPDATER=OFF") #:imported-modules ((guix build glib-or-gtk-build-system) ,@%qt-build-system-modules) @@ -151,7 +151,7 @@ (lambda* (#:key inputs #:allow-other-keys) ;; Patch install directory for dbus service files. (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}" "/share/dbus-1/services\")"))) (substitute* "shell_integration/dolphin/CMakeLists.txt" @@ -161,6 +161,11 @@ (("@kwidgetsaddons@") (search-input-directory inputs "/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 (lambda _ ;; Tests write to $HOME. @@ -176,6 +181,7 @@ ("doxygen" ,doxygen) ("extra-cmake-modules" ,extra-cmake-modules) ("glib:bin" ,glib "bin") + ("librsvg" ,librsvg) ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) @@ -183,8 +189,10 @@ ("ruby" ,ruby))) (inputs (list appstream + dbus desktop-file-utils glib + karchive kconfig kcoreaddons kio