From patchwork Tue Dec 14 19:17:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 35219 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 71BE327BBEA; Tue, 14 Dec 2021 19:18:23 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 397DC27BBE9 for ; Tue, 14 Dec 2021 19:18:23 +0000 (GMT) Received: from localhost ([::1]:58198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxDJe-0004Gz-5S for patchwork@mira.cbaines.net; Tue, 14 Dec 2021 14:18:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxDJK-0004F6-N6 for guix-patches@gnu.org; Tue, 14 Dec 2021 14:18:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48083) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxDJK-0004xR-EK for guix-patches@gnu.org; Tue, 14 Dec 2021 14:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mxDJK-00058D-Af for guix-patches@gnu.org; Tue, 14 Dec 2021 14:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52486] [PATCH v2 1/2] gnu: deluge: Move librsvg to native inputs Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Dec 2021 19:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52486 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 52486@debbugs.gnu.org, Josselin Poiret Received: via spool by 52486-submit@debbugs.gnu.org id=B52486.163950943819660 (code B ref 52486); Tue, 14 Dec 2021 19:18:02 +0000 Received: (at 52486) by debbugs.gnu.org; 14 Dec 2021 19:17:18 +0000 Received: from localhost ([127.0.0.1]:59625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxDIc-000571-Ks for submit@debbugs.gnu.org; Tue, 14 Dec 2021 14:17:18 -0500 Received: from jpoiret.xyz ([206.189.101.64]:34574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxDIb-00056h-5L for 52486@debbugs.gnu.org; Tue, 14 Dec 2021 14:17:17 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 28185184F6E; Tue, 14 Dec 2021 19:17:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1639509436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cgJ6Rof07VndZikG2ZfR0zMg1WboGFudN3AIGcjINyk=; b=s8zA4AboJg5gAQhfpC+IuFLm+cw2i8BgzD4LzYsfWYDVzC47leGjEys4vjJyfeVS8OZdw4 SC0DL4Ze6SEXJA35z4MftAk038GVQ89di0I/1s2N6mq0BmS699iJDGZYdADZrEStb65yRt tuVuLtdcLko09JK1A7G8WuE8B59XrE2BqQYmt12F6mFb90nl+qETFeRT/z8ONTK3Wqezgw +xl5I/IM7uEs6eaflzyU0e/MdszWfbCUMH6IsT5o0IUEFUMs8s8v1OgFz71wIQAx8+B/Z0 v0OTvd7im7fRf4Er57V+m285NjeZzbZ2oMppCUNAmzK8mytulNWMWKoDDyTKPA== Date: Tue, 14 Dec 2021 20:17:12 +0100 Message-Id: <20211214191713.18665-2-dev@jpoiret.xyz> In-Reply-To: <20211214191713.18665-1-dev@jpoiret.xyz> References: <20211214191713.18665-1-dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bittorrent.scm (deluge): Do it. --- gnu/packages/bittorrent.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 0dcb1ee991..6c6d01991a 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -528,7 +528,6 @@ (define-public deluge (build-system python-build-system) (propagated-inputs `(("gtk+" ,gtk+) - ("librsvg" ,librsvg) ("libtorrent" ,libtorrent-rasterbar) ("python-pycairo" ,python-pycairo) ("python-chardet" ,python-chardet) @@ -545,7 +544,10 @@ (define-public deluge ("python-twisted" ,python-twisted) ("python-zope-interface" ,python-zope-interface))) (native-inputs - (list intltool python-wheel)) + (list intltool python-wheel + (if (string-prefix? "x86_64-" (%current-system)) + librsvg-bootstrap + librsvg-2.40))) ;; TODO: Enable tests. ;; After "pytest-twisted" is packaged, HOME is set, and an X server is ;; started, some of the tests still fail. There are likely some tests From patchwork Tue Dec 14 19:17:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 35220 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 64E6927BBEA; Tue, 14 Dec 2021 19:19:11 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 353A527BBE9 for ; Tue, 14 Dec 2021 19:19:11 +0000 (GMT) Received: from localhost ([::1]:59068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxDKQ-0004uE-Bn for patchwork@mira.cbaines.net; Tue, 14 Dec 2021 14:19:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxDJL-0004Gk-Fq for guix-patches@gnu.org; Tue, 14 Dec 2021 14:18:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48085) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxDJL-0004xd-6s for guix-patches@gnu.org; Tue, 14 Dec 2021 14:18:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mxDJL-00058S-3J for guix-patches@gnu.org; Tue, 14 Dec 2021 14:18:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52486] [PATCH v2 2/2] gnu: deluge: Remove reference of build-time librsvg Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Dec 2021 19:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52486 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 52486@debbugs.gnu.org, Josselin Poiret Received: via spool by 52486-submit@debbugs.gnu.org id=B52486.163950943919674 (code B ref 52486); Tue, 14 Dec 2021 19:18:03 +0000 Received: (at 52486) by debbugs.gnu.org; 14 Dec 2021 19:17:19 +0000 Received: from localhost ([127.0.0.1]:59629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxDId-00057A-2I for submit@debbugs.gnu.org; Tue, 14 Dec 2021 14:17:19 -0500 Received: from jpoiret.xyz ([206.189.101.64]:34662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxDIb-00056l-QJ for 52486@debbugs.gnu.org; Tue, 14 Dec 2021 14:17:18 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id EAC1C184F6F; Tue, 14 Dec 2021 19:17:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1639509437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=70xBMrJqKL6nPr3mubE4xQxUgpqI1YeIjNCqPyoctvo=; b=NwlWppbHIixjp14M3WoCBaoG0CvhHGuCxGzdTBNJwN/YRTnv856R2nH0Un8+AlvV2tVx8Z gtYpsfTTec//WZYc7aLwI2NpwNppOL0+Avnkj2AvZ0IN22BgJr8nwR07fQZrl/YX3gyCPO 1FLtBCqXMb/qpbT8zJ21/uC0Z/G0P8050vQpx/vg1t/Ek41d06OsQ8sgIuti+EFwRMScrG 3BsB6qhZa7SD2FQvFKSN5JaE7DpqRg3mWGP4vD+VcNPmBb9H7JosDw44JXiAAeQcZ8MZnC m/Y2VtlUHjx21O0ihpd74/MjirOcUkPFjAUxdToyIQ9y+epUm9soRMe48DpWHw== Date: Tue, 14 Dec 2021 20:17:13 +0100 Message-Id: <20211214191713.18665-3-dev@jpoiret.xyz> In-Reply-To: <20211214191713.18665-1-dev@jpoiret.xyz> References: <20211214191713.18665-1-dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bittorrent.scm (deluge): Do it. --- gnu/packages/bittorrent.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 6c6d01991a..2a59b94f92 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -564,9 +564,19 @@ (define-public deluge (("names='ngettext'") "names=['ngettext']")) #t)) (add-after 'install 'wrap - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (gi-typelib-path + (string-join (filter + (lambda (x) (not (string-prefix? + (assoc-ref + (or native-inputs inputs) + "librsvg") + x))) + (string-split + (getenv "GI_TYPELIB_PATH") + #\:)) + ":"))) (for-each (lambda (program) (wrap-program program