From patchwork Tue Dec 26 22:14:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Rimoldi X-Patchwork-Id: 58091 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 30B4B27BBEA; Tue, 26 Dec 2023 22:15:26 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED 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 858BC27BBE9 for ; Tue, 26 Dec 2023 22:15:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIFhZ-0000A8-HM; Tue, 26 Dec 2023 17:15:05 -0500 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 1rIFhX-00009i-To for guix-patches@gnu.org; Tue, 26 Dec 2023 17:15:03 -0500 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 1rIFhX-0005Rq-HZ for guix-patches@gnu.org; Tue, 26 Dec 2023 17:15:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIFhV-0007gD-O1 for guix-patches@gnu.org; Tue, 26 Dec 2023 17:15:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68052] [PATCH 1/4] gnu: python-poppler-qt5: update to 21.3.0 Resent-From: Marco Rimoldi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Dec 2023 22:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68052 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68052@debbugs.gnu.org Received: via spool by 68052-submit@debbugs.gnu.org id=B68052.170362886029434 (code B ref 68052); Tue, 26 Dec 2023 22:15:01 +0000 Received: (at 68052) by debbugs.gnu.org; 26 Dec 2023 22:14:20 +0000 Received: from localhost ([127.0.0.1]:35096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIFgp-0007eg-Ha for submit@debbugs.gnu.org; Tue, 26 Dec 2023 17:14:19 -0500 Received: from smtp-32.italiaonline.it ([213.209.10.32]:40204 helo=libero.it) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIFgk-0007eO-5k for 68052@debbugs.gnu.org; Tue, 26 Dec 2023 17:14:17 -0500 Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA id IFgfrxjeNUvUzIFgfrGw6C; Tue, 26 Dec 2023 23:14:10 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1703628850; bh=22jF2V/5Gym67qeb6O0GeFXsv2IRHRXYo6hAByEJpt4=; h=From; b=aKFOTRKNk2qQio3QQyJdxmRVJrr4oPvE1xvevd6t13wUnWJbfY+2dfMC5Uemgclch OgNsTUIODzfejCMRWW2IlidFryuzWL6MGcZiFzRMxXPgHzWWpRuk5p5g/na4XjqvgL HPajJydFLMPBWRPypOHLhmujLZhpb6kbMBqlEUPZP+pNr4nIrBnrKfGRAsHoN1dZpd j3nGNieBTmL6ZXaEdq4TtHMWZkE6upx3x+r6k6sktz6YJyf9IPe+7Al/nYJQin8O81 6ye5GHySV2xFMlB3FoOWcgKNB6Z2wC86bnrI4e6aaPv05qCZVxhL2pdWxi8ko+e0xU Dv7X+iDy60hgQ== X-CNFS-Analysis: v=2.4 cv=MvuUqUWe c=1 sm=1 tr=0 ts=658b5032 cx=a_exe a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=kj9zAlcOel0A:10 a=8AHkEIZyAAAA:8 a=CckQENj0AAAA:8 a=NEAV23lmAAAA:8 a=Z42u9cC_KPnAsnA-tEQA:9 a=CjuIK1q_8ugA:10 a=-XWihg8NfbdYC9mmq4w4:22 Date: Tue, 26 Dec 2023 23:14:08 +0100 Message-ID: <20231226231408.6f2caeb5@libero.it> In-Reply-To: References: X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CMAE-Envelope: MS4xfC5+QjQnI3ydIEQ2pkGBzPPBcVNQVdqsbcbR92ia3P16zRxx+0NrMNwlK6Xz94dr/qkVy+C4PC1Ix1H6J1HVFvtXhqVXbMb8ppw1bh8p+QpoNE0RytDh URCtc6BGre9I4hWdjxsqIjfoUMg8+oquHdcWoOTRWI9dvlhw+qx2C02gLM2zHWtGy1B9QhOWcxS5DA== 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: , Reply-to: Marco Rimoldi X-ACL-Warn: , Marco Rimoldi via Guix-patches X-Patchwork-Original-From: Marco Rimoldi via Guix-patches via From: Marco Rimoldi 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/pdf.scm (python-poppler-qt5): Update tp 21.3.0 [build-system]: Change to pyproject, fix previous build failure. Change-Id: I30d6e2a3180505091d8072ed452211b0bb3a0178 --- gnu/packages/pdf.scm | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 644a4617a6..787f5a2a6f 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -415,40 +415,29 @@ (define-public poppler-qt5 (define-public python-poppler-qt5 (package (name "python-poppler-qt5") - (version "21.1.0") + (version "21.3.0") (source (origin (method url-fetch) (uri (pypi-uri "python-poppler-qt5" version)) (sha256 (base32 - "0b82gm4i75q5v19kfbq0h4y0b2vcwr2213zkhxh6l0h45kdndmxd")) - (patches (search-patches "python-poppler-qt5-fix-build.patch")))) - (build-system python-build-system) + "1q3gvmsmsq3llf9mcbhlkryrgprqrw2z7wmnvagy180f3y2fhxxl")))) + (build-system pyproject-build-system) (arguments - `(;; There are no tests. The check phase just causes a rebuild. - #:tests? #f - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "setup.py" - ;; This check always fails, so disable it. - (("if not check_qtxml\\(\\)") - "if True")) - ;; We need to pass an extra flag here. This cannot be in - ;; configure-flags because it should not be passed for the - ;; installation phase. - ((@@ (guix build python-build-system) call-setuppy) - "build_ext" (list (string-append "--pyqt-sip-dir=" - (assoc-ref inputs "python-pyqt") - "/share/sip")) #t)))))) + `( + ;; The backend builder expects a Python dictionary as per + ;; https://peps.python.org/pep-0517/#config-settings, but we + ;; give it lists and it fails. The next line is a workaround. + #:configure-flags '#nil + #:build-backend "sipbuild.api" + #:tests? #f)) (native-inputs (list pkg-config)) (inputs - (list python-sip-4 python-pyqt poppler-qt5 qtbase-5)) - (home-page "https://pypi.org/project/python-poppler-qt5/") - (synopsis "Python bindings for Poppler-Qt5") + (list python-sip python-pyqt-builder python-pyqt poppler-qt5 qtbase-5)) + (home-page "https://github.com/frescobaldi/python-poppler-qt5") + (synopsis "Python binding to Poppler-Qt5") (description "This package provides Python bindings for the Qt5 interface of the Poppler PDF rendering library.") From patchwork Tue Dec 26 22:14:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Rimoldi X-Patchwork-Id: 58090 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 02CD127BBE2; Tue, 26 Dec 2023 22:15:19 +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.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 5CE1527BBE9 for ; Tue, 26 Dec 2023 22:15:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIFhd-0000AT-2U; Tue, 26 Dec 2023 17:15:09 -0500 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 1rIFhY-00009q-DX for guix-patches@gnu.org; Tue, 26 Dec 2023 17:15:04 -0500 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 1rIFhX-0005SU-Vc for guix-patches@gnu.org; Tue, 26 Dec 2023 17:15:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIFhW-0007i1-5P for guix-patches@gnu.org; Tue, 26 Dec 2023 17:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68052] [PATCH 2/4] gnu : python-poppler-qt5: Remove no longer needed patch Resent-From: Marco Rimoldi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Dec 2023 22:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68052 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68052@debbugs.gnu.org Received: via spool by 68052-submit@debbugs.gnu.org id=B68052.170362888429478 (code B ref 68052); Tue, 26 Dec 2023 22:15:02 +0000 Received: (at 68052) by debbugs.gnu.org; 26 Dec 2023 22:14:44 +0000 Received: from localhost ([127.0.0.1]:35099 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIFhD-0007fN-VJ for submit@debbugs.gnu.org; Tue, 26 Dec 2023 17:14:44 -0500 Received: from smtp-32.italiaonline.it ([213.209.10.32]:40204 helo=libero.it) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIFhB-0007eO-LT for 68052@debbugs.gnu.org; Tue, 26 Dec 2023 17:14:42 -0500 Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA id IFhCrxk1HUvUzIFhCrGwMq; Tue, 26 Dec 2023 23:14:42 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1703628883; bh=f/ASEojbL1VInzDrzRDhVCF9CrABC9Lt/PSF36kw9hY=; h=From; b=g1JUHezzfRZsa0+AhZCuI44TqLHnccweJeC6Iyfd4bTE8AFHDAx+SEpYEewLFO0j3 mr9LVp3eP1eYmWLx7x3huLo+o1zXQZOVTnTxCCcptjAMYu11GRCwM5Vd7Twlp8WPzE kxkj6IaHExtpq4TfYpF1gIwz6BAkfWgoasQBwqohpp4EDIIgFR1rdKwt81/toCy+nE kuxKfTQuoES9kQPg12p+573srwWX2IogFD0cDdh89qiQDulMjWsZwUWvqiYjWirm9B 3XzFot89MS1kbM01axadgOjRc6kaAavz/ARpbHonJnyef60uH/HsmNOelMcRF40hi+ Dy+PYL4FFdOHw== X-CNFS-Analysis: v=2.4 cv=MvuUqUWe c=1 sm=1 tr=0 ts=658b5053 cx=a_exe a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=kj9zAlcOel0A:10 a=NEAV23lmAAAA:8 a=WBDXT6l-fv67wi_S36MA:9 a=CjuIK1q_8ugA:10 Date: Tue, 26 Dec 2023 23:14:41 +0100 Message-ID: <32f6fa9d4a9ec6dc4932a04901788a3e6789055c.1703627648.git.rimarko@libero.it> In-Reply-To: References: X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CMAE-Envelope: MS4xfLx13CbYMphfYjsU7PQW4zh9Z6pKK6c7grNSF9KmnQ2l7Z+LoFvikcchPAzK9D1vN9ah1yB2K83SAfW9VNV+qRqT/kdSnupbno1gk95Irflm+b6kNm1K qvF8n3tx4x8TPwjZ4AKXGQPm2nBs+vZ4KxnTBzAq6CfP25syGHwAU2FW3sVSPzxBf0BIQ7jg8lfgrQ== 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: , Reply-to: Marco Rimoldi X-ACL-Warn: , Marco Rimoldi via Guix-patches X-Patchwork-Original-From: Marco Rimoldi via Guix-patches via From: Marco Rimoldi 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 Change-Id: Ie5f6039dcfd8e6d1315e969dc12dafb158a8cc10 --- .../python-poppler-qt5-fix-build.patch | 116 ------------------ 1 file changed, 116 deletions(-) delete mode 100644 gnu/packages/patches/python-poppler-qt5-fix-build.patch diff --git a/gnu/packages/patches/python-poppler-qt5-fix-build.patch b/gnu/packages/patches/python-poppler-qt5-fix-build.patch deleted file mode 100644 index 099bb86d2f..0000000000 --- a/gnu/packages/patches/python-poppler-qt5-fix-build.patch +++ /dev/null @@ -1,116 +0,0 @@ -Patch taken from the upstream repository -https://github.com/frescobaldi/python-poppler-qt5/issues/43 - -From 92e5962ec3751ab051d0b655fd61afc7a1cf709e Mon Sep 17 00:00:00 2001 -From: Ben Greiner -Date: Thu, 4 Mar 2021 17:02:51 +0100 -Subject: [PATCH] map type QVector< QPair > for - FormFieldChoice::choicesWithExportValues() (#45) - ---- - types.sip | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 93 insertions(+) - -diff --git a/types.sip b/types.sip -index 239b8c9..81cb283 100644 ---- a/types.sip -+++ b/types.sip -@@ -331,5 +331,98 @@ template - }; - - -+/** -+ * Convert QVector< QPair > -+ * from and to a Python list of a 2-item tuple -+ */ -+ -+template -+%MappedType QVector< QPair > -+{ -+%TypeHeaderCode -+#include -+#include -+%End -+ -+%ConvertFromTypeCode -+ // Create the list. -+ PyObject *l; -+ -+ if ((l = PyList_New(sipCpp->size())) == NULL) -+ return NULL; -+ -+ // Set the list elements. -+ for (int i = 0; i < sipCpp->size(); ++i) -+ { -+ QPair* p = new QPair(sipCpp->at(i)); -+ PyObject *ptuple = PyTuple_New(2); -+ PyObject *pfirst; -+ PyObject *psecond; -+ -+ TYPE *sfirst = new TYPE(p->first); -+ if ((pfirst = sipConvertFromType(sfirst, sipType_TYPE, sipTransferObj)) == NULL) -+ { -+ Py_DECREF(l); -+ Py_DECREF(ptuple); -+ return NULL; -+ } -+ PyTuple_SET_ITEM(ptuple, 0, pfirst); -+ -+ TYPE *ssecond = new TYPE(p->second); -+ if ((psecond = sipConvertFromType(ssecond, sipType_TYPE, sipTransferObj)) == NULL) -+ { -+ Py_DECREF(l); -+ Py_DECREF(ptuple); -+ Py_DECREF(pfirst); -+ return NULL; -+ } -+ PyTuple_SET_ITEM(ptuple, 1, psecond); -+ -+ PyList_SET_ITEM(l, i, ptuple); -+ } -+ -+ return l; -+%End -+ -+%ConvertToTypeCode -+ const sipTypeDef* qpair_type = sipFindType("QPair"); -+ -+ // Check the type if that is all that is required. -+ if (sipIsErr == NULL) -+ { -+ if (!PySequence_Check(sipPy)) -+ return 0; -+ -+ for (int i = 0; i < PySequence_Size(sipPy); ++i) -+ if (!sipCanConvertToType(PySequence_ITEM(sipPy, i), qpair_type, SIP_NOT_NONE)) -+ return 0; -+ -+ return 1; -+ } -+ -+ -+ QVector< QPair > *qv = new QVector< QPair >; -+ -+ for (int i = 0; i < PySequence_Size(sipPy); ++i) -+ { -+ int state; -+ QPair * p = reinterpret_cast< QPair * >(sipConvertToType(PySequence_ITEM(sipPy, i), qpair_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ -+ if (*sipIsErr) -+ { -+ sipReleaseType(p, qpair_type, state); -+ delete qv; -+ return 0; -+ } -+ qv->append(*p); -+ sipReleaseType(p, qpair_type, state); -+ } -+ -+ *sipCppPtr = qv; -+ return sipGetState(sipTransferObj); -+%End -+ -+}; -+ - - /* kate: indent-width 4; space-indent on; hl c++; indent-mode cstyle; */ From patchwork Tue Dec 26 22:15:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Rimoldi X-Patchwork-Id: 58093 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 81FDD27BBEA; Tue, 26 Dec 2023 22:17:27 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED 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 DE9AA27BBE2 for ; Tue, 26 Dec 2023 22:17:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIFjV-0000QM-0Z; Tue, 26 Dec 2023 17:17:05 -0500 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 1rIFjT-0000Ph-O9 for guix-patches@gnu.org; Tue, 26 Dec 2023 17:17:03 -0500 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 1rIFjT-0005nl-FZ for guix-patches@gnu.org; Tue, 26 Dec 2023 17:17:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIFjR-0001ve-MO for guix-patches@gnu.org; Tue, 26 Dec 2023 17:17:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68052] [PATCH 3/4] gnu: python-pyportmidi: Update to latest git revision, fixing build fail. Resent-From: Marco Rimoldi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Dec 2023 22:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68052 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68052@debbugs.gnu.org Received: via spool by 68052-submit@debbugs.gnu.org id=B68052.17036289625941 (code B ref 68052); Tue, 26 Dec 2023 22:17:01 +0000 Received: (at 68052) by debbugs.gnu.org; 26 Dec 2023 22:16:02 +0000 Received: from localhost ([127.0.0.1]:35111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIFiT-0001Wp-Fk for submit@debbugs.gnu.org; Tue, 26 Dec 2023 17:16:02 -0500 Received: from smtp-32.italiaonline.it ([213.209.10.32]:33624 helo=libero.it) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIFiR-0001K3-7L for 68052@debbugs.gnu.org; Tue, 26 Dec 2023 17:16:00 -0500 Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA id IFiMrxkwvUvUzIFiNrGwut; Tue, 26 Dec 2023 23:15:55 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1703628955; bh=MnBHMFAwxI+1EbgR9VbbazjNFEz4+vZU6ocU7w4fT+M=; h=From; b=aCGRZJyCtQmoZ1545umyHwRHkn87QHiCBqadoEqC+fUBivQGiaLehBJrRwsd/MfFn dSU5IBtjhIxQK5rdWZ3YN0ob21TQOAec9FQBOkH0AzOhQIdrBwVmgb201E/K2aGD50 VSnggirYJIXUUT+NhUV1ZrRabvecHy/aC2Fpw+SDKutaEjEg4CYuUpV5yefAedmzFh R6EpCkO6eeFDBLFHfx2t/YLrQnaknq0vN8DH2Sh/3aj080aTjTmCSMQJx+kKQTFIcV 4WCSz5vHsgx8mCNVNBceUALKum49PoULxtRfK+feYGbHSNdRzeTvjRIGc7KDvjdwrr 4Moer5NfaQwfQ== X-CNFS-Analysis: v=2.4 cv=MvuUqUWe c=1 sm=1 tr=0 ts=658b509b cx=a_exe a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=kj9zAlcOel0A:10 a=FP58Ms26AAAA:8 a=NEAV23lmAAAA:8 a=rYn_n4T80Q_eixLIMPkA:9 a=CjuIK1q_8ugA:10 Date: Tue, 26 Dec 2023 23:15:54 +0100 Message-ID: In-Reply-To: References: X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CMAE-Envelope: MS4xfCA84iBkE2OvWcyomNqwTze694V7aa8IYVjRxRxcbOCUEQJ0zvnJ+jeLwMQNamVM+e2gmb9ymd0Z4rPR3ihmm4D+4l+kfhY3L16XlJY2JzVlX+4f/sv/ HmoS6Q7K8C+Dt4SeUe61AXfUfUQLBOHqW0hRpkZPRbQkU7rSkDDZ7UeZyGWi4gSaNbLZ5Dv20orVMw== 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: , Reply-to: Marco Rimoldi X-ACL-Warn: , Marco Rimoldi via Guix-patches X-Patchwork-Original-From: Marco Rimoldi via Guix-patches via From: Marco Rimoldi 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 Change-Id: Ibe02edca39731f3f3c9001818665d2da97df9465 --- gnu/packages/music.scm | 52 ++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 77e952d383..6f1736a276 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3048,36 +3048,28 @@ (define-public portmidi (license license:expat))) (define-public python-pyportmidi - (package - (name "python-pyportmidi") - (version (package-version portmidi)) - (source (package-source portmidi)) - (build-system python-build-system) - (arguments - `(#:tests? #f ; no tests included - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'enter-dir - (lambda _ (chdir "pm_python") #t)) - (add-after 'enter-dir 'fix-setup.py - (lambda _ - (substitute* "setup.py" - ;; Use Python 3 syntax - (("print (\".*\")" _ text) - (string-append "print(" text ")\n")) - ;; TODO.txt and CHANGES.txt don't exist - (("CHANGES =.*") "CHANGES = \"\"\n") - (("TODO =.*") "TODO = \"\"\n")) - #t))))) - (inputs - (list portmidi alsa-lib)) - (native-inputs - (list python-cython unzip)) - (home-page "https://portmedia.sourceforge.net/portmidi/") - (synopsis "Python bindings to PortMidi") - (description - "This package provides Python bindings to the PortMidi library.") - (license license:expat))) + (let ((commit "d9e5ee00b208b09618fa0d4a5bbce3c9c077b386") + (revision "0")) + (package + (name "python-pyportmidi") + (version (git-version "0.0.7" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/PortMidi/pm_python.git") + (commit commit))) + (sha256 (base32 "1jvp9na8d1hw46w9ybhkimbavfb3ysw7hp30cbk6dj40k5y5vgvz")) + (file-name (git-file-name name version)))) + (build-system python-build-system) + (inputs + (list portmidi alsa-lib)) + (native-inputs + (list python-cython)) + (home-page "https://github.com/PortMidi") + (synopsis "Python bindings to PortMidi") + (description + "This package provides Python bindings to the PortMidi library.") + (license license:expat)))) (define-public frescobaldi (package From patchwork Tue Dec 26 22:16:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Rimoldi X-Patchwork-Id: 58092 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 7C79427BBE9; Tue, 26 Dec 2023 22:17:18 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED 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 CD1C816EA4 for ; Tue, 26 Dec 2023 22:17:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIFjU-0000Pz-KG; Tue, 26 Dec 2023 17:17:04 -0500 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 1rIFjU-0000Pq-2I for guix-patches@gnu.org; Tue, 26 Dec 2023 17:17:04 -0500 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 1rIFjT-0005nq-Qc for guix-patches@gnu.org; Tue, 26 Dec 2023 17:17:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIFjS-0001vn-20 for guix-patches@gnu.org; Tue, 26 Dec 2023 17:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68052] [PATCH 4/4] gnu: portmidi: Add variant portmidi-2 updated to release 2.0.4 Resent-From: Marco Rimoldi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Dec 2023 22:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68052 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68052@debbugs.gnu.org Received: via spool by 68052-submit@debbugs.gnu.org id=B68052.17036289726543 (code B ref 68052); Tue, 26 Dec 2023 22:17:02 +0000 Received: (at 68052) by debbugs.gnu.org; 26 Dec 2023 22:16:12 +0000 Received: from localhost ([127.0.0.1]:35114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIFid-0001h4-Ei for submit@debbugs.gnu.org; Tue, 26 Dec 2023 17:16:11 -0500 Received: from smtp-32.italiaonline.it ([213.209.10.32]:33624 helo=libero.it) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIFib-0001K3-AT for 68052@debbugs.gnu.org; Tue, 26 Dec 2023 17:16:09 -0500 Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA id IFicrxl81UvUzIFicrGx0s; Tue, 26 Dec 2023 23:16:10 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1703628970; bh=YYRpUhMUquRze7p3HTHezHxtkp/iiSjssTlWSdCeqS4=; h=From; b=E884fUU6aiEK665IvaH6VplD/xNALaymKiSfHZlsMIKFuWncY8+xCU4IdrpWJ3sSa 4bJH+FYVd3c68vgIijKKQK3Pr5E7qjESEnXUONVhetPNkyiQ6fZAEY4UMO+fzaNySn exW9fmPf4XjODfBpR4nKjS9v5bZJLyM4tFgScG8a4Rs7lqOSJRVIQaryfMc5dF6K6L PRTeJMgNdl3m/jeR6XCiztpt+M0uun4oUqhw6zTXPBnzBZR3o8W69BkBGaIKXGLIOn R6WqPYs9i+Zn0cuUf59C1phU0KlIHGLV7v3i1Ty236+uns4iyyMcibNDzC8GFTATE0 hTp9BvZvGaXBQ== X-CNFS-Analysis: v=2.4 cv=MvuUqUWe c=1 sm=1 tr=0 ts=658b50aa cx=a_exe a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=kj9zAlcOel0A:10 a=NEAV23lmAAAA:8 a=6mzkHtF41XAJzUW3stQA:9 a=CjuIK1q_8ugA:10 Date: Tue, 26 Dec 2023 23:16:09 +0100 Message-ID: <78e978968bbff5e9275bd1e75442eed18f15e8bb.1703627648.git.rimarko@libero.it> In-Reply-To: References: X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CMAE-Envelope: MS4xfMqcrbyc8/5Sf+X+1bzcYV+JUpNwB9/ViRp4XYB3ZGcyblRxqoNkf7yN97qO08ZdZwQdIxAcFJTrty7hZNiute0EXsq1g/dJuY7tmEDunYLcuflscSXC ZkyoKzd4/2WAMKF1dBqZmEkTDdmauptTC1M4VsFw6BSj5wCP5AXeYI9AE8/BKzbPW6FRLwV3HQc+2Q== 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: , Reply-to: Marco Rimoldi X-ACL-Warn: , Marco Rimoldi via Guix-patches X-Patchwork-Original-From: Marco Rimoldi via Guix-patches via From: Marco Rimoldi 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 Tested with package Frescobaldi. Other packages dependent on the old 217 version still need to be tested and updated so that it can be phased out. Change-Id: I2530d206e19e885082a95f1aac65348e7a51d4ca --- gnu/packages/music.scm | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6f1736a276..c485bf1620 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3047,6 +3047,39 @@ (define-public portmidi using a system-independent interface.") (license license:expat))) +(define-public portmidi-2 + (package + (name "portmidi") + (version "2.0.4") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/PortMidi/portmidi/archive/refs/tags/v" + version ".zip")) + (sha256 + (base32 + "00xdlxd470zpbvvjb8km516y3mbpkv3487y1irn0qs1d38b18mys")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; tests are interactive and can be found in the + #:configure-flags ; pm_tests/ directory of the build tree + (list "-DBUILD_PORTMIDI_TESTS=On") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-version + (lambda _ (substitute* "CMakeLists.txt" + (("2.0.3") (version)))))))) + (inputs + (list alsa-lib)) + (native-inputs + (list unzip)) + (home-page "https://github.com/PortMidi/") + (synopsis "Library for MIDI I/O") + (description + "PortMidi is a library supporting real-time input and output of MIDI data +using a system-independent interface.") + (license license:expat))) + (define-public python-pyportmidi (let ((commit "d9e5ee00b208b09618fa0d4a5bbce3c9c077b386") (revision "0")) @@ -3062,7 +3095,7 @@ (define-public python-pyportmidi (file-name (git-file-name name version)))) (build-system python-build-system) (inputs - (list portmidi alsa-lib)) + (list portmidi-2 alsa-lib)) (native-inputs (list python-cython)) (home-page "https://github.com/PortMidi") @@ -3098,7 +3131,7 @@ (define-public frescobaldi (inputs (list lilypond poppler - portmidi + portmidi-2 python-ly python-poppler-qt5 python-pyportmidi