From: Brendan Tildesley <mail@brendan.scot>
To: 42885@debbugs.gnu.org
Subject: [bug#42885] [PATCH 06/27] gnu: python-pyqt: Fix build for new python-sip.
Date: Wed, 10 Mar 2021 20:00:32 +1100 [thread overview]
Message-ID: <20210310090053.21612-6-mail@brendan.scot> (raw)
In-Reply-To: <20210310090053.21612-1-mail@brendan.scot>
* gnu/packages/qt.scm (python-pyqt)
[source]: Remove pyqt-public-sip.patch. PyQt uses python-pyqt5-sip
now. This patch is still used by python2-pyqt so we don't delete it completely.
[inputs]: Add python-pyqt-builder, python-pyqt5-sip
[arguments]: Add phase to link PyQt5-sip module.
---
gnu/packages/qt.scm | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 65e61d4dc4..b615a74755 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2074,12 +2074,11 @@ module provides support functions to the automatically generated code.")
(string-append "https://www.riverbankcomputing.com/static/"
"Downloads/PyQt5/" version "/PyQt5-"
version ".tar.gz")))
- (file-name (string-append "PyQt5-"version ".tar.gz"))
+ (file-name (string-append "PyQt5-" version ".tar.gz"))
(sha256
(base32
"1z74295i69cha52llsqffzhb5zz7qnbjc64h8qg21l91jgf0harp"))
- (patches (search-patches "pyqt-configure.patch"
- "pyqt-public-sip.patch"))))
+ (patches (search-patches "pyqt-configure.patch"))))
(build-system gnu-build-system)
(native-inputs
`(("qtbase" ,qtbase))) ; for qmake
@@ -2087,6 +2086,8 @@ module provides support functions to the automatically generated code.")
`(("python-sip" ,python-sip)))
(inputs
`(("python" ,python-wrapper)
+ ("python-pyqt-builder" ,python-pyqt-builder)
+ ("python-pyqt5-sip" ,python-pyqt5-sip)
("qtbase" ,qtbase)
("qtconnectivity" ,qtconnectivity)
("qtdeclarative" ,qtdeclarative)
@@ -2144,7 +2145,16 @@ module provides support functions to the automatically generated code.")
; installed into the python package's
; site-package directory, which is read-only.
"--stubsdir" stubs
- "--sipdir" sip)))))))
+ "--sipdir" sip))))
+ ;; Linking here means the sip module can be found without
+ ;; python-pyqt5-sip needing to be added as an input.
+ (add-after 'install 'pyqt5-sip
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (pyqt5-sip (assoc-ref inputs "python-pyqt5-sip"))
+ (site "/lib/python3.8/site-packages/PyQt5/")
+ (.so (first (find-files (string-append pyqt5-sip site) "sip.*"))))
+ (symlink .so (string-append out site (basename .so)))))))))
(home-page "https://www.riverbankcomputing.com/software/pyqt/intro")
(synopsis "Python bindings for Qt")
(description
--
2.30.1
next prev parent reply other threads:[~2021-03-10 9:02 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-16 6:55 [bug#42885] [PATCH 0/4] gnu: calibre: Update to 4.22.0 Brendan Tildesley
[not found] ` <handler.42885.B.159756092810548.ack@debbugs.gnu.org>
2020-08-16 7:03 ` [bug#42885] [PATCH 1/4] gnu: ebook.scm: remove duplicate module import Brendan Tildesley
2020-08-16 7:03 ` [bug#42885] [PATCH 2/4] gnu: Add mathjax-bin (MathJax 3) Brendan Tildesley
2020-08-24 1:05 ` Leo Famulari
2020-08-24 4:25 ` Arun Isaac
2020-08-24 5:12 ` Brendan Tildesley
2020-08-24 6:44 ` Arun Isaac
2020-08-24 7:27 ` Brendan Tildesley
2020-08-24 7:41 ` Brendan Tildesley
2020-09-04 9:02 ` Ludovic Courtès
2020-09-04 11:59 ` Andreas Enge
2020-09-04 18:13 ` Arun Isaac
2020-09-04 19:43 ` Ricardo Wurmus
2020-09-09 6:36 ` Arun Isaac
2020-09-09 7:19 ` Ricardo Wurmus
2020-09-09 19:48 ` Arun Isaac
2020-09-17 10:14 ` Arun Isaac
2020-09-17 11:24 ` Ricardo Wurmus
2020-09-21 10:36 ` Arun Isaac
2020-09-21 11:08 ` Brendan Tildesley
2020-09-22 5:39 ` Arun Isaac
2020-09-29 23:56 ` [bug#42885] Merge wip-swc Brendan Tildesley
2020-09-30 5:38 ` Arun Isaac
2020-10-12 7:23 ` Arun Isaac
2020-10-12 22:17 ` Brendan Tildesley
2020-10-13 18:44 ` Arun Isaac
2020-10-13 21:22 ` Ricardo Wurmus
2020-10-19 18:45 ` Arun Isaac
2021-01-13 15:00 ` [bug#42885] [PATCH 0/4] gnu: calibre: Update to 4.22.0 Ludovic Courtès
2021-01-14 14:59 ` Arun Isaac
2021-01-14 20:49 ` Ricardo Wurmus
2021-02-17 2:47 ` Brendan Tildesley
2020-09-04 13:10 ` [bug#42885] [PATCH 2/4] gnu: Add mathjax-bin (MathJax 3) Ricardo Wurmus
2020-08-16 7:03 ` [bug#42885] [PATCH 3/4] gnu: calibre: Update to 4.22.0 Brendan Tildesley
2020-08-16 7:03 ` [bug#42885] [PATCH 4/4] gnu: calibre: Add wrap phase for qtwebengine Brendan Tildesley
2020-08-24 1:01 ` [bug#42885] [PATCH 1/4] gnu: ebook.scm: remove duplicate module import Leo Famulari
2020-08-22 23:24 ` [bug#42885] ([PATCH 2/4] gnu: calibre: Update to 4.23.0 (new release) Brendan Tildesley
2020-08-25 1:59 ` [bug#42885] [PATCH 2/4] gnu: Add mathjax-3 Brendan Tildesley
2020-08-21 9:20 ` [bug#42885] [PATCH] gnu: calibre: Update to 4.23.0 Brendan Tildesley
2020-08-22 17:30 ` Leo Famulari
2020-09-07 3:11 ` [bug#42885] Regarding Patch 4 Prafulla Giri
2020-09-07 3:40 ` Prafulla Giri
2021-03-10 9:00 ` [bug#42885] [PATCH 01/27] gnu: python-sip: Update to 5.5.0. Add python-sip-4 Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 02/27] gnu: python2-sip: Fix build Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 03/27] gnu: veusz: " Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 04/27] gnu: Add python-pyqt-builder Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 05/27] gnu: Add python-pyqt5-sip Brendan Tildesley
2021-03-10 9:00 ` Brendan Tildesley [this message]
2021-03-10 9:00 ` [bug#42885] [PATCH 07/27] gnu: Add python-ifaddr Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 08/27] gnu: Add python-zeroconf Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 09/27] gnu: Add python-pyannotate Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 10/27] gnu: Add python-multivolumefile Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 11/27] gnu: Add python-ppmd-cffi Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 12/27] gnu: python-zstandard: Update to 0.15.2 Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 13/27] gnu: Add python-pyzstd Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 14/27] gnu: Add python-bcj-cffi Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 15/27] gnu: Add python-py7zr Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 16/27] gnu: python-markdown: Update to 3.3.4 Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 17/27] gnu: python-feedparser: Update to 6.0.2 Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 18/27] gnu: python-poppler-qt5: Fix build Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 19/27] gnu: python-poppler-qt5: Update to 21.1.0 Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 20/27] gnu: Add python-pychm Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 21/27] gnu: Add python-cchardet Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 22/27] gnu: python-html5lib: Add python-chardet input Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 23/27] gnu: calibre: Update to 5.13.0 Brendan Tildesley
2021-03-23 18:25 ` Leo Famulari
2021-03-23 18:36 ` Leo Famulari
2021-03-24 2:13 ` Brendan Tildesley
2021-03-29 20:12 ` Leo Famulari
2021-03-29 23:05 ` Leo Famulari
2021-03-30 6:23 ` Brendan Tildesley
2021-04-05 19:58 ` Leo Famulari
2021-04-06 1:30 ` Brendan Tildesley
2021-04-06 17:11 ` Leo Famulari
2021-04-07 3:57 ` Brendan Tildesley
2021-04-08 0:05 ` Leo Famulari
2021-04-08 1:14 ` Leo Famulari
2021-04-08 3:59 ` Leo Famulari
2021-04-08 4:11 ` Brendan Tildesley
2021-04-08 4:28 ` Leo Famulari
2021-04-08 11:17 ` Brendan Tildesley
2021-04-09 20:12 ` bug#42885: " Leo Famulari
2021-03-30 10:45 ` [bug#42885] " Brendan Tildesley
2021-04-04 17:46 ` Leo Famulari
2021-03-10 9:00 ` [bug#42885] [PATCH 24/27] gnu: calibre: Patch some paths Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 25/27] gnu: calibre: Add qtsvg as input Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 26/27] gnu: Remove python2-pyqtwebengine Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 27/27] gnu: Remove python2-pyqt Brendan Tildesley
2021-03-21 7:00 ` [bug#42885] [PATCHES] 2 more fixes Brendan Tildesley via Guix-patches via
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=20210310090053.21612-6-mail@brendan.scot \
--to=mail@brendan.scot \
--cc=42885@debbugs.gnu.org \
/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).