From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id EAZZOzTarmVAfAEAqHPOHw:P1 (envelope-from ) for ; Mon, 22 Jan 2024 22:12:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id EAZZOzTarmVAfAEAqHPOHw (envelope-from ) for ; Mon, 22 Jan 2024 22:12:21 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="O jiVObV"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1705957940; a=rsa-sha256; cv=none; b=cHbFnU9/YorfBcXP1g12FryRY3IBtW8JWU2jxRHLCthrwL1rzXs5yeljTLnVbwRcchle5g FxVGF6wTA9FlPrQI3gBWPABQ9irBL+CRArjxCZOmUQlS9WG7ksukjglUbYR2rIMPftoc5W QVgiaHPNyNY21IODkpUks64g8L+T+NeGQFScQUnKKRQzAMBuYNcpnjdQKU0SpG3Mpypv0x kivuYdcQDKU3ws2+6jifHfz2jMIVWhURoD+jCwClko5xl2G1s4MbhJZjWBsXhAsQsAEw20 N5b3uKJiVML18bUVC+unacMNKMEDAhHJTBd8XHVPi1d+NWszuE56Rrmk0TXabA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="O jiVObV"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1705957940; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=tGtd8g08stkzeQ68gNK2uDsk37C1XbQdZZzTvqgbMVE=; b=UN/bV5PEwVxTlfTPQ5cWYd2WcvIO3GYMH8d1dZT800HXzi7SPYMZe4i9qSml1wnoT5Bs2H Bk+7evAI/g2MeL+oIkLXrHOLash5cmHsMGh8UStd1rk+FPVQ0hIqdOZRcVu1HR4WZaY1AJ g4nNusR7mFWs6s+SSE83DZH8xVw5cWefB+rEgX7wyPuUfWlEkExyFFC+xHF0Y25ioJGo54 vfKaoCPqihdTzMu7Sz8mntisgZU+C7ELO8Eocg25oeCSZMPYhlESZwba7I9umHm4mEFiyD CxS+ovtzKoEf/kD3SoAqm8/H973RVHM/mZnaBiRTkiaM1VM0nI+BCISKVCzatg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 634E0814B for ; Mon, 22 Jan 2024 22:12:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rS1aK-0004j3-Md; Mon, 22 Jan 2024 16:12:00 -0500 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 1rS1aI-0004ib-Gx for guix-patches@gnu.org; Mon, 22 Jan 2024 16:11:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rS1aI-000264-8z for guix-patches@gnu.org; Mon, 22 Jan 2024 16:11:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rS1aM-0007qI-8N for guix-patches@gnu.org; Mon, 22 Jan 2024 16:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68447] [PATCH gnome-team v2 2/2] gnu: deja-dup: update to 45.2. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Jan 2024 21:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68447 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68447@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 68447-submit@debbugs.gnu.org id=B68447.170595791630117 (code B ref 68447); Mon, 22 Jan 2024 21:12:02 +0000 Received: (at 68447) by debbugs.gnu.org; 22 Jan 2024 21:11:56 +0000 Received: from localhost ([127.0.0.1]:41839 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rS1aF-0007pf-H9 for submit@debbugs.gnu.org; Mon, 22 Jan 2024 16:11:56 -0500 Received: from planete-kraus.eu ([89.234.140.182]:55636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rS1aA-0007p0-F0 for 68447@debbugs.gnu.org; Mon, 22 Jan 2024 16:11:52 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 4957a305; Mon, 22 Jan 2024 21:11:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniA; bh=TNQtwbvzuvqdwkMz8qXjfWkxVuw=; b=O jiVObVo0RpedSCBmAMRu9RHnG/PGz0Fcxh8saSw4YP/H2Uen4VVrmLzidNXY+Ti5 hupz5v/Q4wLz+dhjtoA7gHNJtpdi9F7eusrI40xDVL0ZPbm/n5z9EirnfV04DNhb cNa6LssK2NvZJV75abYL5ogw0dtsh+x1JyZEhT8zuaXrDWZRe3g0/s0JWDdGjraU fQjQPSMuGLGwn9QyqtdRExiFAgtRy2YL729KlPmD5TinM29a2oph1rOF8FtAjJ3o S1dlNu8iJXn1c+I7EyICRB7oEAzqCJ60dUq/xXkFGtmc4+LSGsXbfXmERPVKlo26 hicO87OournUbKlac+OcA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ac3b6c9c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 22 Jan 2024 21:11:42 +0000 (UTC) Message-ID: <5bca88c6bdbd839be356e3c6532a32e9bf03b847.1705957508.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sun, 14 Jan 2024 13:11:03 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches From: Vivien Kraus via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Spam-Score: -3.17 X-Migadu-Queue-Id: 634E0814B X-Migadu-Spam-Score: -3.17 X-TUID: G7h6zHFcN+t5 * gnu/packages/gnome.scm (deja-dup): Update to 45.2. [arguments]: Convert to list of G-Expressions. Change-Id: I60823287827b0690796fec7955bcf9682acd88b3 --- gnu/packages/gnome.scm | 73 +++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3d89f06d6a..75e2e0efb8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1823,50 +1823,51 @@ (define-public gnome-menus (define-public deja-dup (package (name "deja-dup") - (version "43.4") + (version "45.2") (source (origin (method url-fetch) (uri (string-append "https://gitlab.gnome.org/World/deja-dup/-/archive/" version "/deja-dup-" version ".tar.bz2")) (sha256 (base32 - "1mr2g009w0zm5rj8dg1k77c7zdwylih2yszm8vh8wkw6al6bzfh3")))) + "000cwy1haiglkvn5plmhrs2a1fhpcpw6z4mdzck7ybmky795amza")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:configure-flags - (list - ;; Otherwise, the RUNPATH will lack the final path component. - (string-append "-Dc_link_args=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib/deja-dup")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((python (assoc-ref inputs "python"))) - (substitute* '("libdeja/duplicity/DuplicityInstance.vala" - "libdeja/tests/scripts/instance-error.test") - (("/bin/rm") - (which "rm"))) - (substitute* "libdeja/tests/runner.vala" - (("/bin/sh") - (which "sh"))) - (substitute* "libdeja/tests/scripts/instance-error.test" - (("`which python3`") - (string-append python "/bin/python3")))))) - (add-after 'unpack 'patch-libgpg-error - (lambda* (#:key inputs #:allow-other-keys) - (let ((libgpg-error (assoc-ref inputs "libgpg-error"))) - (substitute* "meson.build" - (("(gpgerror_libs = ).*" _ var) - (format #f "~a '-L~a/lib -lgpg-error'\n" var libgpg-error)))))) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Add duplicity to the search path - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/deja-dup") - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "duplicity") "/bin"))))))))) + (list + #:glib-or-gtk? #t + #:configure-flags + #~(list + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib/deja-dup")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((python (assoc-ref inputs "python"))) + (substitute* '("libdeja/duplicity/DuplicityInstance.vala" + "libdeja/tests/scripts/instance-error.test") + (("/bin/rm") + (which "rm"))) + (substitute* "libdeja/tests/runner.vala" + (("/bin/sh") + (which "sh"))) + (substitute* "libdeja/tests/scripts/instance-error.test" + (("`which python3`") + (string-append python "/bin/python3")))))) + (add-after 'unpack 'patch-libgpg-error + (lambda* (#:key inputs #:allow-other-keys) + (let ((libgpg-error (assoc-ref inputs "libgpg-error"))) + (substitute* "meson.build" + (("(gpgerror_libs = ).*" _ var) + (format #f "~a '-L~a/lib -lgpg-error'\n" var libgpg-error)))))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Add duplicity to the search path + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/deja-dup") + `("PATH" ":" prefix + (,(dirname (search-input-file inputs "/bin/duplicity")))))))))) (inputs (list bash-minimal duplicity -- 2.41.0