From patchwork Tue Sep 1 21:22:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 23861 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 C514C27BBE8; Tue, 1 Sep 2020 22:24:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A6C0427BBE7 for ; Tue, 1 Sep 2020 22:24:13 +0100 (BST) Received: from localhost ([::1]:45646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDDlE-0005jj-Op for patchwork@mira.cbaines.net; Tue, 01 Sep 2020 17:24:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDDk7-0004gd-J9 for guix-patches@gnu.org; Tue, 01 Sep 2020 17:23:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45981) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDDk6-0002jd-JX for guix-patches@gnu.org; Tue, 01 Sep 2020 17:23:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kDDk6-0005tg-FZ for guix-patches@gnu.org; Tue, 01 Sep 2020 17:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43161] [PATCH] gnu: deluge: Update to 2.0.3. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Sep 2020 21:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43161 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43161@debbugs.gnu.org Cc: Kei Kebreau X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159899537322636 (code B ref -1); Tue, 01 Sep 2020 21:23:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Sep 2020 21:22:53 +0000 Received: from localhost ([127.0.0.1]:57527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDDjw-0005t2-TO for submit@debbugs.gnu.org; Tue, 01 Sep 2020 17:22:53 -0400 Received: from lists.gnu.org ([209.51.188.17]:51490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDDjt-0005ss-G9 for submit@debbugs.gnu.org; Tue, 01 Sep 2020 17:22:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDDjt-0004ay-1V for guix-patches@gnu.org; Tue, 01 Sep 2020 17:22:49 -0400 Received: from mout02.posteo.de ([185.67.36.66]:60317) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDDjl-0002hr-4i for guix-patches@gnu.org; Tue, 01 Sep 2020 17:22:48 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 21FB72400FD for ; Tue, 1 Sep 2020 23:22:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1598995357; bh=2i2g9XF6txFubTe+JBhjfBIsmdRB9APeeE4uW3llvsE=; h=From:To:Cc:Subject:Date:From; b=FwGIg4KxlvYFy24y/ZE1iAVq0BqsU9APZUiXe35wtEFeK+nM2UGYd0c0HpoxwZtmM xZvi+412sUJSk00GOx/K6Bqx6x8npmYJbJ765mmG2cNiGK4IJO+porjk/IZg1xJkh5 lQJQgxeoeeRwYa4EcqOxHGJkmVgRwGA1xiP7x56EBpVIrOLWhtsY3uES2FcT9Kql5z 0Ah4A29ZH6QMfI1SFlI3jECDu9lQgHqqXURo4V/Gr7a5mbOTyzDfks6dE9WQqD/RLf 95gX8Afkx7v+5WavAe421GzM1QsC7phtn5akNUMo2rlODWGvpNRQeQzgBCG4XOcyd1 3+V4IT//wWPkw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Bh0Qg6WgZz9rxQ; Tue, 1 Sep 2020 23:22:35 +0200 (CEST) From: Kei Kebreau Date: Tue, 1 Sep 2020 17:22:17 -0400 Message-Id: <20200901212217.29981-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=kkebreau@posteo.net; helo=mout02.posteo.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 17:22:37 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bittorrent.scm (deluge): Update to 2.0.3. [source]: Update URL. [inputs]: Remove libtorrent, python2-chardet, python2-pygtk, python2-pyopenssl, python2-pyxdg, python2-service-identity, python2-twisted. [propagated-inputs]: Add gobject-introspection, gtk+, librsvg, libtorrent, python-pycairo, python-chardet, python-dbus, python-mako, python-pygobject, python-pillow, python-pyopenssl, python-pyxdg, python-rencode, python-service-identity, python-setproctitle, python-six, python-twisted, and python-zope-interface. [native-inputs]: Add python-wheel. [arguments]: Disable tests. Add 'wrap phase. --- gnu/packages/bittorrent.scm | 60 ++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index f54e568b55..7df9f5fe5b 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -34,6 +34,7 @@ #:use-module (guix build-system python) #:use-module (guix build-system glib-or-gtk) #:use-module ((guix licenses) #:prefix l:) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages adns) #:use-module (gnu packages boost) @@ -55,6 +56,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sqlite) @@ -465,29 +467,59 @@ features.") (define-public deluge (package (name "deluge") - (version "1.3.15") + (version "2.0.3") (source (origin (method url-fetch) (uri (string-append - "http://download.deluge-torrent.org/source/deluge-" - version ".tar.xz")) + "https://ftp.osuosl.org/pub/deluge/source/" + (version-major+minor version) "/deluge-" version ".tar.xz")) (sha256 (base32 - "0b7rri4x0wrcj7rjghrnw1kfrsd5i7i6aq85dsg5dg1w1qa0ar59")))) + "14d8kn2pvr1qv8mwqrxmj85jycr73vwfqz12hzag0ararbkfhyky")))) (build-system python-build-system) - (inputs - `(("libtorrent" ,libtorrent-rasterbar) - ("python2-chardet" ,python2-chardet) - ("python2-pygtk" ,python2-pygtk) - ("python2-pyopenssl" ,python2-pyopenssl) - ("python2-pyxdg" ,python2-pyxdg) - ("python2-service-identity" ,python2-service-identity) - ("python2-twisted" ,python2-twisted))) + (propagated-inputs + `(("gobject-introspection" ,gobject-introspection) + ("gtk+" ,gtk+) + ("librsvg" ,librsvg) + ("libtorrent" ,libtorrent-rasterbar) + ("python-pycairo" ,python-pycairo) + ("python-chardet" ,python-chardet) + ("python-dbus" ,python-dbus) + ("python-mako" ,python-mako) + ("python-pygobject" ,python-pygobject) + ("python-pillow" ,python-pillow) + ("python-pyopenssl" ,python-pyopenssl) + ("python-pyxdg" ,python-pyxdg) + ("python-rencode" ,python-rencode) + ("python-service-identity" ,python-service-identity) + ("python-setproctitle" ,python-setproctitle) + ("python-six" ,python-six) + ("python-twisted" ,python-twisted) + ("python-zope-interface" ,python-zope-interface))) (native-inputs - `(("intltool" ,intltool))) + `(("intltool" ,intltool) + ("python-wheel" ,python-wheel))) + ;; 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 that + ;; require a network connection. (arguments - `(#:python ,python-2)) + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (for-each + (lambda (program) + (wrap-program program + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) + (map (lambda (name) + (string-append out "/bin/" name)) + '("deluge" "deluge-gtk")))) + #t))))) (home-page "https://www.deluge-torrent.org/") (synopsis "Fully-featured cross-platform ​BitTorrent client") (description