From: Marius Bakke <marius@gnu.org>
To: Zhu Zihao <all_but_last@163.com>, 57398-done@debbugs.gnu.org
Subject: bug#57398: [PATCH]: Add PySide 6.
Date: Wed, 07 Sep 2022 19:51:06 +0200 [thread overview]
Message-ID: <87zgfbul85.fsf@gnu.org> (raw)
In-Reply-To: <86czcoribi.fsf@163.com>
[-- Attachment #1: Type: text/plain, Size: 2897 bytes --]
Hi Zhu,
Thanks for these patches, nice work!
I've applied them with a few minor tweaks, see inline.
Zhu Zihao <all_but_last@163.com> skriver:
>>From a4d31ffc721fa3b459e2f168cb4af65147b82248 Mon Sep 17 00:00:00 2001
> From: Zhu Zihao <all_but_last@163.com>
> Date: Wed, 24 Aug 2022 19:25:26 +0800
> Subject: [PATCH 3/9] gnu: python-pyside-2: Use G-expressions.
>
> * gnu/packages/qt.scm (python-pyside-2)[native-inputs]: Use label-less input
> style.
> [arguments]: Use G-expressions.
[...]
> (native-inputs
> - `(("cmake" ,cmake-minimal)
> - ("python" ,python-wrapper)
> - ("qttools-5" ,qttools-5)
> - ("which" ,which)))
> + (list cmake-minimal python-wrapper qttools-5 which))
[...]
> + ;; Add include directories for qt modules.
> + (let ((dirs (map (lambda (name)
> + (string-append (assoc-ref inputs name)
> + "/include/qt5"))
> + '("qtdatavis3d"
> + "qtdeclarative"
> + "qtlocation"
> + "qtmultimedia"
> + "qtquickcontrols"
> + "qtquickcontrols2"
> + "qtscript"
> + "qtscxml"
> + "qtsensors"
> + "qtspeech"
> + "qtsvg"
> + "qttools-5"
Here qttools-5 would no longer be found, so I changed it.
>>From 801e4315b1ef24fc18cf61169b42443eb221e924 Mon Sep 17 00:00:00 2001
> From: Zhu Zihao <all_but_last@163.com>
> Date: Wed, 24 Aug 2022 22:57:44 +0800
> Subject: [PATCH 5/9] gnu: python-pyside-2: Use "this-package-input" instead of
> "assoc-ref".
>
> * gnu/packages/qt.scm (python-pyside-2)[arguments]<#:configure-flags>: Use
> "this-package-input"
> <#:phases>: In phase "fix-qt-module-detection", use "this-package-input".
I had to manually apply this patch because I changed the previous one.
While at it, I made one tweak:
> @@ -3880,7 +3880,7 @@ (define-public python-pyside-2
> #:configure-flags
> #~(list "-DBUILD_TESTS=FALSE"
> (string-append "-DPYTHON_EXECUTABLE="
> - (assoc-ref %build-inputs "python")
> + #$(this-package-native-input "python-wrapper")
> "/bin/python"))
I changed this to use (search-input-file ...) instead of
#$(this-package-native-input ...).
And the same in subsequent patches. The reason is that THIS-PACKAGE has
a runtime cost (meaning the "guix" commands get slower), but
SEARCH-INPUT-FILE is computed at build time.
In short, always use SEARCH-INPUT-FILE when feasible. :-)
Applied all 9 with these changes!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]
prev parent reply other threads:[~2022-09-07 17:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-25 5:38 [bug#57398] [PATCH]: Add PySide 6 Zhu Zihao
[not found] ` <handler.57398.B.166140611521962.ack@debbugs.gnu.org>
2022-08-25 10:30 ` [bug#57398] Acknowledgement ([PATCH]: Add PySide 6.) Zhu Zihao
2022-08-30 8:51 ` Zhu Zihao
2022-09-07 11:27 ` Zhu Zihao
2022-09-07 17:51 ` Marius Bakke [this message]
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=87zgfbul85.fsf@gnu.org \
--to=marius@gnu.org \
--cc=57398-done@debbugs.gnu.org \
--cc=all_but_last@163.com \
/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).