From patchwork Wed Mar 10 09:00:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27572 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 739D127BC52; Wed, 10 Mar 2021 09:02:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D14827BC50 for ; Wed, 10 Mar 2021 09:02:31 +0000 (GMT) Received: from localhost ([::1]:48234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJuje-000435-9y for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujE-0003cn-UY for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37162) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujE-0007NL-Lg for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujE-00047G-Jm for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 06/27] gnu: python-pyqt: Fix build for new python-sip. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536688815497 (code B ref 42885); Wed, 10 Mar 2021 09:02:04 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:28 +0000 Received: from localhost ([127.0.0.1]:48646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuid-00041o-Rr for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:28 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:15976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuib-00040o-Vn for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:26 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4DwQzh0MwhzQjhF for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:20 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W0fdkIWISmTiI63mAuMjAKiJPkZfzU7CVjUH9HfZL5o=; b=t7YKyTKx0jgCGkxBrQlgXdYW1xUwbpEz/LSW5PXldvtB5O0OpQDVxBhTrRdbvxMFDf9MNI DJLSOpYeCRXqNQaDIdbF6JDavtmiF7gsHpo7+WUpaILY8PikSrnB2lOkK57lMIRinExk/q A63DP9uVtXuesShwKRhF7YRwCnPh8dJhzQNNgD4s8P1pHp8c8MSGaR5s1Uxlo8p5a/IpOa VlTvvgy0eNa/Babm5Yb/bXOhucuj2a2ytJc6eMvfqc/Smaijxosnc5+IuWKXiVsUEfN83T 1hbItNdexHwvpUtt8+3mZjYddkykj5uyg64QLrM9JRZkIzlAhycs4xqpGZNb3w== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id qZRVucNvIxzJ for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:16 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:32 +1100 Message-Id: <20210310090053.21612-6-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.89 / 15.00 / 15.00 X-Rspamd-Queue-Id: BFA718A6 X-Rspamd-UID: b6fc77 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 * gnu/packages/qt.scm (python-pyqt) [source]: Remove pyqt-public-sip.patch. PyQt uses python-pyqt5-sip now. This patch is still used by python2-pyqt so we don't delete it completely. [inputs]: Add python-pyqt-builder, python-pyqt5-sip [arguments]: Add phase to link PyQt5-sip module. --- gnu/packages/qt.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 65e61d4dc4..b615a74755 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2074,12 +2074,11 @@ module provides support functions to the automatically generated code.") (string-append "https://www.riverbankcomputing.com/static/" "Downloads/PyQt5/" version "/PyQt5-" version ".tar.gz"))) - (file-name (string-append "PyQt5-"version ".tar.gz")) + (file-name (string-append "PyQt5-" version ".tar.gz")) (sha256 (base32 "1z74295i69cha52llsqffzhb5zz7qnbjc64h8qg21l91jgf0harp")) - (patches (search-patches "pyqt-configure.patch" - "pyqt-public-sip.patch")))) + (patches (search-patches "pyqt-configure.patch")))) (build-system gnu-build-system) (native-inputs `(("qtbase" ,qtbase))) ; for qmake @@ -2087,6 +2086,8 @@ module provides support functions to the automatically generated code.") `(("python-sip" ,python-sip))) (inputs `(("python" ,python-wrapper) + ("python-pyqt-builder" ,python-pyqt-builder) + ("python-pyqt5-sip" ,python-pyqt5-sip) ("qtbase" ,qtbase) ("qtconnectivity" ,qtconnectivity) ("qtdeclarative" ,qtdeclarative) @@ -2144,7 +2145,16 @@ module provides support functions to the automatically generated code.") ; installed into the python package's ; site-package directory, which is read-only. "--stubsdir" stubs - "--sipdir" sip))))))) + "--sipdir" sip)))) + ;; Linking here means the sip module can be found without + ;; python-pyqt5-sip needing to be added as an input. + (add-after 'install 'pyqt5-sip + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pyqt5-sip (assoc-ref inputs "python-pyqt5-sip")) + (site "/lib/python3.8/site-packages/PyQt5/") + (.so (first (find-files (string-append pyqt5-sip site) "sip.*")))) + (symlink .so (string-append out site (basename .so))))))))) (home-page "https://www.riverbankcomputing.com/software/pyqt/intro") (synopsis "Python bindings for Qt") (description