From patchwork Tue Dec 14 17:21:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 35218 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 BE99027BBEA; Tue, 14 Dec 2021 17:22:09 +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 91AD227BBE9 for ; Tue, 14 Dec 2021 17:22:09 +0000 (GMT) Received: from localhost ([::1]:60702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxBVA-000193-My for patchwork@mira.cbaines.net; Tue, 14 Dec 2021 12:22:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxBV4-00018o-UW for guix-patches@gnu.org; Tue, 14 Dec 2021 12:22:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47891) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxBV4-0004po-Dh for guix-patches@gnu.org; Tue, 14 Dec 2021 12:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mxBV4-0008SX-2R for guix-patches@gnu.org; Tue, 14 Dec 2021 12:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52486] [PATCH] 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 17:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52486 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52486@debbugs.gnu.org Cc: Josselin Poiret X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163950251732506 (code B ref -1); Tue, 14 Dec 2021 17:22:01 +0000 Received: (at submit) by debbugs.gnu.org; 14 Dec 2021 17:21:57 +0000 Received: from localhost ([127.0.0.1]:59437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxBUz-0008SD-Ee for submit@debbugs.gnu.org; Tue, 14 Dec 2021 12:21:57 -0500 Received: from lists.gnu.org ([209.51.188.17]:34046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxBUy-0008S7-O1 for submit@debbugs.gnu.org; Tue, 14 Dec 2021 12:21:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxBUy-000153-Jf for guix-patches@gnu.org; Tue, 14 Dec 2021 12:21:56 -0500 Received: from jpoiret.xyz ([206.189.101.64]:55164) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxBUx-0004nD-7T for guix-patches@gnu.org; Tue, 14 Dec 2021 12:21:56 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 2FE94184F2C; Tue, 14 Dec 2021 17:21:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1639502513; 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; bh=S1XT8Z8VAWTMLv4KGdavR/t9gR0Lt9tQSJOjVOT5Hc4=; b=nEg9Zmu9ypu8yD0+IwP4vLaweJ5ibcJOyTR4KbB4KyS6sgJ2HLzJEPSg4LdKsKsjua+urj gVUX4V/x9WAS7co+A0HzvKD8HJjIi8PXgqinMWPWZy/GjdjGSemguKlGxLHdxTUznRWC2b R/iwscXszny78famR19sp2FZlXA4OZ0N2Z7JDuKwXMOIfukfgi07jSu7W9F9M3k94tvGdh mtge63BD5vux4dLzSPC7Y7WTzsLtKkrI/5xGgyZ6fwganWDvTSN3gJ1lby0PeNUab/6kO5 WksXwSJig6VNZzffFYWU6rk2Z6FJ2vucvpMJKL+U3Y4fghXs3+i2B4WFJ/kXOA== Date: Tue, 14 Dec 2021 18:21:51 +0100 Message-Id: <20211214172151.28831-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 Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: 7 X-Spam_score: 0.7 X-Spam_bar: / X-Spam_report: (0.7 / 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, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=0.292, PDS_OTHER_BAD_TLD=1.997, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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 Grepping the source code shows that librsvg is run by the builder, and not by deluge itself. This fixes propagation conflicting with gtk+'s librsvg. For now, use the C variant to build on all archs. -- >8 -- * gnu/packages/bittorrent.scm (deluge): Do it. --- gnu/packages/bittorrent.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 0dcb1ee991..5513878fc0 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,7 @@ (define-public deluge ("python-twisted" ,python-twisted) ("python-zope-interface" ,python-zope-interface))) (native-inputs - (list intltool python-wheel)) + (list intltool python-wheel 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