From patchwork Sun Nov 19 15:18:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 19686 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 742E627BBEA; Sun, 19 Nov 2023 15:19:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D8DF027BBE2 for ; Sun, 19 Nov 2023 15:19:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4jZh-0000f3-9H; Sun, 19 Nov 2023 10:19:05 -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 ) id 1r4jZf-0000e5-Kt for guix-patches@gnu.org; Sun, 19 Nov 2023 10:19:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r4jZf-0006d0-9k for guix-patches@gnu.org; Sun, 19 Nov 2023 10:19:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r4jZd-0001CW-W7; Sun, 19 Nov 2023 10:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57431] [PATCH v1 2/3] gnu: Add python-pyqt, version 6.5.2. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 19 Nov 2023 15:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57431 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57431@debbugs.gnu.org Cc: Zhu Zihao , Andreas Enge , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Andreas Enge , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 57431-submit@debbugs.gnu.org id=B57431.17004071324581 (code B ref 57431); Sun, 19 Nov 2023 15:19:01 +0000 Received: (at 57431) by debbugs.gnu.org; 19 Nov 2023 15:18:52 +0000 Received: from localhost ([127.0.0.1]:51910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4jZT-0001Bp-IQ for submit@debbugs.gnu.org; Sun, 19 Nov 2023 10:18:51 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:56355 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4jZP-0001BM-Ll for 57431@debbugs.gnu.org; Sun, 19 Nov 2023 10:18:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1700407113; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+RdIyEJR9AUfF+N7oC5K9IeDJb+iBsLfSRcuqkl4Lrs=; b=Cr44Eu8MSTwDZhi220wOUYgt7/ynmVb4s/WiicEkuxMLNmk9YQY5nCzia/oy0yxnBwNvKt /mXztkHIXiLtzivbMEsJSWTKluqWkmfvgeLfi/nfyX4PtG5zS5zybpouhHqjkqBUPTB1Mk Y5b0Sj1dmKV51ND/AS/ZjHUea53hNd8244RsuN3bnp8YCgyIrFxmalPKGgHEScwTWXReo8 kM23kWtmzswTWQLmb5J9VKPHyxV+vWpt5wbpp8Dntnqi4jhap/IzGt0s6jrvoRd6xiGeXo DbBYGadJvc38JQjyPi7hl+PCThfk+pyUA5AnHkVYUMF1NlwF8Wz3v79gEbefCg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 72a26fc0 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 19 Nov 2023 15:18:33 +0000 (UTC) Date: Sun, 19 Nov 2023 16:18:14 +0100 Message-ID: <817ca09b733ed2163ec3147a1f131844fa0080e1.1700407095.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Zhu Zihao * 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 ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023 Herman Rimm ;;; ;;; 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, 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") + (("") qtprinter.h)))))))))) + (define-public python-pyqt5-sip (package (name "python-pyqt5-sip")