[PATCH] qbittorent: Bump 4.2.5 -> 4.4.0

  • Done
  • quality assurance status badge
Details
3 participants
  • Jacob Hrbek
  • Nicolas Goaziou
  • Maxime Devos
Owner
unassigned
Submitted by
Jacob Hrbek
Severity
normal
J
J
Jacob Hrbek wrote on 18 Jan 2022 04:28
(address . guix-patches@gnu.org)(name . Jacob Hrbek)(address . kreyren@rixotstudio.cz)
20220118032800.19497-1-kreyren@rixotstudio.cz
Signed-off-by: Jacob Hrbek <kreyren@rixotstudio.cz>
---
gnu/packages/bittorrent.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index fa88c91163..ddcfda17f5 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
--
2.34.0
Attachment: publickey - kreyren@rixotstudio.cz - 1677db82.asc
Attachment: signature.asc
M
M
Maxime Devos wrote on 19 Jan 2022 10:04
e6ba425f444db4e41569f6e58152502732920297.camel@telenet.be
Jacob Hrbek schreef op di 18-01-2022 om 03:28 [+0000]:
Toggle quote (2 lines)
> Signed-off-by: Jacob Hrbek <kreyren@rixotstudio.cz>

FWIW, this isn't what ‘Signed-off-by’ means in Guix.  From ‘17.8.2
Commit policy’:

When pushing a commit on behalf of somebody else, please add a
‘Signed-off-by’ line at the end of the commit log message—e.g., with
‘git am --signoff’. This improves tracking of who did what.

Greetings,
Maxime.
Attachment: file
-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYefUIxccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7gOUAP4i0DxXI2ud+9OvcJACb9XPBqHb
G6lOL9klJdOPa9m5pAEA7PIxEjsBDiUx8dxKzBcI3bmZF++KH+a/754p514EYQA=
=DG+g
-----END PGP SIGNATURE-----


M
M
Maxime Devos wrote on 19 Jan 2022 12:43
(name . Jacob Hrbek)(address . kreyren@rixotstudio.cz)(address . 53336@debbugs.gnu.org)
ebfd2aeab5d68c961dfd4e7d0fc05ab54ffc6b06.camel@telenet.be
[Please keep debbugs in CC or To]

Jacob Hrbek schreef op wo 19-01-2022 om 09:49 [+0000]:
Toggle quote (5 lines)
> I don't have commit access so it's projected to be merged by
> privileged developer on my behalf thus the signed-off-by line so that
> i am not held liable (i am aware that GPLv3 has no liability clause)
> for the changes as GNU Guix lacks sufficient QA for the changes imho.

That's neither what that line means in Guix and neither what it means
in Linux (*) (the project that introduced the original Signed-off-by
IIUC), so I don't see where you got this interpretation about Signed-
off-by and liability from.

(*) See Documentation/process/submitting-patches.rst

In fact, Signed-off-by indicates a measure of ‘approval’ (in Guix
quite a bit more than in Linux IIUC) -- it's not explicitly spelled
out, but Linux' and Guix' contributing documentation seems too imply
this to some degree.

As such, assuming ‘Signed-off-by’ impacts liability somehow,
I would find it more likely that it would increase the chance
of being held liable than decreasing the chance of being held
liable. Or maybe the inverse holds, who knows, I don't know
how liability and responsibility works legally.

Greetings,
Maxime.
-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYef5eBccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7p/gAPwJ5NtkVfh4SNwbhuXs+5RlM74n
r6LuV2hSi1yHqBwp2wEAwaSP2dapJxI2E2VFZIuV43DdYnr6kVCY6i6tDLl/nQU=
=JnxX
-----END PGP SIGNATURE-----


J
J
Jacob Hrbek wrote on 19 Jan 2022 12:55
[PATCH] qbittorrent: Bump 4.2.5 -> 4.4.0
(address . 53336@debbugs.gnu.org)(name . Jacob Hrbek)(address . kreyren@rixotstudio.cz)
20220119115522.8192-1-kreyren@rixotstudio.cz
---
gnu/packages/bittorrent.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

Toggle diff (38 lines)
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
Attachment: publickey - kreyren@rixotstudio.cz - 1677db82.asc
Attachment: signature.asc
J
J
Jacob Hrbek wrote on 19 Jan 2022 12:56
(address . 53336@debbugs.gnu.org)
9ccb7f9b-a2e3-836d-3b87-2b064963cc15@rixotstudio.cz
submitted patch without signed-off-by

