From patchwork Thu Aug 25 10:30:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 41956 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 C1E4227BBEA; Thu, 25 Aug 2022 11:34:29 +0100 (BST) 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,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 6EDB627BBE9 for ; Thu, 25 Aug 2022 11:34:28 +0100 (BST) Received: from localhost ([::1]:40232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRABv-0007iP-IN for patchwork@mira.cbaines.net; Thu, 25 Aug 2022 06:34:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRAAZ-000731-9K for guix-patches@gnu.org; Thu, 25 Aug 2022 06:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oRAAY-0002Fx-Sa for guix-patches@gnu.org; Thu, 25 Aug 2022 06:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oRAAY-0007UK-Mu for guix-patches@gnu.org; Thu, 25 Aug 2022 06:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57398] Acknowledgement ([PATCH]: Add PySide 6.) Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Aug 2022 10:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57398 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57398@debbugs.gnu.org Received: via spool by 57398-submit@debbugs.gnu.org id=B57398.166142354628690 (code B ref 57398); Thu, 25 Aug 2022 10:33:02 +0000 Received: (at 57398) by debbugs.gnu.org; 25 Aug 2022 10:32:26 +0000 Received: from localhost ([127.0.0.1]:49088 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRA9x-0007Se-Or for submit@debbugs.gnu.org; Thu, 25 Aug 2022 06:32:26 -0400 Received: from mail-m971.mail.163.com ([123.126.97.1]:18853) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRA9t-0007SK-Fa for 57398@debbugs.gnu.org; Thu, 25 Aug 2022 06:32:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=WigeJ FlOpV88ByGnKIbBtCT7JTxgfx/oDOR2v5vleqQ=; b=R4Dp8mgNA7taKYkxXCOjw uAu4k2mezSOHbpIi3edXM7GCH9eXNj0s/RhrjPC0Rxx+0xfzRye8h9oKOP3hjjdG fgDyBh/GhBqODR2Y5m+Ky39xlHqRW2xwev2815HCxurtUNR1G+OesE3rx0OJa7MH gBaPjtwfjEKfIehec25z5c= Received: from asus-laptop (unknown [163.125.249.44]) by smtp1 (Coremail) with SMTP id GdxpCgDHAZ2mTwdjZSLuXA--.14164S2; Thu, 25 Aug 2022 18:32:11 +0800 (CST) References: <86czcoribi.fsf@163.com> User-agent: mu4e 1.8.9; emacs 29.0.50 From: Zhu Zihao Date: Thu, 25 Aug 2022 18:30:56 +0800 In-reply-to: Message-ID: <8635dkr4v8.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: GdxpCgDHAZ2mTwdjZSLuXA--.14164S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjTRVpBVDUUUU X-Originating-IP: [163.125.249.44] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBLwlor2HmoJOE3QABsN 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Patches updated From 2409816e83098d572d099a10e45129d56ba2a607 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Thu, 25 Aug 2022 13:07:38 +0800 Subject: [PATCH 8/9] gnu: Add python-pyside-6-tools * gnu/packages/qt.scm (python-pyside-6-tools): New variable. --- gnu/packages/qt.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 3d9bb45483..050bfdb768 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -4043,7 +4043,7 @@ (define-public python-pyside-2-tools #:configure-flags #~(list "-DBUILD_TESTS=off" (string-append "-DPYTHON_EXECUTABLE=" - #$(this-package-native-inputs "python-wrapper") + #$(this-package-native-input "python-wrapper") "/bin/python")) #:phases #~(modify-phases %standard-phases @@ -4056,6 +4056,43 @@ (define-public python-pyside-2-tools "Python-pyside-2-tools contains lupdate, rcc and uic tools for PySide2") (license license:gpl2))) +(define-public python-pyside-6-tools + (package + (inherit python-pyside-2-tools) + (name "python-pyside-6-tools") + (version (package-version python-shiboken-6)) + (source (package-source python-shiboken-6)) + (build-system cmake-build-system) + (inputs + (list python-pyside-6 + python-shiboken-6 + qtbase + qtdeclarative + qttools)) + (arguments + (substitute-keyword-arguments (package-arguments python-pyside-2-tools) + ((#:phases p) + #~(modify-phases #$p + (replace 'go-to-source-dir + (lambda _ (chdir "sources/pyside-tools") #t)) + (add-after 'go-to-source-dir 'fix-missing-tools + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{LIBEXEC_PATH\\}/(.+)\\$" all bin) + (string-append + (search-input-file + inputs (string-append "lib/qt6/libexec/" bin)) + "$")) + (("\\$\\{TOOLS_PATH\\}/(.+)\\$" all bin) + (string-append + (search-input-file + inputs (string-append "bin/" bin)) + "$"))))))))) + (synopsis + "Command line tools for PySide6") + (description + "Python-pyside-6-tools contains lupdate, rcc and uic tools for PySide6."))) + (define-public libqglviewer (package (name "libqglviewer") -- 2.37.2