From patchwork Mon Jan 22 21:02:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 59319 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 62DCE27BBE9; Mon, 22 Jan 2024 21:12:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED 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 681CE27BBE2 for ; Mon, 22 Jan 2024 21:12:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rS1aM-0004jp-Pm; Mon, 22 Jan 2024 16:12:02 -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-0004ip-R6 for guix-patches@gnu.org; Mon, 22 Jan 2024 16:12:00 -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-000277-J3 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-0007qQ-P1 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 1/2] gnu: duplicity: Wrap for GI_TYPELIB_PATH. 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.170595791630123 (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]:41841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rS1aG-0007pi-2W for submit@debbugs.gnu.org; Mon, 22 Jan 2024 16:11:56 -0500 Received: from planete-kraus.eu ([2a00:5881:4008:2810::309]:47258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rS1a9-0007p2-Av for 68447@debbugs.gnu.org; Mon, 22 Jan 2024 16:11:53 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id a3ea4e1f; Mon, 22 Jan 2024 21:11:39 +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=kzAwKtBTx/97FJkM0UCBJjguCQo=; b=R mgd0YewyuRx4KzYZU/nwcpa1O+r/HM37yQwYWFCAMBe3081kBA2ta0hr+qruNkSz uEu8DJjr07Ih8PtfedLeO5ok44PuPsCSCyzUZa/t7cgQBTJCQzW8CxUshSN+5ytM OJIwy2+YEakWdDj++lidx6vr1vHGEhfnlL0sGpzms+UGp3V4gotHM/MB/lQmzs/m 8CFvs4v97V5+pkipfF1+ujHcoPBXOsCS6D/TI4jWIvb/b79BAKACY9dvuvOtm8im CMlhF/UPQ3wxgu2oAZ+awfQE6mrSyBlNtT7oEV1WNKxGTbSJxp1r3ZPdfwihHzdU dEyngLN7eDpOgiUzPX7/g== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 315cfd36 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 22 Jan 2024 21:11:39 +0000 (UTC) Message-ID: In-Reply-To: References: Date: Mon, 22 Jan 2024 22:02:42 +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 X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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/backup.scm (duplicity) [native-inputs]: Add gobject-introspection. [#:phases]: Add 'gi-wrap. Change-Id: If9d6a6bb0e855a4d775c1e4adb3b07f71be43090 --- gnu/packages/backup.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 3126464347..836a984899 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -118,6 +118,7 @@ (define-public duplicity (build-system python-build-system) (native-inputs (list gettext-minimal ; for msgfmt + gobject-introspection util-linux ; setsid command, for the tests par2cmdline python-fasteners @@ -172,7 +173,12 @@ (define-public duplicity "share/zoneinfo")) ;; Some things respect TMPDIR, others hard-code /tmp, and the ;; defaults don't match up, breaking test_restart. Fix it. - (setenv "TMPDIR" "/tmp")))))) + (setenv "TMPDIR" "/tmp"))) + (add-after 'wrap 'gi-wrap + (lambda _ + (let ((prog (string-append #$output "/bin/duplicity"))) + (wrap-program prog + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))) (home-page "https://duplicity.gitlab.io/duplicity-web/") (synopsis "Encrypted backup using rsync algorithm") (description From patchwork Sun Jan 14 12:11:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 59320 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 61F3727BBEA; Mon, 22 Jan 2024 21:12:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 60AF727BBE2 for ; Mon, 22 Jan 2024 21:12:20 +0000 (GMT) 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 X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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/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