From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 65922@debbugs.gnu.org
Cc: "Maxim Cournoyer" <maxim.cournoyer@gmail.com>,
"Andreas Enge" <andreas@enge.fr>, 宋文武 <iyzsong@envs.net>
Subject: [bug#65922] [qt-team PATCH 1/4] gnu: qtbase: Do not capture Python (again).
Date: Wed, 13 Sep 2023 12:58:21 -0400 [thread overview]
Message-ID: <b58e39ce10c910087a8cb90e36d58213705f2728.1694624089.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <cover.1694624089.git.maxim.cournoyer@gmail.com>
Fixes <https://issues.guix.gnu.org/65457>.
* gnu/packages/qt.scm (qtbase-5) [arguments]: Add #:disallowed-references
argument to guard against the problem reoccurring in the future.
Add do-not-capture-python phase.
(qtbase) [arguments]: Update do-not-capture-python phase.
---
Changes in v2:
- Also apply fix to qtbase-5 package.
gnu/packages/qt.scm | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b7e394d663c..a158f8114fe 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -392,7 +392,7 @@ (define-public qtbase-5
fontconfig
freetype
glib
- gtk+ ;for GTK theme support
+ gtk+ ;for GTK theme support
harfbuzz
icu4c
libinput-minimal
@@ -437,7 +437,8 @@ (define-public qtbase-5
vulkan-headers
ruby-2.7))
(arguments
- `(#:configure-flags
+ `(#:disallowed-references ,(list python)
+ #:configure-flags
(let ((out (assoc-ref %outputs "out")))
(list "-verbose"
"-prefix" out
@@ -583,7 +584,16 @@ (define-public qtbase-5
(("^\\s*(QLibrary xcursorLib\\(QLatin1String\\(\")(Xcursor\"\\), 1\\);)" _ a b)
(string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b))
(("^\\s*(xcursorLib.setFileName\\(QLatin1String\\(\")(Xcursor\"\\)\\);)" _ a b)
- (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b))))))))
+ (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b)))))
+ (add-after 'install 'do-not-capture-python
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; For some reason, patching the file after the
+ ;; patch-source-shebangs phase doesn't work for Qt 5.
+ (substitute*
+ (search-input-file
+ outputs "lib/qt5/mkspecs/features/uikit/devices.py")
+ (((which "python3"))
+ "/usr/bin/env python3")))))))
(native-search-paths
(list (search-path-specification
(variable "QMAKEPATH")
@@ -724,10 +734,12 @@ (define-public qtbase
(substitute* "src/corelib/CMakeLists.txt"
(("/bin/ls")
(search-input-file inputs "bin/ls")))))
+ (delete 'do-not-capture-python) ;move after patch-source-shebangs
(add-after 'patch-source-shebangs 'do-not-capture-python
(lambda _
(substitute* '("mkspecs/features/uikit/devices.py"
- "util/testrunner/qt-testrunner.py")
+ "util/testrunner/qt-testrunner.py"
+ "util/testrunner/sanitizer-testrunner.py")
(((which "python3"))
"/usr/bin/env python3"))))
(replace 'configure
--
2.41.0
next prev parent reply other threads:[~2023-09-13 16:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-13 16:56 [bug#65922] [qt-team PATCH 0/4] Avoid capturing python in qtbase, reinstate tests Maxim Cournoyer
2023-09-13 16:58 ` Maxim Cournoyer [this message]
2023-09-13 16:58 ` [bug#65922] [qt-team PATCH 2/4] gnu: qtbase: Add $TZDIR to native search paths Maxim Cournoyer
2023-09-13 16:58 ` [bug#65922] [qt-team PATCH 3/4] gnu: qtbase: Reinstate date related tests Maxim Cournoyer
2023-09-13 16:58 ` [bug#65922] [qt-team PATCH 4/4] gnu: qtdeclarative: Add a debug output Maxim Cournoyer
2023-09-13 17:33 ` [bug#65922] [qt-team PATCH v2 0/4] Avoid capturing python in qtbase, reinstate tests Maxim Cournoyer
2023-09-13 17:33 ` [bug#65922] [qt-team PATCH v2 1/4] gnu: qtbase: Do not capture Python (again) Maxim Cournoyer
2023-09-14 9:07 ` Andreas Enge
2023-09-17 2:51 ` Maxim Cournoyer
2023-09-17 10:12 ` Andreas Enge
2023-09-17 12:55 ` Maxim Cournoyer
2023-09-13 17:33 ` [bug#65922] [qt-team PATCH v2 2/4] gnu: qtbase: Add $TZDIR to native search paths Maxim Cournoyer
2023-09-13 17:33 ` [bug#65922] [qt-team PATCH v2 3/4] gnu: qtbase: Reinstate date related tests Maxim Cournoyer
2023-09-13 17:33 ` [bug#65922] [qt-team PATCH v2 4/4] gnu: qtdeclarative: Add a debug output Maxim Cournoyer
2023-09-17 17:26 ` [bug#65922] [qt-team PATCH v3 0/5] Avoid capturing python in qtbase, reinstate tests Maxim Cournoyer
2023-09-17 17:26 ` [bug#65922] [qt-team PATCH v3 1/5] gnu: qtbase: Do not capture Python (again) Maxim Cournoyer
2023-09-17 17:26 ` [bug#65922] [qt-team PATCH v3 2/5] gnu: qtbase: Add $TZDIR to native search paths Maxim Cournoyer
2023-09-17 17:26 ` [bug#65922] [qt-team PATCH v3 3/5] gnu: qtbase: Reinstate date related tests Maxim Cournoyer
2023-09-17 17:26 ` [bug#65922] [qt-team PATCH v3 4/5] gnu: qtbase: Disable problematic tests on powerpc64le Maxim Cournoyer
2023-09-17 17:26 ` [bug#65922] [qt-team PATCH v3 5/5] gnu: qtdeclarative: Add a debug output Maxim Cournoyer
2023-10-16 21:45 ` bug#65922: [qt-team PATCH 0/4] Avoid capturing python in qtbase, reinstate tests Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b58e39ce10c910087a8cb90e36d58213705f2728.1694624089.git.maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=65922@debbugs.gnu.org \
--cc=andreas@enge.fr \
--cc=iyzsong@envs.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).