From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id UNfGFmLaGGMCGwAAbAwnHQ (envelope-from ) for ; Wed, 07 Sep 2022 19:52:34 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id cGr6FmLaGGPUuQAA9RJhRA (envelope-from ) for ; Wed, 07 Sep 2022 19:52:34 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1494B35E66 for ; Wed, 7 Sep 2022 19:52:34 +0200 (CEST) Received: from localhost ([::1]:34822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVzE1-0006WG-1A for larch@yhetil.org; Wed, 07 Sep 2022 13:52:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVzDX-0006Vk-4L for guix-patches@gnu.org; Wed, 07 Sep 2022 13:52:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39187) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oVzDW-00071t-RO for guix-patches@gnu.org; Wed, 07 Sep 2022 13:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oVzDW-0006s4-G0 for guix-patches@gnu.org; Wed, 07 Sep 2022 13:52:02 -0400 Subject: bug#57398: [PATCH]: Add PySide 6. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Wed, 07 Sep 2022 17:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 57398 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Zhu Zihao , 57398-done@debbugs.gnu.org Mail-Followup-To: 57398@debbugs.gnu.org, marius@gnu.org, all_but_last@163.com Received: via spool by 57398-done@debbugs.gnu.org id=D57398.166257307826352 (code D ref 57398); Wed, 07 Sep 2022 17:52:02 +0000 Received: (at 57398-done) by debbugs.gnu.org; 7 Sep 2022 17:51:18 +0000 Received: from localhost ([127.0.0.1]:56118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVzCo-0006qx-Bi for submit@debbugs.gnu.org; Wed, 07 Sep 2022 13:51:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVzCm-0006ql-Pb for 57398-done@debbugs.gnu.org; Wed, 07 Sep 2022 13:51:17 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43892) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVzCh-0006yv-IO; Wed, 07 Sep 2022 13:51:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=Ep2od3OG4jE1nERgHB2pjwx9+XQ9Ntt2uvzC7B+HyiM=; b=Dn1CFnukXtYmmNdmDVEd vv6Dr6hU7MdK0v38n/revAdA2x5e1G5YxlhodKHmE1JVajJnDR9O5r0WRf+6CdeuMFdRRz5kzilWK WXsSyt+iYG8usG2amBfc4nMdfFk1sRfdElDN/e2tWk6D3TpWBLpNpxLyO/ohUsrhKcPa5rl8bcP9V /EFgczM//FX7u7g6waLoWkWduOG1ytopUXsEKaiQZLXu5H/RwjYfqiq3gJHviWELPlG+YijLILYaP IN7srB+Raz3S4HwsKzWt1ESpw3rlMsCanTnfmNiMq47YbPFBqnNo3hnOlYmA7Zf8aDVK+EG4px8om FxxjfrGGeIh5NA==; Received: from [84.214.173.6] (port=49612 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVzCg-0005hy-3g; Wed, 07 Sep 2022 13:51:11 -0400 From: Marius Bakke In-Reply-To: <86czcoribi.fsf@163.com> References: <86czcoribi.fsf@163.com> Date: Wed, 07 Sep 2022 19:51:06 +0200 Message-ID: <87zgfbul85.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1662573154; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=Ep2od3OG4jE1nERgHB2pjwx9+XQ9Ntt2uvzC7B+HyiM=; b=tr6vLg7DBtKJY6xfa0x8AKV/oX5sY8yti677Btq37qFEmYaEeIqBRHbQUyKjKGNrGCatmi Km+W8YS7e8IWQiUysMFuRMTmyRQ2CEOn6jEvXMYhdTeLFJ4XMLUxXMQaOaWITUepn/Q2GS ck2ByQoHGxMCFwMwcgcKQzC6nh0R2MDkOhp7sQbecTpz6dw6yG3colLNWbjG5o8I9gttBC 5vXD2yQyuxKActhcTLKlSN5IhzVqIpDO0WAxEwtNMXIHM6srx90jnngnDmc0JcipsZFDaM BijZhBtUlrwkLHB17QeJCXOzL+GfuYnJDJRdVqJmseVXIi5y6Ik5Cs9ZPRFQUw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662573154; a=rsa-sha256; cv=none; b=TubdVMf14XA4iAT4zgonxFMO0PYmVlHXyi59qEZZmB6bT3Z6gGS9icP4X1aWZk7rFNvwnL J/0oFlAGuZZmD4qEDjKTXSXetdINWRy3HDFwDUmAL5shEcUvWWceD6Y9RVHdXTRw+GNh86 HJQHYDYXeElZ1RdNPlKhpzlKx4le73uq41kOiH3C7jjrsIHFM48TLeOxVvr+5FROBAwWFA b80RQmKjr22SuzR+MzyQjghbG2ul2TYmOnTZBYHOxbfDO/K+fFNNRSuOhcp1ohaAdAaQxx jv6tVr6Ba810TctcRYtkbOGtmhiwWlMXUI60X9F5K7CeH2ksDW5C3C0055l2NA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Dn1CFnuk; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -6.58 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Dn1CFnuk; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 1494B35E66 X-Spam-Score: -6.58 X-Migadu-Scanner: scn0.migadu.com X-TUID: 5FmzoCZ1f1vw --=-=-= Content-Type: text/plain Hi Zhu, Thanks for these patches, nice work! I've applied them with a few minor tweaks, see inline. Zhu Zihao skriver: >>>From a4d31ffc721fa3b459e2f168cb4af65147b82248 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Wed, 24 Aug 2022 19:25:26 +0800 > Subject: [PATCH 3/9] gnu: python-pyside-2: Use G-expressions. > > * gnu/packages/qt.scm (python-pyside-2)[native-inputs]: Use label-less input > style. > [arguments]: Use G-expressions. [...] > (native-inputs > - `(("cmake" ,cmake-minimal) > - ("python" ,python-wrapper) > - ("qttools-5" ,qttools-5) > - ("which" ,which))) > + (list cmake-minimal python-wrapper qttools-5 which)) [...] > + ;; Add include directories for qt modules. > + (let ((dirs (map (lambda (name) > + (string-append (assoc-ref inputs name) > + "/include/qt5")) > + '("qtdatavis3d" > + "qtdeclarative" > + "qtlocation" > + "qtmultimedia" > + "qtquickcontrols" > + "qtquickcontrols2" > + "qtscript" > + "qtscxml" > + "qtsensors" > + "qtspeech" > + "qtsvg" > + "qttools-5" Here qttools-5 would no longer be found, so I changed it. >>>From 801e4315b1ef24fc18cf61169b42443eb221e924 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Wed, 24 Aug 2022 22:57:44 +0800 > Subject: [PATCH 5/9] gnu: python-pyside-2: Use "this-package-input" instead of > "assoc-ref". > > * gnu/packages/qt.scm (python-pyside-2)[arguments]<#:configure-flags>: Use > "this-package-input" > <#:phases>: In phase "fix-qt-module-detection", use "this-package-input". I had to manually apply this patch because I changed the previous one. While at it, I made one tweak: > @@ -3880,7 +3880,7 @@ (define-public python-pyside-2 > #:configure-flags > #~(list "-DBUILD_TESTS=FALSE" > (string-append "-DPYTHON_EXECUTABLE=" > - (assoc-ref %build-inputs "python") > + #$(this-package-native-input "python-wrapper") > "/bin/python")) I changed this to use (search-input-file ...) instead of #$(this-package-native-input ...). And the same in subsequent patches. The reason is that THIS-PACKAGE has a runtime cost (meaning the "guix" commands get slower), but SEARCH-INPUT-FILE is computed at build time. In short, always use SEARCH-INPUT-FILE when feasible. :-) Applied all 9 with these changes! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCYxjaCg8cbWFyaXVzQGdu dS5vcmcACgkQ6HGLpZEUEHc75QD/eCVJnCc2DUzZNuo2JEpcpf+7K7BSDR741Qoa kyWxKu4BAN8v9nVAuXDvGGW+Nz3m6LxDbpJ8kxSTtRep21ADDhsB =8OPI -----END PGP SIGNATURE----- --=-=-=--