From patchwork Wed Jan 19 11:55:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Hrbek X-Patchwork-Id: 36604 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 780C527BBE9; Wed, 19 Jan 2022 13:20:05 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,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 3B49827BBEB for ; Wed, 19 Jan 2022 13:20:04 +0000 (GMT) Received: from localhost ([::1]:60826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAAsd-0001hE-7t for patchwork@mira.cbaines.net; Wed, 19 Jan 2022 08:20:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nA9ZK-00026Y-PH for guix-patches@gnu.org; Wed, 19 Jan 2022 06:56:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59646) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nA9ZK-0005JL-ED for guix-patches@gnu.org; Wed, 19 Jan 2022 06:56:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nA9ZK-0002hI-DV for guix-patches@gnu.org; Wed, 19 Jan 2022 06:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53336] [PATCH] qbittorrent: Bump 4.2.5 -> 4.4.0 References: <20220118032800.19497-1-kreyren@rixotstudio.cz> In-Reply-To: <20220118032800.19497-1-kreyren@rixotstudio.cz> Resent-From: Jacob Hrbek Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Jan 2022 11:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53336 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53336@debbugs.gnu.org Cc: Jacob Hrbek Received: via spool by 53336-submit@debbugs.gnu.org id=B53336.164259336010360 (code B ref 53336); Wed, 19 Jan 2022 11:56:02 +0000 Received: (at 53336) by debbugs.gnu.org; 19 Jan 2022 11:56:00 +0000 Received: from localhost ([127.0.0.1]:52549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nA9ZI-0002h2-Jx for submit@debbugs.gnu.org; Wed, 19 Jan 2022 06:56:00 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:16866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nA9ZF-0002gn-I9 for 53336@debbugs.gnu.org; Wed, 19 Jan 2022 06:55:59 -0500 Date: Wed, 19 Jan 2022 11:55:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rixotstudio.cz; s=protonmail2; t=1642593349; bh=7eI+PqD3zeSamMMXMsusWtHTNYy919Ot7wWeiWMdkYw=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:From:To:Cc; b=JUdTzVnWUPVgajvRgNg+xPV2kWMtxg0OGfk6sgpewdyhmb6AHuJwRR8665yT3pmdM TpOw5V6H6MvoaUfySRt82gdpuXv789kYvqzwdVXelh5LjEMx5CBqleyQKAXR65D/xJ sA85GDJhDF7N3UAeTyueGYEuIxg64XjdaWyqbzkahoLY9eeZaXuNlw2H1mYZX2fGpE hGpUieAV/RcetNlPGqu1B4mHMbeXQIfPDsC2y/dN2sxM1y1OlMzPHebJ4dIE5T1lKa b/Vt2gtz772+4OWEoo3n4zHjQ/XKuKlZvAjOIbep9EeLvOkUHa49gTQPfef+1ZkagF P8skbDQdNjIUA== From: Jacob Hrbek Message-ID: <20220119115522.8192-1-kreyren@rixotstudio.cz> MIME-Version: 1.0 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: Jacob Hrbek Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/bittorrent.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (lambda* (#:key outputs inputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) --- 2.34.0 diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index fa88c91163..dc2e192c2b 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -466,7 +466,7 @@ (define-public libtorrent-rasterbar (define-public qbittorrent (package (name "qbittorrent") - (version "4.2.5") + (version "4.4.0") (source (origin (method git-fetch) @@ -475,7 +475,7 @@ (define-public qbittorrent (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1n613ylg6i9gisgk0dbr2kpfasyizrkdjff1r8smd4vri2qrdksn")))) + (base32 "0aqrcwxi3s2alila3fa7fjs4hifkq7055wa4xvz17hajchs3l567")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -491,6 +491,13 @@ (define-public qbittorrent (guix build qt-utils)) #:phases (modify-phases %standard-phases + ;; The package is checking for a `python` or `python3` executable in an environment variable `PATH` which causes the search engine to fail with "Missing Python Runtime" this phase substitutes the python executables with full path in the nix store executable -- https://issues.guix.gnu.org/53334 + ;; FIXME-QA(Krey): This codeblock depends on upstream's declaration of https://github.com/qbittorrent/qBittorrent/blob/master/src/base/utils/foreignapps.cpp#L277, if the file declaration changes then this phase will be malfunction -> Consider optimizing the upstream code for nix userland + (add-after 'unpack 'python-path-compat + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/base/utils/foreignapps.cpp" + (("if \\(testPythonInstallation\\(\"python3\", pyInfo\\)\\)") + (string-append "if (testPythonInstallation(\"" (search-input-file inputs "/bin/python" ) "\", pyInfo))"))))) (add-after 'install 'wrap-qt