From patchwork Wed Mar 10 09:00:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27569 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 2BD0627BC51; Wed, 10 Mar 2021 09:02:19 +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 270DA27BC50 for ; Wed, 10 Mar 2021 09:02:18 +0000 (GMT) Received: from localhost ([::1]:47472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJujR-0003cZ-B2 for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujC-0003cD-Ee for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37155) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujC-0007Lc-7W for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujC-00046X-52 for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 01/27] gnu: python-sip: Update to 5.5.0. Add python-sip-4 References: <8b1e2bed-e543-44a2-574b-f3c2c5a14d3f@brendan.scot> In-Reply-To: <8b1e2bed-e543-44a2-574b-f3c2c5a14d3f@brendan.scot> Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:02 +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.161536688215449 (code B ref 42885); Wed, 10 Mar 2021 09:02:02 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:22 +0000 Received: from localhost ([127.0.0.1]:48635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiX-00040w-86 for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:22 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:20378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiT-00040P-Au for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:19 -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-202.mailbox.org (Postfix) with ESMTPS id 4DwQzV73H9zQjxJ for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:10 +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=1615366869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yPYZTIudKNuEy6DnTDLSW65cg1zVmnAPEnvhmTjLsoU=; b=juoVOozQbt7Kqd14cYeDCUFsS7P63RGuqgvNMwB2b1am82IEy31vsWQZ+hSh9ezXOwB0ms 6VzaooUY21vijXTqiRP+ZBgDUf1S5sVBB94roHd+5ObgKomMXwz+zBcRnVdbzjnnAJS6Tx 1YxDHuNtCqAl9TUSrDHBUss22KNmPUE9MSSOlbcjIgh45QadIk0uwwfBDEUI1nDZ3DF2Yg qG3GVUZ8kpj9jc62mkStWOWquuaNYTVkfPtgrZzyoSvGsPy9HbiAJ7CNrbvH5rFWi8Nmac Fuc3lIo+Nr6E29aaXyZBzt8rnIqWxVfOEhGDIr8Y+Cb1aXB9VrMugb6H3mmGnQ== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id 7nxDq95DkV2V for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:07 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:27 +1100 Message-Id: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -4.78 / 15.00 / 15.00 X-Rspamd-Queue-Id: A88751871 X-Rspamd-UID: 54cd30 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-sip): Update to 5.5.0. (python-sip-4): New variable. Rename the old python-sip to python-sip-4. --- gnu/packages/qt.scm | 52 +++++++++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d921aa87fe..ac5a68e8de 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2020 Jonathan Brielmaier ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,6 +89,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages regex) #:use-module (gnu packages ruby) @@ -1977,6 +1979,42 @@ and binaries removed, and adds modular support for using system libraries.") (define-public python-sip (package + (name "python-sip") + (version "5.5.0") + (source + (origin + (method url-fetch) + (uri (list (pypi-uri "sip" version) + (string-append "https://www.riverbankcomputing.com/static/" + "Downloads/sip/" version + "/sip-" version ".tar.gz"))) + (sha256 + (base32 + "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx")))) + (build-system python-build-system) + (native-inputs + `(("python" ,python-wrapper))) + (propagated-inputs + `(("python-toml" ,python-toml) + ("python-packaging" ,python-packaging))) + (home-page "https://www.riverbankcomputing.com/software/sip/intro") + (synopsis "Python binding creator for C and C++ libraries") + (description + "SIP is a tool to create Python bindings for C and C++ libraries. It +was originally developed to create PyQt, the Python bindings for the Qt +toolkit, but can be used to create bindings for any C or C++ library. + +SIP comprises a code generator and a Python module. The code generator +processes a set of specification files and generates C or C++ code, which +is then compiled to create the bindings extension module. The SIP Python +module provides support functions to the automatically generated code.") + ;; There is a choice between a python like license, gpl2 and gpl3. + ;; For compatibility with pyqt, we need gpl3. + (license license:gpl3))) + +(define-public python-sip-4 + (package + (inherit python-sip) (name "python-sip") (version "4.19.24") (source @@ -1992,6 +2030,7 @@ and binaries removed, and adds modular support for using system libraries.") (build-system gnu-build-system) (native-inputs `(("python" ,python-wrapper))) + (propagated-inputs `()) (arguments `(#:tests? #f ; no check target #:imported-modules ((guix build python-build-system) @@ -2014,19 +2053,6 @@ and binaries removed, and adds modular support for using system libraries.") "--bindir" bin "--destdir" lib "--incdir" include))))))) - (home-page "https://www.riverbankcomputing.com/software/sip/intro") - (synopsis "Python binding creator for C and C++ libraries") - (description - "SIP is a tool to create Python bindings for C and C++ libraries. It -was originally developed to create PyQt, the Python bindings for the Qt -toolkit, but can be used to create bindings for any C or C++ library. - -SIP comprises a code generator and a Python module. The code generator -processes a set of specification files and generates C or C++ code, which -is then compiled to create the bindings extension module. The SIP Python -module provides support functions to the automatically generated code.") - ;; There is a choice between a python like license, gpl2 and gpl3. - ;; For compatibility with pyqt, we need gpl3. (license license:gpl3))) (define-public python2-sip