X-Loop: help-debbugs@HIDDEN
Subject: [bug#76015] [PATCH] gnu: haruna: Fix finding yt-dlp.
Resent-From: Sughosha <sughosha@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sun, 02 Feb 2025 16:14:01 +0000
Resent-Message-ID: <handler.76015.B.173851278523980 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 76015
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76015 <at> debbugs.gnu.org
Cc: Sughosha <sughosha@HIDDEN>
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.173851278523980
(code B ref -1); Sun, 02 Feb 2025 16:14:01 +0000
Received: (at submit) by debbugs.gnu.org; 2 Feb 2025 16:13:05 +0000
Received: from localhost ([127.0.0.1]:35933 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tecan-0006Eh-Dc
for submit <at> debbugs.gnu.org; Sun, 02 Feb 2025 11:13:05 -0500
Received: from lists.gnu.org ([2001:470:142::17]:47424)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <sughosha@HIDDEN>)
id 1tecal-0006EA-4c
for submit <at> debbugs.gnu.org; Sun, 02 Feb 2025 11:13:03 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <sughosha@HIDDEN>)
id 1tecaf-0002ZT-Jy
for guix-patches@HIDDEN; Sun, 02 Feb 2025 11:12:57 -0500
Received: from layka.disroot.org ([178.21.23.139])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <sughosha@HIDDEN>)
id 1tecad-0002mL-US
for guix-patches@HIDDEN; Sun, 02 Feb 2025 11:12:57 -0500
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id A885D25CCA;
Sun, 2 Feb 2025 17:12:52 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from layka.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP
id bV6e8IDMO0-8; Sun, 2 Feb 2025 17:12:52 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1738512772; bh=Pj1PvylhN3zsqgh0rpkADwMuDk/l84WuDX4Aa089dyA=;
h=From:To:Cc:Subject:Date;
b=Ku94ItZtwISGtXnHmeGS8kD4sYwegG2D9doxulB+VFaIjmSqb2EWuUGl0KWKzE87R
+09N3IeG+MsBecOYPk/WZzeRB9ZdLMjwzzOLp//l8C6AN/oSVpfPkrFdW8vDrGkdlY
dwNFDP9RzehT1NUSkKzPvhVPEIjIdmO+zqilyFkzLsQ4NA2BI2BCDAB+v/1TcyDA/j
hDjpNu2fBWIQtj0dMbh6t12np6BTaG7zAHgTdI7RnnrneJOzHx3n0a60Sn5VE7ruUr
rTr4buB6YOQ4IOTQyCdd5EdBwqYDInYZM17JGlGL5o5w93Zl0/toXpyeatEbK/riUy
k0yPIprgyaVPw==
From: Sughosha <sughosha@HIDDEN>
Date: Sun, 2 Feb 2025 21:42:21 +0530
Message-ID: <496405a5240077ac386b932d2498d6ebbe4d0af2.1738512741.git.sughosha@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=178.21.23.139; envelope-from=sughosha@HIDDEN;
helo=layka.disroot.org
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)
* gnu/packages/kde-multimedia.scm (yt-dlp)[arguments]<#:phases>: Add wrap-path.
Change-Id: I4f2f7303b02441399c042d4bdd8e7586adfd9fe3
---
gnu/packages/kde-multimedia.scm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index ad0b504268..4d859cdedb 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -156,7 +156,15 @@ (define-public haruna
(base32 "0gvwsxlrwn2s6i4agmwa0r1lq1fybfyxv933g2z3n76qnn9mkbrb"))))
(build-system qt-build-system)
(arguments
- (list #:qtbase qtbase))
+ (list #:qtbase qtbase
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'qt-wrap 'wrap-path
+ (lambda _
+ (wrap-program (string-append #$output "/bin/haruna")
+ `("PATH" ":" prefix
+ (,(string-append #$(this-package-input "yt-dlp")
+ "/bin")))))))))
(native-inputs
(list extra-cmake-modules))
(inputs
base-commit: 070c073d508d3197f0235adc424aec287e7dd916
--
2.47.1
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Sughosha <sughosha@HIDDEN> Subject: bug#76015: Acknowledgement ([PATCH] gnu: haruna: Fix finding yt-dlp.) Message-ID: <handler.76015.B.173851278523980.ack <at> debbugs.gnu.org> References: <496405a5240077ac386b932d2498d6ebbe4d0af2.1738512741.git.sughosha@HIDDEN> X-Gnu-PR-Message: ack 76015 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 76015 <at> debbugs.gnu.org Date: Sun, 02 Feb 2025 16:14:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 76015 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 76015: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D76015 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76015] [PATCH] gnu: haruna: Fix finding yt-dlp.
Resent-From: Z572 <z572@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 06 Feb 2025 17:18:01 +0000
Resent-Message-ID: <handler.76015.B.17388622453741 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76015
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76015 <at> debbugs.gnu.org
Cc: sughosha@HIDDEN
X-Debbugs-Original-To: Sughosha via Guix-patches via <guix-patches@HIDDEN>
X-Debbugs-Original-Cc: 76015 <at> debbugs.gnu.org, Sughosha <sughosha@HIDDEN>
Received: via spool by submit <at> debbugs.gnu.org id=B.17388622453741
(code B ref -1); Thu, 06 Feb 2025 17:18:01 +0000
Received: (at submit) by debbugs.gnu.org; 6 Feb 2025 17:17:25 +0000
Received: from localhost ([127.0.0.1]:59314 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tg5VF-0000yG-HT
for submit <at> debbugs.gnu.org; Thu, 06 Feb 2025 12:17:25 -0500
Received: from lists.gnu.org ([2001:470:142::17]:48386)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <z572@HIDDEN>) id 1tg5VD-0000xz-6B
for submit <at> debbugs.gnu.org; Thu, 06 Feb 2025 12:17:23 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <z572@HIDDEN>) id 1tg5V4-0002Ax-Pl
for guix-patches@HIDDEN; Thu, 06 Feb 2025 12:17:15 -0500
Received: from mail.z572.online ([88.99.160.180])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <z572@HIDDEN>) id 1tg5V1-0006Hp-II
for guix-patches@HIDDEN; Thu, 06 Feb 2025 12:17:14 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me;
t=1738862538;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=OcqUGvgq1bberhhbcoPyTr87cMZifqnRtBW7hSPcwq4=;
b=aMU4x0O80+FfHsrH+Z4KsFo1oPDXb8sMNMiukG0c4Ica1mdbcRsl/q4sPvCae3I7bUzzCX
MsoOQypOcOmz/osp/DKgBCykMf/A+asoFa3o/C0zF0WEGAZl5q+B15NmQ1E8ZCpIzq7Im9
g5SLewBTz1vDwNJ6smjktSywX3GNurA=
Received: from m (mail1.85362086.com [107.174.64.25])
by mail.z572.online (OpenSMTPD) with ESMTPSA id a032af04
(TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO);
Thu, 6 Feb 2025 17:22:17 +0000 (UTC)
From: Z572 <z572@HIDDEN>
In-Reply-To: <496405a5240077ac386b932d2498d6ebbe4d0af2.1738512741.git.sughosha@HIDDEN>
(Sughosha via Guix-patches via's message of "Sun, 2 Feb 2025 21:42:21
+0530")
References: <496405a5240077ac386b932d2498d6ebbe4d0af2.1738512741.git.sughosha@HIDDEN>
User-Agent: mu4e 1.12.7; emacs 30.0.92
Date: Fri, 07 Feb 2025 01:17:00 +0800
Message-ID: <8734grt2lv.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
Received-SPF: pass client-ip=88.99.160.180; envelope-from=z572@HIDDEN;
helo=mail.z572.online
X-Spam_score_int: -5
X-Spam_score: -0.6
X-Spam_bar: /
X-Spam_report: (-0.6 / 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, PDS_OTHER_BAD_TLD=0.998,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Sughosha via Guix-patches via <guix-patches@HIDDEN> writes:
> * gnu/packages/kde-multimedia.scm (yt-dlp)[arguments]<#:phases>: Add
wrap-path.
> > Change-Id: I4f2f7303b02441399c042d4bdd8e7586adfd9fe3 > --- >
gnu/packages/kde-multimedia.scm | 10 +++++++++- > 1 f [...]
Content analysis details: (2.5 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
1.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs
[URI: z572.online (online)]
1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail)
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org]
0.5 FROM_SUSPICIOUS_NTLD From abused NTLD
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Sughosha via Guix-patches via <guix-patches@HIDDEN> writes:
> * gnu/packages/kde-multimedia.scm (yt-dlp)[arguments]<#:phases>: Add wrap-path.
> > Change-Id: I4f2f7303b02441399c042d4bdd8e7586adfd9fe3 > --- > gnu/packages/kde-multimedia.scm
| 10 +++++++++- > 1 f [...]
Content analysis details: (2.5 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust
[2001:470:142:0:0:0:0:17 listed in]
[list.dnswl.org]
1.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs
[URI: z572.online (online)]
1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail)
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD
0.5 FROM_SUSPICIOUS_NTLD From abused NTLD
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager
--=-=-=
Content-Type: text/plain
Sughosha via Guix-patches via <guix-patches@HIDDEN> writes:
> * gnu/packages/kde-multimedia.scm (yt-dlp)[arguments]<#:phases>: Add wrap-path.
>
> Change-Id: I4f2f7303b02441399c042d4bdd8e7586adfd9fe3
> ---
> gnu/packages/kde-multimedia.scm | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
> index ad0b504268..4d859cdedb 100644
> --- a/gnu/packages/kde-multimedia.scm
> +++ b/gnu/packages/kde-multimedia.scm
> @@ -156,7 +156,15 @@ (define-public haruna
> (base32 "0gvwsxlrwn2s6i4agmwa0r1lq1fybfyxv933g2z3n76qnn9mkbrb"))))
> (build-system qt-build-system)
> (arguments
> - (list #:qtbase qtbase))
> + (list #:qtbase qtbase
> + #:phases
> + #~(modify-phases %standard-phases
> + (add-after 'qt-wrap 'wrap-path
> + (lambda _
> + (wrap-program (string-append #$output "/bin/haruna")
> + `("PATH" ":" prefix
> + (,(string-append #$(this-package-input "yt-dlp")
> + "/bin")))))))))
see src/application.cpp
QString Application::youtubeDlExecutable()
{
auto ytDlp = QStandardPaths::findExecutable(u"yt-dlp"_s);
if (!ytDlp.isEmpty()) {
return ytDlp;
}
auto youtubeDl = QStandardPaths::findExecutable(u"youtube-dl"_s);
if (!youtubeDl.isEmpty()) {
return youtubeDl;
}
return QString();
}
It is better to replace findExecutable(u"yt-dlp"_s) with
findExecutable(u"/gnu/store/xxxx/bin/yt-dlp"_s)
> (native-inputs
> (list extra-cmake-modules))
> (inputs
>
> base-commit: 070c073d508d3197f0235adc424aec287e7dd916
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmek7owACgkQO1qpk+Gi
3/AnmA//bXY2/IHRNrmTOG9wAw+FQHwYO9uemSLxy962kQFVOKmRYGnxlw/KT3jL
BnrkO5MvFmkhEfm4UkhqwvDySrVy+QKdeRs79BlrGjdppz/jrt6tADNZA874GmKE
s71hHIkU3lYlmJbd9j2aNDsrS2qucaU2cv9BzezfGvgoFyOS/3/7iWlJAjaJExUF
+OoEQW3lGTXAeuZYKcwe4HVp4rnCfaoN2fiNtXMnKuURT3rfZSSA27KnIhw5bnDz
aYxJWz+rViF4dfCfoDyRX2K3BYXkCycjkVd+Mvx3mwuCDQUEVSkfTA7mZurpl4bF
8VeDpSmZZZ5NQpNywONxtaeMt3e//gT3QavKG1kiaFrvVWBd+xF/cg7lx7Ec0kRL
wIFLl4jZWQXZetJWPx1boHhMVydfoL1a/Y5TCLIjkbPI2MytOChGunmIXNsl9o6A
TVJeThjPb84r+Ih7q6Aonp1YXj6j5wiE4Y06Q8MACpJceyTloYnOMjSXSdea6MBx
vMQ2QW+1ctmxktM0wVttGT2I1oMzOlt+OhjQ36Vfdz6bTMecDJBuEni3LLsLmJIS
YUmnCjVX9PlWPL9mLkKZetR4/0CVyTdFAjPgNS60b6EUrXwBHOOSrHFG40z0tg87
Q4HZcVCbDLqgZ+RHXyLI4qDQaj6gmRQwq+k1rVzrrrUvTedlTmQ=
=U5mE
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76015] [PATCH] gnu: haruna: Fix finding yt-dlp.
Resent-From: Z572 <z572@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 06 Feb 2025 17:18:02 +0000
Resent-Message-ID: <handler.76015.B76015.17388622333713 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76015
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76015 <at> debbugs.gnu.org
Cc: sughosha@HIDDEN
X-Debbugs-Original-To: Sughosha via Guix-patches via <guix-patches@HIDDEN>
X-Debbugs-Original-Cc: 76015 <at> debbugs.gnu.org, Sughosha <sughosha@HIDDEN>
Received: via spool by 76015-submit <at> debbugs.gnu.org id=B76015.17388622333713
(code B ref 76015); Thu, 06 Feb 2025 17:18:02 +0000
Received: (at 76015) by debbugs.gnu.org; 6 Feb 2025 17:17:13 +0000
Received: from localhost ([127.0.0.1]:59311 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tg5V3-0000xn-44
for submit <at> debbugs.gnu.org; Thu, 06 Feb 2025 12:17:13 -0500
Received: from mail.z572.online ([88.99.160.180]:58328)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <z572@HIDDEN>) id 1tg5V0-0000xc-Gf
for 76015 <at> debbugs.gnu.org; Thu, 06 Feb 2025 12:17:11 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me;
t=1738862538;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=OcqUGvgq1bberhhbcoPyTr87cMZifqnRtBW7hSPcwq4=;
b=aMU4x0O80+FfHsrH+Z4KsFo1oPDXb8sMNMiukG0c4Ica1mdbcRsl/q4sPvCae3I7bUzzCX
MsoOQypOcOmz/osp/DKgBCykMf/A+asoFa3o/C0zF0WEGAZl5q+B15NmQ1E8ZCpIzq7Im9
g5SLewBTz1vDwNJ6smjktSywX3GNurA=
Received: from m (mail1.85362086.com [107.174.64.25])
by mail.z572.online (OpenSMTPD) with ESMTPSA id a032af04
(TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO);
Thu, 6 Feb 2025 17:22:17 +0000 (UTC)
From: Z572 <z572@HIDDEN>
In-Reply-To: <496405a5240077ac386b932d2498d6ebbe4d0af2.1738512741.git.sughosha@HIDDEN>
(Sughosha via Guix-patches via's message of "Sun, 2 Feb 2025 21:42:21
+0530")
References: <496405a5240077ac386b932d2498d6ebbe4d0af2.1738512741.git.sughosha@HIDDEN>
User-Agent: mu4e 1.12.7; emacs 30.0.92
Date: Fri, 07 Feb 2025 01:17:00 +0800
Message-ID: <8734grt2lv.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 1.5 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Sughosha via Guix-patches via <guix-patches@HIDDEN> writes:
> * gnu/packages/kde-multimedia.scm (yt-dlp)[arguments]<#:phases>: Add
wrap-path.
> > Change-Id: I4f2f7303b02441399c042d4bdd8e7586adfd9fe3 > --- >
gnu/packages/kde-multimedia.scm | 10 +++++++++- > 1 f [...]
Content analysis details: (1.5 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[88.99.160.180 listed in sa-trusted.bondedsender.org]
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 SPF_PASS SPF: sender matches SPF record
1.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs
[URI: z572.online (online)]
0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[88.99.160.180 listed in bl.score.senderscore.com]
0.5 FROM_SUSPICIOUS_NTLD From abused NTLD
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 1.5 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Sughosha via Guix-patches via <guix-patches@HIDDEN> writes:
> * gnu/packages/kde-multimedia.scm (yt-dlp)[arguments]<#:phases>: Add wrap-path.
> > Change-Id: I4f2f7303b02441399c042d4bdd8e7586adfd9fe3 > --- > gnu/packages/kde-multimedia.scm
| 10 +++++++++- > 1 f [...]
Content analysis details: (1.5 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[88.99.160.180 listed in sa-trusted.bondedsender.org]
0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[88.99.160.180 listed in bl.score.senderscore.com]
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 SPF_PASS SPF: sender matches SPF record
1.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs
[URI: z572.online (online)]
1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD
0.5 FROM_SUSPICIOUS_NTLD From abused NTLD
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager
--=-=-=
Content-Type: text/plain
Sughosha via Guix-patches via <guix-patches@HIDDEN> writes:
> * gnu/packages/kde-multimedia.scm (yt-dlp)[arguments]<#:phases>: Add wrap-path.
>
> Change-Id: I4f2f7303b02441399c042d4bdd8e7586adfd9fe3
> ---
> gnu/packages/kde-multimedia.scm | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
> index ad0b504268..4d859cdedb 100644
> --- a/gnu/packages/kde-multimedia.scm
> +++ b/gnu/packages/kde-multimedia.scm
> @@ -156,7 +156,15 @@ (define-public haruna
> (base32 "0gvwsxlrwn2s6i4agmwa0r1lq1fybfyxv933g2z3n76qnn9mkbrb"))))
> (build-system qt-build-system)
> (arguments
> - (list #:qtbase qtbase))
> + (list #:qtbase qtbase
> + #:phases
> + #~(modify-phases %standard-phases
> + (add-after 'qt-wrap 'wrap-path
> + (lambda _
> + (wrap-program (string-append #$output "/bin/haruna")
> + `("PATH" ":" prefix
> + (,(string-append #$(this-package-input "yt-dlp")
> + "/bin")))))))))
see src/application.cpp
QString Application::youtubeDlExecutable()
{
auto ytDlp = QStandardPaths::findExecutable(u"yt-dlp"_s);
if (!ytDlp.isEmpty()) {
return ytDlp;
}
auto youtubeDl = QStandardPaths::findExecutable(u"youtube-dl"_s);
if (!youtubeDl.isEmpty()) {
return youtubeDl;
}
return QString();
}
It is better to replace findExecutable(u"yt-dlp"_s) with
findExecutable(u"/gnu/store/xxxx/bin/yt-dlp"_s)
> (native-inputs
> (list extra-cmake-modules))
> (inputs
>
> base-commit: 070c073d508d3197f0235adc424aec287e7dd916
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmek7owACgkQO1qpk+Gi
3/AnmA//bXY2/IHRNrmTOG9wAw+FQHwYO9uemSLxy962kQFVOKmRYGnxlw/KT3jL
BnrkO5MvFmkhEfm4UkhqwvDySrVy+QKdeRs79BlrGjdppz/jrt6tADNZA874GmKE
s71hHIkU3lYlmJbd9j2aNDsrS2qucaU2cv9BzezfGvgoFyOS/3/7iWlJAjaJExUF
+OoEQW3lGTXAeuZYKcwe4HVp4rnCfaoN2fiNtXMnKuURT3rfZSSA27KnIhw5bnDz
aYxJWz+rViF4dfCfoDyRX2K3BYXkCycjkVd+Mvx3mwuCDQUEVSkfTA7mZurpl4bF
8VeDpSmZZZ5NQpNywONxtaeMt3e//gT3QavKG1kiaFrvVWBd+xF/cg7lx7Ec0kRL
wIFLl4jZWQXZetJWPx1boHhMVydfoL1a/Y5TCLIjkbPI2MytOChGunmIXNsl9o6A
TVJeThjPb84r+Ih7q6Aonp1YXj6j5wiE4Y06Q8MACpJceyTloYnOMjSXSdea6MBx
vMQ2QW+1ctmxktM0wVttGT2I1oMzOlt+OhjQ36Vfdz6bTMecDJBuEni3LLsLmJIS
YUmnCjVX9PlWPL9mLkKZetR4/0CVyTdFAjPgNS60b6EUrXwBHOOSrHFG40z0tg87
Q4HZcVCbDLqgZ+RHXyLI4qDQaj6gmRQwq+k1rVzrrrUvTedlTmQ=
=U5mE
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76015] [PATCH v2] gnu: haruna: Fix finding yt-dlp.
References: <496405a5240077ac386b932d2498d6ebbe4d0af2.1738512741.git.sughosha@HIDDEN>
In-Reply-To: <496405a5240077ac386b932d2498d6ebbe4d0af2.1738512741.git.sughosha@HIDDEN>
Resent-From: Sughosha <sughosha@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 08 Feb 2025 12:56:02 +0000
Resent-Message-ID: <handler.76015.B76015.173901933819220 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76015
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76015 <at> debbugs.gnu.org
Cc: Sughosha <sughosha@HIDDEN>
Received: via spool by 76015-submit <at> debbugs.gnu.org id=B76015.173901933819220
(code B ref 76015); Sat, 08 Feb 2025 12:56:02 +0000
Received: (at 76015) by debbugs.gnu.org; 8 Feb 2025 12:55:38 +0000
Received: from localhost ([127.0.0.1]:39077 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tgkN0-0004zv-1C
for submit <at> debbugs.gnu.org; Sat, 08 Feb 2025 07:55:38 -0500
Received: from layka.disroot.org ([178.21.23.139]:38918)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <sughosha@HIDDEN>)
id 1tgkMw-0004ze-Ag
for 76015 <at> debbugs.gnu.org; Sat, 08 Feb 2025 07:55:35 -0500
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 5213125D1F;
Sat, 8 Feb 2025 13:55:32 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from layka.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP
id J-ng6EELdh-N; Sat, 8 Feb 2025 13:55:31 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1739019331; bh=hyevMNhTRBqXtwUVhxZ5nQMar6rVQNFB7Ij0SgbCZFc=;
h=From:To:Cc:Subject:Date;
b=arRiazJu0VULqvEZyTv0EZ0bvJmb/6Mas/RbdSVUcNziOwk/dJzA2CqJE3jGBrelR
+kMNeWUMaxuKJ/7gWrnAaPRajKi2WKo3AZUIfhpsrIJ7dSmd1x3DS5wcCVqpRFjvda
PHKIo0uE8cqvltrt++fqqAB1Ej26uVvu+lKjM5xc/49qnuWJJAsURXbfwj9mM2/Duf
hTHOgFmazECNs9kISG0ZsMjOr27tAsXRryWLk6uAKKb3WRSZenhpM/f1/RxDACJMZl
iVKYgxI2vHUaZU5KVMh1eMHmFEnDFNlUO6BYkRT8H0sA+QG+KoK0kH/sgsq4aexAa+
8DubS6oTbd4oQ==
From: Sughosha <sughosha@HIDDEN>
Date: Sat, 8 Feb 2025 18:24:36 +0530
Message-ID: <90031de2752b76d396a44840217b7dc75aec95e8.1739019275.git.sughosha@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/kde-multimedia.scm (haruna)[arguments]<#:phases>: Add
fix-yt-dlp-path.
Change-Id: I3f6e3f5b9f2dd56ec69b6ea38a0da9a5e01a1909
---
gnu/packages/kde-multimedia.scm | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index ad0b504268..ac0b90c9b6 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -156,7 +156,16 @@ (define-public haruna
(base32 "0gvwsxlrwn2s6i4agmwa0r1lq1fybfyxv933g2z3n76qnn9mkbrb"))))
(build-system qt-build-system)
(arguments
- (list #:qtbase qtbase))
+ (list #:qtbase qtbase
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-yt-dlp-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/application.cpp"
+ (("findExecutable\\(u\"yt-dlp\"")
+ (string-append "findExecutable(u\""
+ (search-input-file inputs "bin/yt-dlp")
+ "\""))))))))
(native-inputs
(list extra-cmake-modules))
(inputs
base-commit: b64d3168af697ceb2a96e7e2c62bcf418b8a586a
--
2.47.1
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.