unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Herman Rimm via Guix-patches via <guix-patches@gnu.org>
To: 57431@debbugs.gnu.org
Cc: "Zhu Zihao" <all_but_last@163.com>,
	"Andreas Enge" <andreas@enge.fr>,
	"Maxim Cournoyer" <maxim.cournoyer@gmail.com>,
	宋文武 <iyzsong@envs.net>
Subject: [bug#57431] [PATCH v1 2/3] gnu: Add python-pyqt, version 6.5.2.
Date: Sun, 19 Nov 2023 16:18:14 +0100	[thread overview]
Message-ID: <817ca09b733ed2163ec3147a1f131844fa0080e1.1700407095.git.herman@rimm.ee> (raw)
In-Reply-To: <f30ee2f3a623d80c04ff73e14789ed7b8d34120e.1700407095.git.herman@rimm.ee>

From: Zhu Zihao <all_but_last@163.com>

* gnu/packages/qt.scm (python-pyqt-6): New variable.
---
 gnu/packages/qt.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 242a5da172..eea13d1ea2 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -29,6 +29,7 @@
 ;;; Copyright © 2022 Yash Tiwari <yasht@mailbox.org>
 ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023 Herman Rimm <herman@rimm.ee>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3656,6 +3657,54 @@ (define-public python-pyqt
 contain over 620 classes.")
     (license license:gpl3)))
 
+(define-public python-pyqt-6
+  (package
+    (inherit python-pyqt)
+    (version "6.5.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "PyQt6" version))
+       (file-name (string-append "PyQt6-" version ".tar.gz"))
+       (sha256
+        (base32
+         "100jh1iiz5gx821qzgicfrqv7hjjj98pchdbc1nvdzzra1ryx1ql"))))
+    (inputs ; Qt5 dependencies only in python-pyqt:
+     ; (qt)connectivity, location, sensors, serialport, x11extras, xmlpatterns.
+     `(("python" ,python-wrapper)
+       ("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtmultimedia" ,qtmultimedia)
+       ("qtpositioning" ,qtpositioning)
+       ("qtsvg" ,qtsvg)
+       ("qttools" ,qttools)
+       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebsockets" ,qtwebsockets)))
+    (propagated-inputs
+     (list python-sip python-pyqt6-sip))
+    (native-inputs
+     (list python-pyqt-builder
+           qtbase))                     ;for qmake
+    (arguments
+      (list
+       #:tests? #f ; No tests.
+       #:configure-flags
+       #~`(@ ("--verbose" . "") ; Print commands run.
+             ("--confirm-license" . "")
+             ("--jobs" . ,(number->string (parallel-job-count))))
+       #:phases
+       #~(modify-phases %standard-phases
+         ;; When building python-pyqtwebengine, <qprinter.h> can not be
+         ;; included.  Here we substitute the full path to the header in the
+         ;; store.
+         (add-after 'unpack 'substitute-source
+           (lambda* (#:key inputs  #:allow-other-keys)
+             (let* ((qtbase (assoc-ref inputs "qtbase"))
+                    (qtprinter.h (string-append "\"" qtbase "/include/qt6/QtPrintSupport/qprinter.h\"")))
+               (substitute* (list "sip/QtPrintSupport/qprinter.sip"
+                                  "sip/QtPrintSupport/qpyprintsupport_qlist.sip")
+                 (("<qprinter.h>") qtprinter.h))))))))))
+
 (define-public python-pyqt5-sip
   (package
     (name "python-pyqt5-sip")
-- 
2.41.0





  reply	other threads:[~2023-11-19 15:19 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-26 14:50 [bug#57431] [PATCH]: Add PyQt 6 Zhu Zihao
2023-04-13 15:04 ` ROCKTAKEY
2023-04-16  2:16   ` Zhu Zihao
2023-11-19 15:15 ` [bug#57431] Update packages to compatible versions Herman Rimm via Guix-patches via
2023-11-19 15:18 ` [bug#57431] [PATCH v1 1/3] gnu: Add python-pyqt6-sip Herman Rimm via Guix-patches via
2023-11-19 15:18   ` Herman Rimm via Guix-patches via [this message]
2023-11-22 15:47     ` [bug#57431] [PATCH v1 2/3] gnu: Add python-pyqt, version 6.5.2 Ludovic Courtès
2023-11-19 15:18   ` [bug#57431] [PATCH v1 3/3] gnu: Add python-pyqtwebengine, version 6.6.0 Herman Rimm via Guix-patches via
2023-11-22 15:49     ` Ludovic Courtès
2023-11-22 15:43   ` [bug#57431] [PATCH v1 1/3] gnu: Add python-pyqt6-sip Ludovic Courtès
2023-11-23  7:20 ` [bug#57431] [PATCH v2 " Herman Rimm via Guix-patches via
2023-11-23  7:20   ` [bug#57431] [PATCH v2 2/3] gnu: Add python-pyqt, version 6.5.2 Herman Rimm via Guix-patches via
2023-11-23  7:20   ` [bug#57431] [PATCH v2 3/3] gnu: Add python-pyqtwebengine, version 6.6.0 Herman Rimm via Guix-patches via
2023-11-23 11:59 ` [bug#57431] [PATCH v3 1/3] gnu: Add python-pyqt6-sip Herman Rimm via Guix-patches via
2023-11-23 11:59   ` [bug#57431] [PATCH v3 2/3] gnu: Add python-pyqt, version 6.5.2 Herman Rimm via Guix-patches via
2023-11-23 11:59   ` [bug#57431] [PATCH v3 3/3] gnu: Add python-pyqtwebengine, version 6.6.0 Herman Rimm via Guix-patches via
2023-12-22 16:14   ` bug#57431: [PATCH v3 1/3] gnu: Add python-pyqt6-sip Ludovic Courtès
2023-11-30  9:50 ` [bug#57431] [PATCH]: Add PyQt 6 chris

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=817ca09b733ed2163ec3147a1f131844fa0080e1.1700407095.git.herman@rimm.ee \
    --to=guix-patches@gnu.org \
    --cc=57431@debbugs.gnu.org \
    --cc=all_but_last@163.com \
    --cc=andreas@enge.fr \
    --cc=herman@rimm.ee \
    --cc=iyzsong@envs.net \
    --cc=maxim.cournoyer@gmail.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).