On 1/19/22 12:55, Jacob Hrbek wrote:
Toggle quote (24 lines)
> ---
> 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)
Toggle quote (11 lines)
> (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
"
Toggle quote (8 lines)
> + (("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
Attachment: publickey - kreyren@rixotstudio.cz - 1677db82.asc
Attachment: signature.asc
N
N
Nicolas Goaziou wrote on 23 Jan 2022 10:48
Re: [bug#53336] [PATCH] qbittorrent: Bump 4.2.5 -> 4.4.0
(name . Jacob Hrbek)(address . kreyren@rixotstudio.cz)(address . 53336@debbugs.gnu.org)
87h79ueq9x.fsf@nicolasgoaziou.fr
Hello,

Jacob Hrbek <kreyren@rixotstudio.cz> writes:

Toggle quote (2 lines)
> submitted patch without signed-off-by

Thank you. However, I'm unable to apply it on top of HEAD. Could you
send it again, with a proper commit message, like the following:

Toggle snippet (5 lines)
gnu: qbittorrent: Update to 4.4.0.

* gnu/packages/bittorrent.scm (qbittorrent): Update to 4.4.0.

Regards,
--
Nicolas Goaziou
J
J
Jacob Hrbek wrote on 23 Jan 2022 10:53
[PATCH] gnu: git-annex: Update to 8.20211231.
(address . 53336@debbugs.gnu.org)
20220123095337.677-1-kreyren@rixotstudio.cz
From: Kyle Meyer <kyle@kyleam.com>
* gnu/packages/haskell-apps.scm (git-annex): Update to 8.20211231.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/haskell-apps.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (23 lines)
diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index ed977f369f..7f777a0873 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -306,14 +306,14 @@ (define-public ghcid
(define-public git-annex
(package
(name "git-annex")
- (version "8.20211123")
+ (version "8.20211231")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"git-annex/git-annex-" version ".tar.gz"))
(sha256
- (base32 "0i9dhh601axv0b1i56yzn6jnfp160z530fp9pd557kpq4nbvg5kl"))))
+ (base32 "0cpa3rl8vcm0arima8x9m5q0a9r05z0851ibr1vcria2z0mmwmi7"))))
(build-system haskell-build-system)
(arguments
`(#:configure-flags
--
2.34.0
Attachment: publickey - kreyren@rixotstudio.cz - 1677db82.asc
Attachment: signature.asc
J
J
Jacob Hrbek wrote on 23 Jan 2022 14:04
[PATCH] gnu: qbittorrent: Update to 4.4.0
(address . 53336@debbugs.gnu.org)
20220123130352.5848-1-kreyren@rixotstudio.cz
* gnu/packages/bittorrent.scm (qbittorrent): Update to 4.4.0
---
gnu/packages/bittorrent.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index fa88c91163..ddcfda17f5 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
--
2.34.0
Attachment: publickey - kreyren@rixotstudio.cz - 1677db82.asc
Attachment: signature.asc
J
J
Jacob Hrbek wrote on 23 Jan 2022 14:05
(address . 53336@debbugs.gnu.org)(address . mail@nicolasgoaziou.fr)
283637dc-7f0a-61de-b4b1-ce24fe1b5fcd@rixotstudio.cz
used too many `^`, my bad!

On 1/23/22 14:04, Jacob Hrbek wrote:
Toggle quote (24 lines)
> * gnu/packages/bittorrent.scm (qbittorrent): Update to 4.4.0
> ---
> gnu/packages/bittorrent.scm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
> index fa88c91163..ddcfda17f5 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 "0aqrcwxi3s2alila3fa7fjs4hifkq7055wa
4xvz17hajchs3l567"))))
Toggle quote (6 lines)
> (build-system gnu-build-system)
> (arguments
> `(#:configure-flags
> --
> 2.34.0
>
--
Jacob Hrbek
Attachment: publickey - kreyren@rixotstudio.cz - 1677db82.asc
Attachment: signature.asc
N
N
Nicolas Goaziou wrote on 23 Jan 2022 17:43
Re: [bug#53336] [PATCH] gnu: qbittorrent: Update to 4.4.0
(name . Jacob Hrbek)(address . kreyren@rixotstudio.cz)(address . 53336-done@debbugs.gnu.org)
87a6fme72e.fsf@nicolasgoaziou.fr
Hello,

Jacob Hrbek <kreyren@rixotstudio.cz> writes:

Toggle quote (2 lines)
> * gnu/packages/bittorrent.scm (qbittorrent): Update to 4.4.0

Applied. Thank you.

Regards,
--
Nicolas Goaziou
Closed
J
J
Jacob Hrbek wrote on 23 Jan 2022 17:44
(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)(address . 53336-done@debbugs.gnu.org)
6150e743-cafc-d3e5-e68b-119b53051bda@rixotstudio.cz
yay

On 1/23/22 17:43, Nicolas Goaziou wrote:
Toggle quote (11 lines)
> Hello,
>
> Jacob Hrbek <kreyren@rixotstudio.cz> writes:
>
>> * gnu/packages/bittorrent.scm (qbittorrent): Update to 4.4.0
> Applied. Thank you.
>
> Regards,
> --
> Nicolas Goaziou

--
Jacob Hrbek
Attachment: publickey - kreyren@rixotstudio.cz - 1677db82.asc
Attachment: signature.asc
Closed
?