GNU bug report logs - #53336
[PATCH] qbittorent: Bump 4.2.5 -> 4.4.0

Previous Next

Full log

Message #17 received at 53336 <at> debbugs.gnu.org (full text, mbox):

From: Jacob Hrbek <kreyren <at> rixotstudio.cz>
To: 53336 <at> debbugs.gnu.org
Subject: Re: [PATCH] qbittorrent: Bump 4.2.5 -> 4.4.0
Date: Wed, 19 Jan 2022 11:56:48 +0000

[Message part 1 (text/plain, inline)]

submitted patch without signed-off-by

On 1/19/22 12:55, Jacob Hrbek wrote:
> ---
>   gnu/packages/bittorrent.scm | 11 +++++++++--
>   1 file changed, 9 insertions(+), 2 deletions(-)
>
> 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
>              (lambda* (#:key outputs inputs #:allow-other-keys)
>                (let ((out (assoc-ref outputs "out")))
> --
> 2.34.0
>
--
Jacob Hrbek

[publickey - kreyren@rixotstudio.cz - 1677db82.asc (application/pgp-keys, attachment)]

[signature.asc (application/pgp-signature, attachment)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.