From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 06 10:41:55 2023 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: nextcloud-client: Update to 3.8.2. 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 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:z1Cum0/mhXuzeB8LrKG1lFi7Yd4uP/nbc0VML5Tz92HcSUuiy8L oyOGk13ryMYYtnA3242CfCja9gbBSx9/fQ1XnZoi7m0/eQHpTrwlBol3m/m5in776DFHTB/ TBl4y/UVQqzyEJSIiSDvr2RFKXfVRly8VbEPreUSN1KNGi/buG17yM1HfJ8pN78KuPKSlov 71mlgg1IxKlbtbJwEn0fA== X-Spam-Flag: NO 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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(-) 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 base-commit: 1a2eb26286c72ac2754969f53f5833b053b96b67 -- 2.30.9 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 01 12:07:54 2023 Received: (at 63927) by debbugs.gnu.org; 1 Jul 2023 16:07:54 +0000 Received: from localhost ([127.0.0.1]:58532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFd8b-0006I5-PF for submit@debbugs.gnu.org; Sat, 01 Jul 2023 12:07:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFd8Z-0006Hp-Cl for 63927@debbugs.gnu.org; Sat, 01 Jul 2023 12:07:52 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qFd8S-00063c-0X; Sat, 01 Jul 2023 12:07:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=fgjmJzCyE9iBgbeVy2SKdSHhGiIp4yQF8kVwDvxV1E8=; b=J3kDdqEYVA22taxItZCB Kg1kRowl49kWfk+pu5rAJYyHoOfV4zLBHqyWvvvaowBAJ5AWc+0X7b82Bq4DKZ55kjvznMRuJkoQR gzMEDKDpsinXK38RoNdmexxd8jvYDjSzuatWCpqzAAyb81fl7YiPFkM/iSeSOAknmJV7T38en8+jJ b04P2N+AVM2BqHmpPhPPkbYWVA/EV0/41KBkpTOAa04SEyc9+k2R90KlDyuE+c6oruf9xSInDNyJ+ Q6I1J9pd1obTKtYCjpKl2aSbid/x3aWbCl7i2CiMpNIYucZ4tHelhsQwETs/AL6unyhfKn+EvHXx5 gvJjMyqiy/iP/w==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qFd8R-0000xt-HQ; Sat, 01 Jul 2023 12:07:43 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Hartmut Goebel Subject: Re: bug#63927: [PATCH] gnu: nextcloud-client: Update to 3.8.2. References: <10932aa8bf76380ed218881f2586ae3ca3e22cff.1686062484.git.h.goebel@crazy-compilers.com> Date: Sat, 01 Jul 2023 18:07:42 +0200 In-Reply-To: <10932aa8bf76380ed218881f2586ae3ca3e22cff.1686062484.git.h.goebel@crazy-compilers.com> (Hartmut Goebel's message of "Tue, 6 Jun 2023 16:41:36 +0200") Message-ID: <87lefzy5rl.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 63927 Cc: 63927@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Hartmut Goebel skribis: > * 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. [...] > + ("librsvg" ,librsvg) Should be (librsvg-for-system). Otherwise LGTM! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 02 14:48:39 2023 Received: (at 63927-close) by debbugs.gnu.org; 2 Jul 2023 18:48:39 +0000 Received: from localhost ([127.0.0.1]:32777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qG27g-0003ld-Sq for submit@debbugs.gnu.org; Sun, 02 Jul 2023 14:48:39 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:58639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qG27b-0003kg-MK for 63927-close@debbugs.gnu.org; Sun, 02 Jul 2023 14:48:35 -0400 Received: from hermia.goebel-consult.de ([79.211.186.139]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MUXYs-1qOnWr1bWK-00QPfe; Sun, 02 Jul 2023 20:48:25 +0200 Received: from [192.168.110.2] (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id AA37B5F5F5; Sun, 2 Jul 2023 20:48:22 +0200 (CEST) Message-ID: <6be8b7fc-43b2-cf81-3d4e-b88427a1e102@crazy-compilers.com> Date: Sun, 2 Jul 2023 20:48:22 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: bug#63927: [PATCH] gnu: nextcloud-client: Update to 3.8.2. Content-Language: de-DE, en-US References: <10932aa8bf76380ed218881f2586ae3ca3e22cff.1686062484.git.h.goebel@crazy-compilers.com> <87lefzy5rl.fsf@gnu.org> From: Hartmut Goebel To: 63927-close@debbugs.gnu.org Organization: crazy-compilers.com In-Reply-To: <87lefzy5rl.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:DYU/dWTkKM1B3HCUS9DsHz7Yt+d8lM1gVtojZysbB7Ut/UXanOD ny/uglb+ZvmIjuzMOL8K31SkGq/s6Y3qT8cV3K6D3YZEJ8ICbE17ewSWpyHHpfxYiAYXsSQ v2VYOC19uH/G96e5/uIL6WfbHbgQQlqb0TFcp6X5AdFGC6lKxTvTWEjwEicqiSGKB0nuoNs tKa03a6lbejIN02+N8ezw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:ZfdLuMBb3G4=;4Gu/5bp6SGV54HOvVy7CxKihmX5 OqfxuYKI5Cb8I3GntTqLCWhxSwu0rBUwFZ91OxA1LGdHkt/3xW+8jeVFM4LKXRedrEmepwkM/ nR7ntKj9zPP2SefKEg5hvATwR7psJiLQliFcUN8teSokLiqiDVbfr+824CaT1x2p6uFF/wxaE kuUK498xYBNQmCufA6tlLW/iFLijXlRzQvbBPlFbrzZ4Wgn7SsO2Dan2CBrMF9RfK1iRD7xl0 TfXo3h+/NOTF/9JELQqkCcOpn0nRQkL7aLqHzWpewpMKe/GK5FTKmbm5yI+YV8nLs6ze291Kc G/90Myr/RARmJKArqZKdVgZmICDVL21m+Dago5ahhfif0tib+yVPx+cNURwCHz7vdp33UFH6h AyX/DDe/NuPwsQ9P0M/fAQEQtWvbmDlbcVl/5HKIZ0zuLr1pckkyfYvy8Uu/AxJg8zjYh8aEd n2DlcW8gCrDr3gFVkxk/1aK2LXM9PJQMbu11AMpZI0a95p/TNx8xgErrCJT1B4sa1QlaqapqW N7VS50U6YIXQOb4McK7FrLxUFJupPGSDbbu44s0bGGxoUo7Ob3H77o/Wnornc+8dYktyY7MBJ u5bGUiqlFGdVTmCmqxvNmNp0J98IwXED8wD1DP2Z2rVTIcuQGHEq79ehVMrMCF24H7DVRBLih CxbW4BT37wBMHmVJc4a4o5oF03X6akpx6zWb2yuamw== X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: 63927-close Cc: =?UTF-8?Q?Ludovic_Court=c3=a8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) Am 01.07.23 um 18:07 schrieb Ludovic Courtès: > Should be (librsvg-for-system). > Otherwise LGTM! Thanks for the review. Pushed as 246445b20d6a6433ac94a7f6f7bd943bde5c4827 -- Regards Hartmut Goebel | Hartmut Goebel | h.goebel@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible | From unknown Sun Jun 22 11:36:43 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 31 Jul 2023 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator