From patchwork Wed Mar 13 08:58:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 61760 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 CDDAE27BBEE; Wed, 13 Mar 2024 09:02:32 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 B248E27BBE2 for ; Wed, 13 Mar 2024 09:02:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkKSq-0001hl-DC; Wed, 13 Mar 2024 04:59:56 -0400 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 1rkKSU-0000m4-NO for guix-patches@gnu.org; Wed, 13 Mar 2024 04:59:34 -0400 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 1rkKSU-0002OI-Dk for guix-patches@gnu.org; Wed, 13 Mar 2024 04:59:34 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rkKT3-0001LJ-BT; Wed, 13 Mar 2024 05:00:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69628] [PATCH qt-team v4 19/24] gnu: python-{shiboken, pyside}-6: Update to 6.6.2. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 13 Mar 2024 09:00:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69628 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69628@debbugs.gnu.org Cc: Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 69628-submit@debbugs.gnu.org id=B69628.17103203874965 (code B ref 69628); Wed, 13 Mar 2024 09:00:09 +0000 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:47 +0000 Received: from localhost ([127.0.0.1]:44555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSg-0001Hv-Oo for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:47 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34948 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSY-0001Ex-IM for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:40 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S21; Wed, 13 Mar 2024 16:58:54 +0800 (CST) From: Zheng Junjie Date: Wed, 13 Mar 2024 16:58:13 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S21 X-Coremail-Antispam: 1UD129KBjvJXoW7ZF13CrWDXFyxKF13Xry7ZFb_yoW8Zry8pF 40kF1qv3ZYkr1kJan3GF42gr90grn2krW5Aw4ay3ZrKayYvr48Xw4IkFW5ur48Wr18ua42 gw48W3W5Xa4rJaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9qb7Iv0xC_KF4lb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0 rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r 4UJbIYCTnIWIevJa73UjIFyTuYvjxUxHUDDUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/qt.scm (python-shiboken-6, python-pyside-6): Update to 6.6.2. (python-shiboken-6)[properties]: Set upstream-name. (python-pyside-6)[arguments]<#:phases>: Add 'set-rpath phase. Change-Id: I098481f860c3bc97a629cca719305b2d00c3eace --- gnu/packages/qt.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 053f589987..6b58fe2211 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -4498,7 +4498,7 @@ (define-public python-shiboken-6 (package (inherit python-shiboken-2) (name "python-shiboken-6") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (string-append "mirror://qt/QtForPython/pyside6/PySide6-" @@ -4506,7 +4506,7 @@ (define-public python-shiboken-6 version ".tar.xz")) (sha256 (base32 - "1a0v9mjlcjbffm4lf5cfg45hvqai9654p95ygj5cjhfd9z8z3nwh")))) + "1w690jpxrski7c71gx05q5fvl2117lnjj5ih8iwckx3s9mlhnqhl")))) (build-system cmake-build-system) (inputs (modify-inputs (package-inputs python-shiboken-2) @@ -4526,7 +4526,8 @@ (define-public python-shiboken-6 "-DCMAKE_SKIP_RPATH=TRUE" (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath=" #$output "/lib") - #$flags)))))) + #$flags)))) + (properties `((upstream-name . "pyside-setup"))))) (define-public python-pyside-2 (package @@ -4668,6 +4669,11 @@ (define-public python-pyside-6 #~(modify-phases %standard-phases (add-after 'unpack 'go-to-source-dir (lambda _ (chdir "sources/pyside6"))) + (add-after 'go-to-source-dir 'set-rpath + (lambda _ + (substitute* "CMakeLists.txt" + (("CMAKE_INSTALL_RPATH") + (string-append "CMAKE_INSTALL_RPATH " #$output "/lib"))))) (add-after 'go-to-source-dir 'fix-qt-module-detection (lambda _ (substitute* "cmake/PySideHelpers.cmake"