From unknown Fri Jun 20 18:09:48 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#68447 <68447@debbugs.gnu.org> To: bug#68447 <68447@debbugs.gnu.org> Subject: Status: [WIP-PATCH gnome-team] gnu: deja-dup: update to 45.2. Reply-To: bug#68447 <68447@debbugs.gnu.org> Date: Sat, 21 Jun 2025 01:09:48 +0000 retitle 68447 [WIP-PATCH gnome-team] gnu: deja-dup: update to 45.2. reassign 68447 guix-patches submitter 68447 Vivien Kraus severity 68447 normal tag 68447 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 14 07:19:39 2024 Received: (at submit) by debbugs.gnu.org; 14 Jan 2024 12:19:39 +0000 Received: from localhost ([127.0.0.1]:41825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rOzSk-0002o0-Cp for submit@debbugs.gnu.org; Sun, 14 Jan 2024 07:19:38 -0500 Received: from lists.gnu.org ([2001:470:142::17]:46026) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rOzSi-0002nk-Kz for submit@debbugs.gnu.org; Sun, 14 Jan 2024 07:19:37 -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 1rOzSc-0006nH-W4 for guix-patches@gnu.org; Sun, 14 Jan 2024 07:19:31 -0500 Received: from planete-kraus.eu ([89.234.140.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1rOzSa-000648-NJ for guix-patches@gnu.org; Sun, 14 Jan 2024 07:19:30 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 4866a5fe for ; Sun, 14 Jan 2024 12:19:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:mime-version; s=albinoniA; bh=BH Hc+91nTZqDo1loGDSBbOoEcEI=; b=eGz2UTojA6pgepEHbaVcW/gCyaMAsumLdd SyJVakGp/QEbrUFBjnWGmQvqRkDbLiszs07de5/RzM6TIMxBo81uwlDPrpHIVfpb WY0eY7NZy3DguNoccRTQHW67wbHNmbHXE4j1VtqL+lITh4i/Paxl7EdR9vxqDVIj Ys8uXxHg35OtPA/7guQWJ9O+lQLN2HB8OvTPvF4NT/c7J/Ia4uF8AIQYigtVX57s hPhtb8JAb0erC07csl7Tc1N4YgmvBIeBn8+4LEQAt7XyH+f6/2XU7FYgLZocWAjc eu4CCIFr1qW8sjVtW90fwQyqjCbfgdnobmnBuF20sUyy5DH3+geQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 2e75be4a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Sun, 14 Jan 2024 12:19:25 +0000 (UTC) Message-ID: From: Vivien Kraus Date: Sun, 14 Jan 2024 13:11:03 +0100 Subject: [WIP-PATCH gnome-team] gnu: deja-dup: update to 45.2. To: guix-patches@gnu.org X-Debbugs-Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu MIME-Version: 1.0 User-Agent: Evolution 3.48.4 Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, SPF_HELO_PASS=-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: 0.9 (/) 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: -0.1 (/) * gnu/packages/gnome.scm (deja-dup): Update to 45.2. [arguments]: Convert to list of G-Expressions. Change-Id: I60823287827b0690796fec7955bcf9682acd88b3 --- Dear Guix, Due to an update of duplicity, deja-dup does not know how to invoke the duplicity program. The newer version, 45.2, fixes the duplicity invocation, but now I face a new problem: the deja-dup GUI opens a window displaying an error: Traceback (innermost last): File "/gnu/store/f3w57wm0i8q4bvq6xnpsf9v744i7v38l-duplicity-2.1.4/bin/.duplicity-real", line 62, in with_tempdir(main) File "/gnu/store/f3w57wm0i8q4bvq6xnpsf9v744i7v38l-duplicity-2.1.4/bin/.duplicity-real", line 53, in with_tempdir fn() File "/gnu/store/f3w57wm0i8q4bvq6xnpsf9v744i7v38l-duplicity-2.1.4/lib/python3.10/site-packages/duplicity/dup_main.py", line 1545, in main action = cli_main.process_command_line(sys.argv[1:]) File "/gnu/store/f3w57wm0i8q4bvq6xnpsf9v744i7v38l-duplicity-2.1.4/lib/python3.10/site-packages/duplicity/cli_main.py", line 281, in process_command_line config.backend = backend.get_backend(remote_url) File "/gnu/store/f3w57wm0i8q4bvq6xnpsf9v744i7v38l-duplicity-2.1.4/lib/python3.10/site-packages/duplicity/backend.py", line 207, in get_backend obj = get_backend_object(url_string) File "/gnu/store/f3w57wm0i8q4bvq6xnpsf9v744i7v38l-duplicity-2.1.4/lib/python3.10/site-packages/duplicity/backend.py", line 195, in get_backend_object return factory(pu) File "/gnu/store/f3w57wm0i8q4bvq6xnpsf9v744i7v38l-duplicity-2.1.4/lib/python3.10/site-packages/duplicity/backends/giobackend.py", line 57, in __init__ class DupMountOperation(Gio.MountOperation): File "/gnu/store/w7vbks7gzqadxd4ccz7vscsj9w1899gg-python-pygobject-3.46.0/lib/python3.10/site-packages/gi/types.py", line 226, in __init__ super(GObjectMeta, cls).__init__(name, bases, dict_) File "/gnu/store/w7vbks7gzqadxd4ccz7vscsj9w1899gg-python-pygobject-3.46.0/lib/python3.10/site-packages/gi/types.py", line 205, in __init__ cls._type_register(cls.__dict__) File "/gnu/store/w7vbks7gzqadxd4ccz7vscsj9w1899gg-python-pygobject-3.46.0/lib/python3.10/site-packages/gi/types.py", line 217, in _type_register _gi.type_register(cls, namespace.get('__gtype_name__')) RuntimeError: could not create new GType: duplicity+backends+giobackend+DupMountOperation (subclass of GMountOperation) I’m afraid duplicity requires some GNOME libraries for its backend now, or duplicity or deja-dup now require some more glib wrapping. Do you have an idea? Best regards, Vivien 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 d17676f53b..168b9d8abf 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 base-commit: 2cbb1a6e1e2679c7db74b6b906d223fb3661d09f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 22 16:11:52 2024 Received: (at 68447) by debbugs.gnu.org; 22 Jan 2024 21:11:52 +0000 Received: from localhost ([127.0.0.1]:41837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rS1aB-0007pK-Uv for submit@debbugs.gnu.org; Mon, 22 Jan 2024 16:11:52 -0500 Received: from planete-kraus.eu ([89.234.140.182]:55636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rS1a7-0007p0-Qz for 68447@debbugs.gnu.org; Mon, 22 Jan 2024 16:11:50 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 36a9e77a; Mon, 22 Jan 2024 21:11:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:cc:mime-version; s=albinoniA; bh=mhTV7ex5HHfhSOND7w6JJvqGhFs=; b=R3zgWk29QGN3v2CAnaogk8vk9tHV 8WJVV0mnH9vFu41by1G2VqQRqQKTkQGnmcX+N7w2BjnPjB3ddRMco+RUH1Srgx8B Atm6fJ6GayQ+Go3qL/7IDfhP6zw5alENUABVgoPLb3wzzpnEe5Nbsd1MfrUIFxs0 J2P4/Kkx+LK7egqLGA8jpp11TxAJnv75UPrR8Wkz0mI0/jzggvtZrCsZvTs14DJ/ oy2MIn6JxJwgglAKFJRCMk0AUdS8Wj1hApWPtRoPbMIQaOYQ1w4XStdcCONrZ7pB X0R6+wOmhZ/W8krpUeB1ypPyjwzlfdIpooeZHdWRDQZFUUF2WF7Dyr0mkg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 37ed9ac3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 22 Jan 2024 21:11:36 +0000 (UTC) Message-ID: From: Vivien Kraus Date: Mon, 22 Jan 2024 22:05:08 +0100 Subject: [PATCH gnome-team v2 0/2] Update deja-dup (and fix duplicity) To: 68447@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.48.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68447 Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com 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: -1.0 (-) Dear guix, The new duplicity needs to be wrapped! I’m not sure that’s exactly how you should do it, but I could resume my long interrupted backups tonight. Best regards, Vivien Vivien Kraus (2): gnu: duplicity: Wrap for GI_TYPELIB_PATH. gnu: deja-dup: update to 45.2. gnu/packages/backup.scm | 8 ++++- gnu/packages/gnome.scm | 73 +++++++++++++++++++++-------------------- 2 files changed, 44 insertions(+), 37 deletions(-) base-commit: 49897f2dde7f469c83c496fad2699d3a05f72701 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 22 16:11:56 2024 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: From: Vivien Kraus Date: Sun, 14 Jan 2024 13:11:03 +0100 Subject: [PATCH gnome-team v2 2/2] gnu: deja-dup: update to 45.2. To: 68447@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.48.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 68447 Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com 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: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 22 16:11:56 2024 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: From: Vivien Kraus Date: Mon, 22 Jan 2024 22:02:42 +0100 Subject: [PATCH gnome-team v2 1/2] gnu: duplicity: Wrap for GI_TYPELIB_PATH. To: 68447@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.48.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68447 Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com 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: -1.0 (-) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 23 00:16:54 2024 Received: (at 68447) by debbugs.gnu.org; 23 Jan 2024 05:16:54 +0000 Received: from localhost ([127.0.0.1]:42055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rS99a-00044O-7c for submit@debbugs.gnu.org; Tue, 23 Jan 2024 00:16:54 -0500 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:44202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rS99W-000448-Cc for 68447@debbugs.gnu.org; Tue, 23 Jan 2024 00:16:52 -0500 Received: by mail-ed1-x542.google.com with SMTP id 4fb4d7f45d1cf-55783b7b47aso4385361a12.0 for <68447@debbugs.gnu.org>; Mon, 22 Jan 2024 21:16:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705987000; x=1706591800; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=45dDgj+kzgEtSOJaAB8y/ctTffg/yirpZI7THE3l1kw=; b=bm6ddKKK1PPeQ4F1hjEF7W1Bw5F+j3glYltwAQv8rsUFgIHtaWyUOOyqp/O0DqdATZ Y7wh4u0iCx4fxCaCYTdsAERCKrgIKb4bOMHy/HGCStLgXxOQr5aFw3A5kZfOLsMLP/wC u1W+nS26Ph57pU77GgDzCLAMn/SqbpsqXUEewmrm1QmH6FZMdoDNGrlMlXKp0OBAH8pb kroMFDR0HOhsWWtSSRXhAwX+zu4kEhvQ+4Gk6/WeRGxq18pAf0xBTWrpjF7Wb2yvMu3s LO0bIAqekBcliC5xVj3pCjnzKsxKRSJOBBFZQvMRqk7abzlROcifJBlj0fh0fGoxnOaE H7KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705987000; x=1706591800; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=45dDgj+kzgEtSOJaAB8y/ctTffg/yirpZI7THE3l1kw=; b=DJhmL9wKeGc/FYxvGT2WJuvOPbgrKh6XZ1apypuLr3NqsgNu+zGUaO7FJ5i0yLIWr0 QgsvKN1Hemp2nz42FLCQpN2Uu6UGXTiKj+xb2uCKwl0y4Vc8dSzO8N5fPWfD6x4XwMC3 jbIW77YEDPzDYHMgas6/xPBvbYSOjh8IvxToVG0DZNRynJrT74TUG7+prtwIiPBGtz3v pGAXOy5fY34C9OFnQGpl+OU3o/CqTLY0Nxs3Rlu2FQm2gEQYHUQMv6mvjS6Ypbk50aVl vMS3TwKx4ZdgdVP0V89rmoQtRWOdmooRAtKuPJwdd89BZ3vJK7rl0Fx7AGAyOrYgxS+j Fm6A== X-Gm-Message-State: AOJu0YwLiQFGycSrEFWG985Mqg6euNXHYglJp6t/QhCSirVvHFt4XHHX 7EPlcPFngH8yqBQivkEChvT+FwNEWtxH5TUFgXQ7mze1fDTQfEic X-Google-Smtp-Source: AGHT+IFKF0bZ5AK9bL/6dgbC8GXgMLBq6+WwTux4sfbsnFB8q4mZwNjmWp071974vIuVAAqK4ThoVg== X-Received: by 2002:a05:6402:2286:b0:55a:7d2a:49c6 with SMTP id cw6-20020a056402228600b0055a7d2a49c6mr407288edb.77.1705986999559; Mon, 22 Jan 2024 21:16:39 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id f16-20020a056402151000b0055c0167eb9fsm3173973edw.51.2024.01.22.21.16.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 21:16:39 -0800 (PST) Message-ID: <79183dfbd9c07125e3ab4e70b3ce2e748cde25ed.camel@gmail.com> Subject: Re: [PATCH gnome-team v2 1/2] gnu: duplicity: Wrap for GI_TYPELIB_PATH. From: Liliana Marie Prikler To: Vivien Kraus , 68447@debbugs.gnu.org Date: Tue, 23 Jan 2024 06:16:37 +0100 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68447 Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com 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: -1.0 (-) Am Montag, dem 22.01.2024 um 22:02 +0100 schrieb Vivien Kraus: > * gnu/packages/backup.scm (duplicity) [native-inputs]: Add > gobject-introspection. > [#:phases]: Add 'gi-wrap. >=20 > Change-Id: If9d6a6bb0e855a4d775c1e4adb3b07f71be43090 > --- LGTM. From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 29 13:08:20 2024 Received: (at 68447) by debbugs.gnu.org; 29 Jan 2024 18:08:20 +0000 Received: from localhost ([127.0.0.1]:33415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUW3Q-0006Ov-26 for submit@debbugs.gnu.org; Mon, 29 Jan 2024 13:08:20 -0500 Received: from planete-kraus.eu ([89.234.140.182]:36502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUW3K-0006OR-Aa for 68447@debbugs.gnu.org; Mon, 29 Jan 2024 13:08:18 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id a3354de8; Mon, 29 Jan 2024 18:07:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:cc:mime-version; s=albinoniA; bh=lIXZnfIa9HY01Zmyg1/9FhvFO4g=; b=RZHlC2YyrUt+NNR/JjVS+hEqAI/y 3q5TkvuydkZvqlHGSAW/LFxleUEbRwfZ4LNTbi6wFH8KoWqafpz6memt8PIBbCfH WUsUsy0nLLfseQpR8cRZFPaUk9grRiN1DbkJ5JWXNLoB+ITzkCUf9tibt0k49M/m 43Ls3WdJDwgRHDXT1wCs4lcpIl3gWZ/jm2rs2NeY3XyAwUCbjA3Nr7NhAEr7UnJ7 pOFYfnIKUYIKgxM/w1dOlrTHEevHAh104TJXglA5VDFwIhHbinwQM4LV2we2jw4C /FnMYNgVVZP7qOpCp0N3EVpjKFBKo0+OSp2N/++0kB6QFCokVkVSkUB/zw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id b36f5fab (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 29 Jan 2024 18:07:57 +0000 (UTC) Message-ID: From: Vivien Kraus Date: Mon, 29 Jan 2024 18:56:38 +0100 Subject: [PATCH gnome-team v3 0/2] Wrap duplicity, with bash-minimal! To: 68447@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.48.4 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68447 Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com 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: -1.0 (-) Dear guix, Oops, I forgot to run guix lint! QA told me I should have added bash-minimal to the duplicity inputs. That’s what I did in this v3. What do you think? Best regards, Vivien Vivien Kraus (2): gnu: duplicity: Wrap for GI_TYPELIB_PATH. gnu: deja-dup: update to 45.2. gnu/packages/backup.scm | 11 +++++-- gnu/packages/gnome.scm | 73 +++++++++++++++++++++-------------------- 2 files changed, 46 insertions(+), 38 deletions(-) base-commit: 2e7d78b1f02a8eae82c34e5183134c9d1a0d02b3 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 29 13:08:20 2024 Received: (at 68447) by debbugs.gnu.org; 29 Jan 2024 18:08:20 +0000 Received: from localhost ([127.0.0.1]:33417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUW3Q-0006Ox-Bm for submit@debbugs.gnu.org; Mon, 29 Jan 2024 13:08:20 -0500 Received: from planete-kraus.eu ([2a00:5881:4008:2810::309]:42638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUW3M-0006OU-4T for 68447@debbugs.gnu.org; Mon, 29 Jan 2024 13:08:18 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 898015ff; Mon, 29 Jan 2024 18:08:02 +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=L755QaTUytck5aj2XVs3VLOXDHU=; b=S xcP3XaI1C2Y6SETVFr4pSopjO0WqWvK2fOnjlOo9tOh84Ms44H9GPJHbCK5EAd6p YRAtSsDL5PEnlse9T0QCMNZ4jj2aOAqi38SV0CsvDbaWRuuhzGM1zCOp/nlUwXmT HsXf+QA2mrv7RTH8tO8RY1nE5NvX8Oj1V+BUSD+/myrlkCeVfPZ9861uuZIPVj8c OtayJewyqL88Z9UHZl5A/CuDROmcmoc/JAIyQ2YgmC908IPhKLbNrNYlWtl2WDQe VNaU2ix41VKXm9BCCU84MS62i99iB9Vv9R9vazg4QoIdAnikhZ9lHxLW5tQXn4/s hHdk8++GEng5M0wezECOA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id fed28678 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 29 Jan 2024 18:08:01 +0000 (UTC) Message-ID: <8e89d62b7cc2d3a0197633964c080c569eb5bc73.1706550998.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Mon, 22 Jan 2024 22:02:42 +0100 Subject: [PATCH gnome-team v3 1/2] gnu: duplicity: Wrap for GI_TYPELIB_PATH. To: 68447@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.48.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/backup.scm (duplicity) [native-inputs]: Add gobject-introspection. [inputs]: Add bash-minimal. [#:phases]: Add 'gi-wrap. Change-Id: If9d6a6bb0e855a4d775c1e4adb3b07f71be43090 --- gnu/packages/backup.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 68447 Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com 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: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/backup.scm (duplicity) [native-inputs]: Add gobject-introspection. [inputs]: Add bash-minimal. [#:phases]: Add 'gi-wrap. Change-Id: If9d6a6bb0e855a4d775c1e4adb3b07f71be43090 --- gnu/packages/backup.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/backup.scm (duplicity) [native-inputs]: Add gobject-introspection. [inputs]: Add bash-minimal. [#:phases]: Add 'gi-wrap. Change-Id: If9d6a6bb0e855a4d775c1e4adb3b07f71be43090 --- gnu/packages/backup.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 3126464347..e627531102 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 @@ -132,7 +133,8 @@ (define-public duplicity (propagated-inputs (list python-lockfile python-pygobject python-urllib3)) (inputs - (list dbus ; dbus-launch (Gio backend) + (list bash-minimal ; to run the wrapped program + dbus ; dbus-launch (Gio backend) librsync lftp gnupg ; gpg executable needed @@ -172,7 +174,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 29 13:08:29 2024 Received: (at 68447) by debbugs.gnu.org; 29 Jan 2024 18:08:29 +0000 Received: from localhost ([127.0.0.1]:33419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUW3Y-0006PK-PL for submit@debbugs.gnu.org; Mon, 29 Jan 2024 13:08:29 -0500 Received: from planete-kraus.eu ([89.234.140.182]:36502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUW3O-0006OR-Sn for 68447@debbugs.gnu.org; Mon, 29 Jan 2024 13:08:19 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 567d9827; Mon, 29 Jan 2024 18:08:05 +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=i BPm94Ta5D0kB1yqSdmuMy71G3DwgVfsiS9VYcqckqC9bb5Rv2aAdDLlsu0SZrXud JtC2s2OkkK+hM3ZzmfVaAJzQqiKWMg2nJk1uL18s6eK1KbjM+pedGNRdOptJz0GE LpqpWq3dJSvggna/MK4JB7hUeccGYk1V6zlBV7tTPzrUy7aOH2OpA0TOoubUvfOB YJ5r6U3s+nF03Nt2iiqAmyR84EenkBzmKhBqysUu09TcXYcj6r4t3XIhwQcoa2Ph 5wh+D5qAWROfGnxQ6k9N3BHqtWnBQVr+RBSoKh64Og0Ec6RWgwUt2C0CkP1dROKJ sIYhdpoInfsIE5xgQtrtw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 9474225f (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 29 Jan 2024 18:08:04 +0000 (UTC) Message-ID: In-Reply-To: References: From: Vivien Kraus Date: Sun, 14 Jan 2024 13:11:03 +0100 Subject: [PATCH gnome-team v3 2/2] gnu: deja-dup: update to 45.2. To: 68447@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.48.4 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 68447 Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com 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: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 06 12:06:45 2024 Received: (at 68447-done) by debbugs.gnu.org; 6 Feb 2024 17:06:45 +0000 Received: from localhost ([127.0.0.1]:55024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXOuD-0005lT-3E for submit@debbugs.gnu.org; Tue, 06 Feb 2024 12:06:45 -0500 Received: from planete-kraus.eu ([89.234.140.182]:43780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXOuB-0005lF-1O for 68447-done@debbugs.gnu.org; Tue, 06 Feb 2024 12:06:43 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id c9e1c859 for <68447-done@debbugs.gnu.org>; Tue, 6 Feb 2024 17:06:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:content-type :content-transfer-encoding:mime-version; s=albinoniB; bh=zL99X1f eClKzAJqa1XwVXoFw9MQ=; b=bREm4wpeBq3icZguQQ7JB1OVopCol+M96QPuhed xOT4+aEV4ioO+YkB9he9OCtXpX9BXTJwmst4lQNQfkG6aWHxXQJXDETouYrGK0+K bwGhp06jpPhTYGgt0pVqvGAZAUsY+G0LuYM+Jyl9DcPCgTiO5FmT1mhwv0F6A1UQ y+nM3Ue5yV7+7uivX48e7ct309lrNzg7uYT+f/JNlJFXaxpISaArBu+al/PZB34S 1l8G6c+SQhAS6vpCteXxFInW+lz1De0SMT8d+yOiIIn28JXBUJV2rlzoKWyKgDlu 1tAafIyOWrhdtkJxLPRfrfHG+EWuXK9srm/elJXgfDiUe6Q== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 66f58887 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <68447-done@debbugs.gnu.org>; Tue, 6 Feb 2024 17:06:23 +0000 (UTC) Message-ID: <156d3c9b8e0be04199491fc54f9939bdc19c563d.camel@planete-kraus.eu> Subject: [WIP-PATCH gnome-team] gnu: deja-dup: update to 45.2. From: Vivien Kraus To: 68447-done@debbugs.gnu.org Date: Tue, 06 Feb 2024 18:06:22 +0100 Content-Type: text/plain Content-Transfer-Encoding: 7bit User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68447-done 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: -1.0 (-) It has already been applied, thank you! From unknown Fri Jun 20 18:09:48 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 06 Mar 2024 12:24:06 +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