From patchwork Wed Feb 21 19:30:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Rimoldi X-Patchwork-Id: 60879 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 2C6A227BBE2; Wed, 21 Feb 2024 20:11:50 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 4BF0327BBE9 for ; Wed, 21 Feb 2024 20:11:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcsvi-0007bH-JW; Wed, 21 Feb 2024 15:10:59 -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 1rcsvP-0007WR-Tf for guix-patches@gnu.org; Wed, 21 Feb 2024 15:10:40 -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 1rcsvP-0005oW-KQ for guix-patches@gnu.org; Wed, 21 Feb 2024 15:10:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rcsvl-0005EE-UZ for guix-patches@gnu.org; Wed, 21 Feb 2024 15:11:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68052] [PATCH v3 1/4] gnu: python-poppler-qt5: Update to 21.3.0. References: In-Reply-To: Resent-From: rimarko@libero.it Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Feb 2024 20:11: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: moreinfo patch To: 68052@debbugs.gnu.org Cc: Marco Rimoldi Received: via spool by 68052-submit@debbugs.gnu.org id=B68052.170854621619918 (code B ref 68052); Wed, 21 Feb 2024 20:11:01 +0000 Received: (at 68052) by debbugs.gnu.org; 21 Feb 2024 20:10:16 +0000 Received: from localhost ([127.0.0.1]:38395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcsv0-0005B0-4X for submit@debbugs.gnu.org; Wed, 21 Feb 2024 15:10:16 -0500 Received: from smtp-32.italiaonline.it ([213.209.10.32]:57532 helo=libero.it) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcsJS-0003Ac-P4 for 68052@debbugs.gnu.org; Wed, 21 Feb 2024 14:31:30 -0500 Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA id csIsrmVVeXR0qcsIyr0fNw; Wed, 21 Feb 2024 20:30:57 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1708543857; bh=W52fDe6p2IIgSfNOcOMHYbyzr0iE6cTHegriQZODkO4=; h=From; b=WNXeu3mAPoBv5EDPeCvRu8ki0g0rQjzMEFgMGb0TeKCvGUIAeOw7hUkQg+o/kvvxE 1dvR8o9kOy3jH4YKvb8dgAUwZd6LxThM/KPdrq9P300QVlzLI6GDFBIjj0AXNq3/h8 M/3uDwzo+hvlylLCafLFk/7i0SFdSoAMgZpSeyNfO65VF44+5yh+d7QKavugqVrbqE qkCHRy9tNuvnG9eKQ+FB4ECvnTXDpIYe/RgjQ2lrARAvJ0THR3HCQ6LdnR2/+NaU2L EdG9iCs0dSQDVvCPoNgFT36a/aTW7iUdva6R7AmW0RLCmVQZpnUmP/7eIl9qZ8YfMp L17ce+brhSgpA== X-CNFS-Analysis: v=2.4 cv=Rc4zCEtv c=1 sm=1 tr=0 ts=65d64f71 cx=a_exe a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=NEAV23lmAAAA:8 a=CckQENj0AAAA:8 a=8AHkEIZyAAAA:8 a=Mx0scFzx4O3nQM9Q7SsA:9 a=-XWihg8NfbdYC9mmq4w4:22 Date: Wed, 21 Feb 2024 20:30:32 +0100 Message-ID: <9b3717fdff5c1a5f20ae57b99f365775790b22c9.1708543835.git.rimarko@libero.it> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4xfBbnsC/PKa8GaeQiRQ/85KO7qpxs09Web10ZAP40hCAaJlD2YOlEBsIOG+ATIJ3SWJsraWbR9e9BnknbQWkmfWZOTSRWMFY1eKurOpBvmO9Vwk9nDo9R MfJlz7WYmnz5+TFaKWZ0CXKuNm0egrlyiEdSm83UT9e5FTtNMgE8PvxYjHlouZE4VCDHaM8dnEFZ4Ky6z0IPWZisMPEC3vo9T3A= 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: rimarko@libero.it 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 From: Marco Rimoldi * gnu/packages/pdf.scm (python-poppler-qt5): Update to 21.3.0. [build-system]: Change to pyproject. [inputs]: Change SIP to current version variant. * gnu/packages/patches/python-poppler-qt5-fix-build.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register said patch. Change-Id: I30d6e2a3180505091d8072ed452211b0bb3a0178 --- gnu/local.mk | 1 - .../python-poppler-qt5-fix-build.patch | 116 ------------------ gnu/packages/pdf.scm | 50 +++----- 3 files changed, 18 insertions(+), 149 deletions(-) delete mode 100644 gnu/packages/patches/python-poppler-qt5-fix-build.patch base-commit: fdbf4192f5eaa7fdb5e6e2e98ada0726c8104824 diff --git a/gnu/local.mk b/gnu/local.mk index c08b27f94d..631addcb29 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1800,7 +1800,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-feedparser-missing-import.patch \ %D%/packages/patches/python-louvain-fix-test.patch \ %D%/packages/patches/python-random2-getrandbits-test.patch \ - %D%/packages/patches/python-poppler-qt5-fix-build.patch \ %D%/packages/patches/python-pyreadstat-link-libiconv.patch \ %D%/packages/patches/python-pyls-black-41.patch \ %D%/packages/patches/python-pypdf-annotate-tests-appropriately.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; */ diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 0d796f65bb..9076407740 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -431,40 +431,26 @@ (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) + (origin + (method url-fetch) + (uri (pypi-uri "python-poppler-qt5" version)) + (sha256 + (base32 "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)))))) - (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") + `(;; The sipbuild.api 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 + #:tests? #f)) + (native-inputs (list pkg-config)) + (inputs (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 Wed Feb 21 19:30:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Rimoldi X-Patchwork-Id: 60877 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 0433E27BBE2; Wed, 21 Feb 2024 19:32: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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 4491427BBE9 for ; Wed, 21 Feb 2024 19:32:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcsJp-0005dR-Ec; Wed, 21 Feb 2024 14:31:49 -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 1rcsJg-0005cf-BJ for guix-patches@gnu.org; Wed, 21 Feb 2024 14:31:40 -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 1rcsJg-0007Ch-2W for guix-patches@gnu.org; Wed, 21 Feb 2024 14:31:40 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rcsK2-0003Cj-7d for guix-patches@gnu.org; Wed, 21 Feb 2024 14:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68052] [PATCH v3 2/4] gnu: python-pyportmidi: Update to first working git revision since project restarted development, fixing build. Resent-From: rimarko@libero.it Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Feb 2024 19:32: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: moreinfo patch To: 68052@debbugs.gnu.org Cc: Marco Rimoldi Received: via spool by 68052-submit@debbugs.gnu.org id=B68052.170854389812251 (code B ref 68052); Wed, 21 Feb 2024 19:32:02 +0000 Received: (at 68052) by debbugs.gnu.org; 21 Feb 2024 19:31:38 +0000 Received: from localhost ([127.0.0.1]:35818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcsJe-0003BW-0S for submit@debbugs.gnu.org; Wed, 21 Feb 2024 14:31:38 -0500 Received: from smtp-32.italiaonline.it ([213.209.10.32]:44262 helo=libero.it) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcsJU-0003Ai-H4 for 68052@debbugs.gnu.org; Wed, 21 Feb 2024 14:31:32 -0500 Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA id csIsrmVVeXR0qcsJ2r0fOk; Wed, 21 Feb 2024 20:31:00 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1708543860; bh=YdFKf3//qRoRWNU9QZ2SGDU07lJkroLWv37elEMQdLQ=; h=From; b=vSzTSCzFljrWrtvcCfWpIb7yTG1iHUrLqyOqbCabbeWmNZxSbjtkSZhio6xIOzWN6 Cd9OIi30OplE/lFIsOTVVAzcL98X8NO4xAVPIWNy4hwS1bM8uYZ+FXakxazfHwh/xH /VPiX3O+bgbASsTkwHGfSmTpqSvrCZr9sV3vb+08Pvr8+UkA5IdYBEStD6YYLFBjB2 J/+Gi67d2+qUgy4j0p+ETMjXlWag/NVkEbLRhsGMa8BVLTlZr+yJtZnFp+4D2SdUCS K7rnkMqJmTxjgTi+KhevMPAA52lARLiFA1tm7tV2ScfcvWE/P9HayebU3EKglC+IGz nJWUEwZPZ6rtQ== X-CNFS-Analysis: v=2.4 cv=Rc4zCEtv c=1 sm=1 tr=0 ts=65d64f74 cx=a_exe a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=FP58Ms26AAAA:8 a=NEAV23lmAAAA:8 a=chmFKnp8fg3vtchoswQA:9 Date: Wed, 21 Feb 2024 20:30:33 +0100 Message-ID: <806023818f7d264173f4de6fcee448a9b48572fe.1708543835.git.rimarko@libero.it> X-Mailer: git-send-email 2.41.0 In-Reply-To: <9b3717fdff5c1a5f20ae57b99f365775790b22c9.1708543835.git.rimarko@libero.it> References: <9b3717fdff5c1a5f20ae57b99f365775790b22c9.1708543835.git.rimarko@libero.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfN4LleTMXBnpvJV/HczjVY0bFXbaLyyTBMschoj85/RPPUEN5jjzJWKtIa6WiSc1B+SacBsPHXKNF/ke7Lj18dKt+BHz6HDECj6F5384jMIElDUe8KZk svyd0y/NY+GG4RHMpdKKj+k5YObbGClHI8p25BPJZF+WEFuBSjH6rNee8zZSuJNPnOBkus7siA7sjpQ2DIznDHQWkGvXYrbwDa0= 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: rimarko@libero.it 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 From: Marco Rimoldi When the PortMidi project moved to GitHub in 2021, changing version numbering scheme, the Python bindings were moved to a separate repository and marked as needing a new maintainer. The chosen revision, dated June 2023, is the first to allow the package to build successfully in the temporary lack of an official new release. * gnu/packages/music.scm (python-pyportmidi): Source moved, fix build. [version]: Change to new scheme, jumping from 217 to 0.0.7. [source]: Change origin from Sourceforge to GitHub. 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 6b218376b7..8926f93ac8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3034,36 +3034,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") + (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 Wed Feb 21 19:30:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Rimoldi X-Patchwork-Id: 60878 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 CD51727BBE9; Wed, 21 Feb 2024 19:32:58 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 C123D27BBE2 for ; Wed, 21 Feb 2024 19:32:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcsKf-0005rP-NU; Wed, 21 Feb 2024 14:32:41 -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 1rcsKe-0005rC-28 for guix-patches@gnu.org; Wed, 21 Feb 2024 14:32:40 -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 1rcsKd-0007K1-Nw for guix-patches@gnu.org; Wed, 21 Feb 2024 14:32:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rcsL0-0003FM-5N for guix-patches@gnu.org; Wed, 21 Feb 2024 14:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68052] [PATCH v3 3/4] gnu: portmidi: Add variant portmidi-2 updated to release 2.0.4. Resent-From: rimarko@libero.it Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Feb 2024 19:33: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: moreinfo patch To: 68052@debbugs.gnu.org Cc: Marco Rimoldi Received: via spool by 68052-submit@debbugs.gnu.org id=B68052.170854394712401 (code B ref 68052); Wed, 21 Feb 2024 19:33:02 +0000 Received: (at 68052) by debbugs.gnu.org; 21 Feb 2024 19:32:27 +0000 Received: from localhost ([127.0.0.1]:35859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcsKR-0003Dw-0u for submit@debbugs.gnu.org; Wed, 21 Feb 2024 14:32:27 -0500 Received: from smtp-32.italiaonline.it ([213.209.10.32]:57532 helo=libero.it) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcsKO-0003Ac-Qa for 68052@debbugs.gnu.org; Wed, 21 Feb 2024 14:32:25 -0500 Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA id csIsrmVVeXR0qcsJ4r0fPZ; Wed, 21 Feb 2024 20:31:02 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1708543862; bh=QT1zfwMa2vQ3ckD2SMHGgkvQtxYjv0jSPWmICtT9Tb8=; h=From; b=og1EI6H1JvYnDipLfYSL4+Q6F3fWLXIs7EJUI1Z8j+80LyzQ5UtiB9ECfOnaGGm33 Aodwr8xFIFfrnHOLn3tFwfM0flWNHXaUf+tz+jfu5ObnX3R0vPXQPfjADfgiEAFemY cOWfnIb7gp7Y9owE2GPLPwVJm6tBNBUiWfMIbP4qZLZFjwt99MJrpKrfj+5TiLrxHJ Fr+TZGeNnHimURDfV/guMhb6TIDucelXjbxRsgZD6DhwwoEQ08O5ksjcLjZ6MEWID5 zWnIwYM3LJq5kcUhyagZ6Bsv9ykYFeA2r/buAikP6YpkCFtv+D5+qzfvL63ycUaR/6 ktgnpRs+tAi7A== X-CNFS-Analysis: v=2.4 cv=Rc4zCEtv c=1 sm=1 tr=0 ts=65d64f76 cx=a_exe a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=NEAV23lmAAAA:8 a=Oufrb8-UtVIp7YMsv1gA:9 Date: Wed, 21 Feb 2024 20:30:34 +0100 Message-ID: <4de47074f515c65252d49116ee5507b98ae6a095.1708543835.git.rimarko@libero.it> X-Mailer: git-send-email 2.41.0 In-Reply-To: <9b3717fdff5c1a5f20ae57b99f365775790b22c9.1708543835.git.rimarko@libero.it> References: <9b3717fdff5c1a5f20ae57b99f365775790b22c9.1708543835.git.rimarko@libero.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfH84JuCh8IfeQjPw7PAJIGx3V0g0zIg75wmPBpbBtJ9jiVQ+synrNufbZX5yufzHrKmnqF91p4SzEuEo+ldJ5oFdgGS2vJS9VNboNa2b6kg41Paf9Ztg VmCWRBk9p/Ab4jaVsDh1kcNeL1joLSZ4kwyTKPtIVVRnd7mcS4uVkWRe+ElEK3VV085Z3tr2+X+upU+cGktbSdgF52Xrg/s3Kps= 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: rimarko@libero.it 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 From: Marco Rimoldi 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. * gnu/packages/music.scm (portmidi): Add variant portmidi-2. [version]: Change to new scheme, jumping from 217 to 2.0.4. [source]: Change origin from Sourceforge to GitHub. * gnu/packages/music.scm (python-pyportmidi) [inputs]: Change portmidi to portmidi-2. * gnu/packages/music.scm (frescobaldi) [inputs]: Change portmidi to portmidi-2. 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 8926f93ac8..a0be16a44e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3033,6 +3033,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 git-fetch) + (uri (git-reference + (url "https://github.com/PortMidi/portmidi") + (commit "b808babecdc5d05205467dab5c1006c5ac0fdfd4"))) + (sha256 + (base32 "05a3dfpgbpcg08p8a3acjrrd1qy5hvvray2kz2asygy1vf3mx85s")) + (file-name (git-file-name name version)))) + (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")) @@ -3049,7 +3082,7 @@ (define-public python-pyportmidi (base32 "1jvp9na8d1hw46w9ybhkimbavfb3ysw7hp30cbk6dj40k5y5vgvz")) (file-name (git-file-name name version)))) (build-system python-build-system) - (inputs (list portmidi alsa-lib)) + (inputs (list portmidi-2 alsa-lib)) (native-inputs (list python-cython)) (home-page "https://github.com/PortMidi") (synopsis "Python bindings to PortMidi") @@ -3084,7 +3117,7 @@ (define-public frescobaldi (inputs (list lilypond poppler - portmidi + portmidi-2 python-ly python-poppler-qt5 python-pyportmidi From patchwork Wed Feb 21 19:30:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Rimoldi X-Patchwork-Id: 60876 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 5BA6927BBE9; Wed, 21 Feb 2024 19:32:14 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 BB6A527BBE2 for ; Wed, 21 Feb 2024 19:32:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcsJq-0005dW-Rn; Wed, 21 Feb 2024 14:31:50 -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 1rcsJg-0005co-LQ for guix-patches@gnu.org; Wed, 21 Feb 2024 14:31:47 -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 1rcsJg-0007D8-BQ for guix-patches@gnu.org; Wed, 21 Feb 2024 14:31:40 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rcsK2-0003Cr-Ob for guix-patches@gnu.org; Wed, 21 Feb 2024 14:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68052] [PATCH v3 4/4] gnu: frescobaldi: Make it display icons with qtsvg-5. Resent-From: rimarko@libero.it Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Feb 2024 19:32: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: moreinfo patch To: 68052@debbugs.gnu.org Cc: Marco Rimoldi Received: via spool by 68052-submit@debbugs.gnu.org id=B68052.170854390212267 (code B ref 68052); Wed, 21 Feb 2024 19:32:02 +0000 Received: (at 68052) by debbugs.gnu.org; 21 Feb 2024 19:31:42 +0000 Received: from localhost ([127.0.0.1]:35820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcsJe-0003BY-Hg for submit@debbugs.gnu.org; Wed, 21 Feb 2024 14:31:42 -0500 Received: from smtp-32.italiaonline.it ([213.209.10.32]:58688 helo=libero.it) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcsJX-0003At-Tr for 68052@debbugs.gnu.org; Wed, 21 Feb 2024 14:31:32 -0500 Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA id csIsrmVVeXR0qcsJ5r0fPl; Wed, 21 Feb 2024 20:31:03 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1708543863; bh=+f951j84mks6rjKUaSrOdXoQ7vpQfGOdUZO+Yuy6sSo=; h=From; b=CK9akucJzvl9VfJMeHc9lyvQZ4UiTMbyxzJ0d7cIvz/PvbWG2fElXhIDlEEx2S+Cy zgmTmI9Y+LlXSq5yNK8qDJR1FYBc63bWtRzqmziVib1IZXMdfiGFMvwhW7HjpakMMO hjuncrWBw3zeBdG7SSh72nMdT3cpTTwi17/QRpqNfXiYX30disO1e7rklBl+IDFmal 9SHx1x+Efor5pi5UfeI+0OgGcUsk0oa/lQhUiMO90kWOs8F41Ksm9/jFK0PZ20IZzj /ijVCM1Ty/4rriPbalrZVGDhQRqBruoHrkShBjBqtifYJBE4Z1+ttDFcoMDFvJYsz2 GdmoKY8Ozxmww== X-CNFS-Analysis: v=2.4 cv=Rc4zCEtv c=1 sm=1 tr=0 ts=65d64f77 cx=a_exe a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=NEAV23lmAAAA:8 a=DXx6YPyZAAAA:8 a=uevgM3sCq-TRXfd_OkEA:9 a=JkZe2gLXF4N2C6gDVeOo:22 Date: Wed, 21 Feb 2024 20:30:35 +0100 Message-ID: <69abfc9674f76ff26b43b5a2e75ab0f721fa3b61.1708543835.git.rimarko@libero.it> X-Mailer: git-send-email 2.41.0 In-Reply-To: <9b3717fdff5c1a5f20ae57b99f365775790b22c9.1708543835.git.rimarko@libero.it> References: <9b3717fdff5c1a5f20ae57b99f365775790b22c9.1708543835.git.rimarko@libero.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfCksnVuppfmTp2iPZWLFirixS2f5YrAwKYJxSP6JqfNRAnw20lxSNGli6Mz2CUYjGe/nkDKUsKlJ9mtnF0ceZ0OM8eXPKwCKiHydYFfp4aiWLrXAxgir ICpztKUdzyhsNaTgzcIDWpPcNiv8paEsPoaiiSDhpjRFbuKl2GA7u3GDNeu7HzyMtel7ChBP39tC6/cFW6j6jJO2AwcYsBNmc84= 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: rimarko@libero.it 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 From: Marco Rimoldi * gnu/packages/music.scm (frescobaldi) [origin] Updated to avoid automatic redirect. [arguments] Add 'wrap-executable to export QT_PLUGIN_PATH. [inputs] Add qtsvg-5, bash-minimal. Change-Id: I55b3c56d41bd60e4ba4c938109ff41631e211ad2 --- gnu/packages/music.scm | 47 ++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a0be16a44e..63d545e68b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3098,32 +3098,39 @@ (define-public frescobaldi (origin (method url-fetch) (uri (string-append - "https://github.com/wbsoft/frescobaldi/releases/download/v" + "https://github.com/frescobaldi/frescobaldi/releases/download/v" version "/frescobaldi-" version ".tar.gz")) (sha256 (base32 "1n60gfnf6x0l1bac088g9adzx0lskbl9knd4y1ynr3y0zcs0kfcz")))) (build-system python-build-system) (arguments (list - #:tests? #f ;no tests included - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'generate-translations - (lambda _ - (invoke "make" "-C" "i18n"))) - (add-before 'build 'generate-metadata - (lambda _ - (invoke "make" "-C" "linux")))))) - (inputs - (list lilypond - poppler - portmidi-2 - python-ly - python-poppler-qt5 - python-pyportmidi - python-pyqt - python-sip - qpageview)) + #:tests? #f ;no tests included + #:phases #~(modify-phases %standard-phases + (add-before 'build 'generate-translations + (lambda _ + (invoke "make" "-C" "i18n"))) + (add-before 'build 'generate-metadata + (lambda _ + (invoke "make" "-C" "linux"))) + (add-after 'install 'wrap-executable + (lambda _ + ;; Ensure that icons are found at runtime. + (wrap-program (string-append #$output + "/bin/frescobaldi") + `("QT_PLUGIN_PATH" prefix + ,(list (getenv "QT_PLUGIN_PATH"))))))))) + (inputs (list bash-minimal + lilypond + poppler + portmidi-2 + python-ly + python-poppler-qt5 + python-pyportmidi + python-pyqt + python-sip + qpageview + qtsvg-5)) (home-page "https://www.frescobaldi.org/") (synopsis "LilyPond sheet music text editor") (description