GNU bug report logs - #68052
[PATCH 0/4] Collected patches fixing builds of various Frescobaldi dependencies

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: guix-patches; Reported by: Marco Rimoldi <rimarko@HIDDEN>; Keywords: moreinfo patch; dated Tue, 26 Dec 2023 22:11:02 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 16 Jan 2024 17:43:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jan 16 12:43:11 2024
Received: from localhost ([127.0.0.1]:49691 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rPnSx-0004aI-Dw
	for submit <at> debbugs.gnu.org; Tue, 16 Jan 2024 12:43:11 -0500
Received: from smtp-32.italiaonline.it ([213.209.10.32]:47340 helo=libero.it)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <rimarko@HIDDEN>) id 1rPnSv-0004Ze-Bg
 for 68052 <at> debbugs.gnu.org; Tue, 16 Jan 2024 12:43:09 -0500
Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA
 id PnSarqOMwQSiOPnSor44gG; Tue, 16 Jan 2024 18:43:03 +0100
x-libjamoibt: 1601
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021;
 t=1705426983; bh=rnFaa4+Fk+Ux/17NJxk8y5pEpJpgr7lGV7kJnssEEk8=;
 h=From;
 b=rhPDe2sTbHBfK6z8H1Pcl4S/vw4ioQuV6wganFlE8II5azFTHF3fT6ruUZcc79v1C
 0HCS15j5lpyTY7EV+TCUQkI7KcY6hc7OhMR8shVXIFZ5hZePfhYTBVB0t+ve1r8ZNS
 0ku6vCURXt5rp6qmmWF3gkwm3yh+OHFBh6Af/DAjsrOdpVyLX4mR8evCzrJ80VxgSG
 w4n7dDSD0e41IgHhJ52eS6k2V5Z3RxMTlrcROBeYG8tp+X3Q8whPklV4pI4VOfizlx
 pSHNhWvNByH7Mf01FkAfMerG1jdWPpHQuikqzbr7qbOd0VqIv/YWrVhJx2cDaQMRGL
 SnWj+yspBdvEw==
X-CNFS-Analysis: v=2.4 cv=M6buKDws c=1 sm=1 tr=0 ts=65a6c027 cx=a_exe
 a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=NEAV23lmAAAA:8
 a=Oufrb8-UtVIp7YMsv1gA:9
From: rimarko@HIDDEN
To: 68052 <at> debbugs.gnu.org
Subject: [PATCH v2 3/3] gnu: portmidi: Add variant portmidi-2 updated to
 release 2.0.4.
Date: Tue, 16 Jan 2024 18:37:39 +0100
Message-ID: <4d0c56504b50394bf8eafda80fc91e8fa5b5ed2b.1705426659.git.rimarko@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1705426659.git.rimarko@HIDDEN>
References: <cover.1705426659.git.rimarko@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CMAE-Envelope: MS4xfC+JAeFQ71ceqrnW9f026C1au2EQgq3Y71PFH4K+C88yTFljwIkLN1J5kw41O9fmjVwJ61cx7ECsqy3t2yCfxVTGgytnv+ceTB26rISvR/SHjuKluxlz
 ujaoluXNNt09YsPnIY+i968KZuFyis1b9wt5Nfy9DxwySpeltFwq30bjgWSCgcv0yafIG4YIqrO4cZ7XeYqOkFC1puHOnZ4OVDo=
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
Cc: Marco Rimoldi <rimarko@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

From: Marco Rimoldi <rimarko@HIDDEN>

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 (python-pyportmidi) [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 28141c11a5..2d7d3fdd0a 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 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"))
@@ -3063,7 +3096,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")
@@ -3098,7 +3131,7 @@ (define-public frescobaldi
     (inputs
      (list lilypond
            poppler
-           portmidi
+           portmidi-2
            python-ly
            python-poppler-qt5
            python-pyportmidi
-- 
2.41.0





Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 16 Jan 2024 17:43:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jan 16 12:43:11 2024
Received: from localhost ([127.0.0.1]:49689 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rPnSw-0004aF-U9
	for submit <at> debbugs.gnu.org; Tue, 16 Jan 2024 12:43:11 -0500
Received: from smtp-32.italiaonline.it ([213.209.10.32]:34263 helo=libero.it)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <rimarko@HIDDEN>) id 1rPnSt-0004ZJ-IZ
 for 68052 <at> debbugs.gnu.org; Tue, 16 Jan 2024 12:43:08 -0500
Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA
 id PnSarqOMwQSiOPnSnr44fO; Tue, 16 Jan 2024 18:43:01 +0100
x-libjamoibt: 1601
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021;
 t=1705426981; bh=j2vCvKvFyQrSm95Dtlo6JUMx1s6GyYEJWHUfdY9Fnoo=;
 h=From;
 b=p+uRXHT7jF5IoxLJq0VQAIn1SAP53wh6ky4gkSDHeVWX8gp9/yqjy8oWiULILvMu0
 zivWWoeBctmPdgPxnMqV3MglRogu8EBOFkSUoAp/O4WqI39Wev4ZXkZtzYBn119qlM
 ZN8QIGU6uWENEBCEKUvLU0jF+F+pR4o2YRBpsQS6OuWdTVfYdqgnfyzsg5E55mLYpy
 zEs2AVu9OA6PwMyZIrG25ONpM9zNv7JDE8lJDvdA1yT2dY6qqzM4ixgGJztawpFbs3
 S0Evyf2bfd7iiouiDkUUNjRmfYoV6rvgUb80tJQy+RFWQ3bcHLp5mmbpyaEzGByYA6
 KPK/Cv0gvybMQ==
X-CNFS-Analysis: v=2.4 cv=M6buKDws c=1 sm=1 tr=0 ts=65a6c025 cx=a_exe
 a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=FP58Ms26AAAA:8
 a=NEAV23lmAAAA:8 a=chmFKnp8fg3vtchoswQA:9
From: rimarko@HIDDEN
To: 68052 <at> debbugs.gnu.org
Subject: [PATCH v2 2/3] gnu: python-pyportmidi: Update to first working git
 revision since project restarted development, fixing build.
Date: Tue, 16 Jan 2024 18:37:38 +0100
Message-ID: <3b8c6eb1dfcce617b2dc17f3ae8b66c0f23cfa0b.1705426659.git.rimarko@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1705426659.git.rimarko@HIDDEN>
References: <cover.1705426659.git.rimarko@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CMAE-Envelope: MS4xfETxYHqt1H8xTVFcrzFisGlLh7iSRGhmRrDEtnTzoHHfDnxRxPO0yizUTLWuweCfsiTa1jEpYc5t65M7UC6/FZ3InkwjYTZH2VPZQp5bLyb0krarKmHc
 UL8IgLYimmygtpivwjXu8B0QhzDMaLCtMjRp3C7kvtZf+gAZ2oVL/lXJeOWkUULMRqd2ErWmFp0QG+qqcP5aFdwuCYYxmTjyIJg=
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
Cc: Marco Rimoldi <rimarko@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

From: Marco Rimoldi <rimarko@HIDDEN>

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 77e952d383..28141c11a5 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")
+               (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
-- 
2.41.0





Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 16 Jan 2024 17:43:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jan 16 12:43:08 2024
Received: from localhost ([127.0.0.1]:49686 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rPnSu-0004a0-9g
	for submit <at> debbugs.gnu.org; Tue, 16 Jan 2024 12:43:08 -0500
Received: from smtp-32.italiaonline.it ([213.209.10.32]:48465 helo=libero.it)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <rimarko@HIDDEN>) id 1rPnSr-0004ZC-5Q
 for 68052 <at> debbugs.gnu.org; Tue, 16 Jan 2024 12:43:06 -0500
Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA
 id PnSarqOMwQSiOPnSkr44eD; Tue, 16 Jan 2024 18:42:58 +0100
x-libjamoibt: 1601
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021;
 t=1705426978; bh=5oVRH3/6UlKRC0WVcf3vEF/IpG01WEoX00g1OXYASQ8=;
 h=From;
 b=B5sslsnGyWKVa7OSBo/pSmtP8LkzGReO+gQNh5nEx0eOeB1+r0s998TRWnoSZCiIy
 OCqANbmVXdJF9yx6qt+WBLD5xr2rALIZHiGtmNfNwZhA9z/P7IH9FMRuCvnkNchxZi
 zhA8IiBPeykzWWW9lqyo8e4kPSXNPhYT/cDO3qJbTJAwC9kQy3TReKtFhJTrl2Zvmz
 BnjJ+xbZ12XQtoPm+8XzCzht9ayVG77BIzfU5+ve8RD5QNanLLLEa81D5pxGEbUz5M
 Io3yPG0oz0blayXrwVpUFotje3wj33KmbNI5yrNivZH6p22EJ1L52YWhY/ik7dU7Q7
 XLqVwSmEROQ6g==
X-CNFS-Analysis: v=2.4 cv=M6buKDws c=1 sm=1 tr=0 ts=65a6c022 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
From: rimarko@HIDDEN
To: 68052 <at> debbugs.gnu.org
Subject: [PATCH v2 1/3] gnu: python-poppler-qt5: Update to 21.3.0.
Date: Tue, 16 Jan 2024 18:37:37 +0100
Message-ID: <785256562197b2f1fdbd67ca21b0ee9e2464b611.1705426659.git.rimarko@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1705426659.git.rimarko@HIDDEN>
References: <cover.1705426659.git.rimarko@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CMAE-Envelope: MS4xfMcLBGeMLkhBAWYLHgjZda0hPor2kfuSiD1RKqXjCeaZMop1mh4X2x9fJ6T5k2773MfkOW2s0UWF7HYYMdL0jmP/8dGWwnm4UpKGFZ2BeBrexN7+yIEL
 SO6+ogqPKakQaebYkIQvf5FwV3MSeS2M8Y6Np7VED3SHFRiLF+gPf3FkqpQUeIYQncGuyhavL1CsqEFSAoyJk0dYBpuazK8U2yg=
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
Cc: Marco Rimoldi <rimarko@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

From: Marco Rimoldi <rimarko@HIDDEN>

* 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

diff --git a/gnu/local.mk b/gnu/local.mk
index d2e2843372..bd0d9b75ce 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1794,7 +1794,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-pypdf-annotate-tests-appropriately.patch	\
   %D%/packages/patches/python-pytorch2-system-libraries.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 <code@HIDDEN>
-Date: Thu, 4 Mar 2021 17:02:51 +0100
-Subject: [PATCH] map type QVector< QPair<TYPE, TYPE> > 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 <TYPE>
- };
- 
- 
-+/**
-+ * Convert QVector< QPair<TYPE, TYPE> >
-+ * from and to a Python list of a 2-item tuple
-+ */
-+
-+template<TYPE>
-+%MappedType QVector< QPair<TYPE, TYPE> >
-+{
-+%TypeHeaderCode
-+#include <qvector.h>
-+#include <qpair.h>
-+%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<TYPE, TYPE>* p = new QPair<TYPE, TYPE>(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<TYPE, TYPE>");
-+
-+  // 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<TYPE, TYPE> > *qv = new QVector< QPair<TYPE, TYPE> >;
-+
-+  for (int i = 0; i < PySequence_Size(sipPy); ++i)
-+  {
-+    int state;
-+    QPair<TYPE, TYPE> * p = reinterpret_cast< QPair<TYPE, TYPE> * >(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 e07f0441e2..c7a08cafa3 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.")
-- 
2.41.0





Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 16 Jan 2024 17:43:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jan 16 12:43:05 2024
Received: from localhost ([127.0.0.1]:49682 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rPnSr-0004Zg-1K
	for submit <at> debbugs.gnu.org; Tue, 16 Jan 2024 12:43:05 -0500
Received: from smtp-32.italiaonline.it ([213.209.10.32]:45591 helo=libero.it)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <rimarko@HIDDEN>) id 1rPnSo-0004Z7-LB
 for 68052 <at> debbugs.gnu.org; Tue, 16 Jan 2024 12:43:03 -0500
Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA
 id PnSarqOMwQSiOPnShr44cZ; Tue, 16 Jan 2024 18:42:55 +0100
x-libjamoibt: 1601
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021;
 t=1705426975; bh=0sSUOaagQvTE6tbAr9fwBdNy9SG62SQlY4n8ySUsglY=;
 h=From;
 b=IlPGGArts1g5R3tuQZqg6aEX4leXsZSmeMiG9SfHU5wmhcRWeIQMx9IYJpDsRbrra
 ubJAOLgp0LVlzaZQ1cmqHamldVnQ4gGFxvs7Oix994EtNxBOSXruNq/m+jFcl8+p3P
 vmv8IoUh1i3vh8On3SkJvcBmuIbIABax0FXdNeJnZ+mtA1sZO4Zf3OqfRb7e4WqOtA
 edB8VmASuwq2twEUpPpdgV6rYsTPPrsA65B+ciaFAvBODr5jzooCNL6J8KjVz58ZBQ
 Wum1MUzBTAra7u4rTjSN73KfjuDjKjLdCuq08bZbgkR0uG1XnDAERjQaWJG2KNbHeg
 ujbaA2PGgwqeQ==
X-CNFS-Analysis: v=2.4 cv=M6buKDws c=1 sm=1 tr=0 ts=65a6c01f cx=a_exe
 a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17
 a=GUhVJnVIfepbMOZK4jgA:9
From: rimarko@HIDDEN
To: 68052 <at> debbugs.gnu.org
Subject: [PATCH v2 0/3] Collected patches fixing builds of various Frescobaldi
 dependencies
Date: Tue, 16 Jan 2024 18:37:36 +0100
Message-ID: <cover.1705426659.git.rimarko@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CMAE-Envelope: MS4xfA4o9WvZpxjY1g8Wkl2VNEJVGIaIP6gluDUW/RM2UlNKIkXWjh7/5SJDz6I3DVwhbqbmFbMB7g8ZKMrOGflElWg9ywBnsmvhBI++z6d9az30tKMHQCxw
 qNzxvrn7e635sFM21e+psdbXUI7aOOIdeJJ8bAQA2xc0PHn1OJpAopaG9n8gR6ShKkbhKWLAxAShxy078e4KrCE0iIaHm6mK/A4=
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
Cc: Marco Rimoldi <rimarko@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

From: Marco Rimoldi <rimarko@HIDDEN>

Just a correction to the commit description re: python-poppler-qt5. The python-sip-4 package was replaced with python-sip to allow build, not the other way around. 

Marco

Marco Rimoldi (3):
  gnu: python-poppler-qt5: Update to 21.3.0.
  gnu: python-pyportmidi: Update to first working git revision since
    project restarted development, fixing build.
  gnu: portmidi: Add variant portmidi-2 updated to release 2.0.4.

 gnu/local.mk                                  |   1 -
 gnu/packages/music.scm                        |  81 +++++++-----
 .../python-poppler-qt5-fix-build.patch        | 116 ------------------
 gnu/packages/pdf.scm                          |  50 +++-----
 4 files changed, 71 insertions(+), 177 deletions(-)
 delete mode 100644 gnu/packages/patches/python-poppler-qt5-fix-build.patch


base-commit: f6afaf58b0a0b04e5023141c8f56c204f9779e19
-- 
2.41.0





Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 16 Jan 2024 00:35:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jan 15 19:35:24 2024
Received: from localhost ([127.0.0.1]:47296 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rPXQK-0003cl-0J
	for submit <at> debbugs.gnu.org; Mon, 15 Jan 2024 19:35:24 -0500
Received: from smtp-32.italiaonline.it ([213.209.10.32]:48282 helo=libero.it)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <rimarko@HIDDEN>) id 1rPXQC-0003bs-JJ
 for 68052 <at> debbugs.gnu.org; Mon, 15 Jan 2024 19:35:18 -0500
Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA
 id PXPyrhnNiQSiOPXQ6rz6Q5; Tue, 16 Jan 2024 01:35:10 +0100
x-libjamoibt: 1601
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021;
 t=1705365310; bh=HDZoBcmdj7v5vl3HwMy0XNKt5TE2FRHNoHclabuimq4=;
 h=From;
 b=OAZDBB7ny2TnIcFHSWdmBQ8nj/OcZMYqk57UDKrVKIVynybekdRx6eGbUTgu5HElO
 Oq5WEMCjXru/993Ar65Lw0B5iSTVc2qkSA/cExhxqGm1aYRHthqXfC8IYa+pLhr6kU
 qNuyxGNAs4gnJF5VrG/4FnYH2wTtCh8LxmpT5CbZdhy2kgViTEWqxn5AS2uexKeaXm
 F+nNLYM4tEjXmr7WXYa30wp3mZdF/Ujx/KNKGlpGjpnOXNtxDC1DvkAWWLS1Ro1W4u
 OatBfFYmnK5PH3s1RiZ78e0zKJMStyctasgQat/2H8/PmAW0xRlMe2n6XF16aXLE0d
 p3PPmR1cnK/UA==
X-CNFS-Analysis: v=2.4 cv=M6buKDws c=1 sm=1 tr=0 ts=65a5cf3e 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
From: rimarko@HIDDEN
To: 68052 <at> debbugs.gnu.org
Subject: [PATCH v1 1/3] gnu: python-poppler-qt5: Update to 21.3.0.
Date: Tue, 16 Jan 2024 01:34:12 +0100
Message-ID: <217a69a61e47a86201ade68e30e463075f879e1c.1705365254.git.rimarko@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1705365254.git.rimarko@HIDDEN>
References: <cover.1705365254.git.rimarko@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CMAE-Envelope: MS4xfBBRpZUE4Sapppfi/8xNoQOjk7p+Q03zY5pDmrm5lv5ch0Esr7MrOWLU8EJ+3+e+RZddSbSIDh12yZWpHNTyU7b8gLbzdQUzbY1cPjHZ/VyCbRQ/YiXR
 vbPv7hCh91W4hqAL8K9kq9BirGpDJ78mMZIpEUSXZAeo6+MHbRtAfanxFCrieowwCuuM+8lzFNbfIRDXhE1nD2ooDN/LVxZZOEo=
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
Cc: Marco Rimoldi <rimarko@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

From: Marco Rimoldi <rimarko@HIDDEN>

* gnu/packages/pdf.scm (python-poppler-qt5): Update to 21.3.0.
[build-system]: Change to pyproject.
[inputs]: Change sip to sip-4.
* 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

diff --git a/gnu/local.mk b/gnu/local.mk
index d2e2843372..bd0d9b75ce 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1794,7 +1794,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-pypdf-annotate-tests-appropriately.patch	\
   %D%/packages/patches/python-pytorch2-system-libraries.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 <code@HIDDEN>
-Date: Thu, 4 Mar 2021 17:02:51 +0100
-Subject: [PATCH] map type QVector< QPair<TYPE, TYPE> > 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 <TYPE>
- };
- 
- 
-+/**
-+ * Convert QVector< QPair<TYPE, TYPE> >
-+ * from and to a Python list of a 2-item tuple
-+ */
-+
-+template<TYPE>
-+%MappedType QVector< QPair<TYPE, TYPE> >
-+{
-+%TypeHeaderCode
-+#include <qvector.h>
-+#include <qpair.h>
-+%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<TYPE, TYPE>* p = new QPair<TYPE, TYPE>(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<TYPE, TYPE>");
-+
-+  // 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<TYPE, TYPE> > *qv = new QVector< QPair<TYPE, TYPE> >;
-+
-+  for (int i = 0; i < PySequence_Size(sipPy); ++i)
-+  {
-+    int state;
-+    QPair<TYPE, TYPE> * p = reinterpret_cast< QPair<TYPE, TYPE> * >(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 e07f0441e2..c7a08cafa3 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.")
-- 
2.41.0





Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 16 Jan 2024 00:35:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jan 15 19:35:19 2024
Received: from localhost ([127.0.0.1]:47294 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rPXQE-0003cU-K6
	for submit <at> debbugs.gnu.org; Mon, 15 Jan 2024 19:35:18 -0500
Received: from smtp-32.italiaonline.it ([213.209.10.32]:39064 helo=libero.it)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <rimarko@HIDDEN>) id 1rPXQB-0003bg-W3
 for 68052 <at> debbugs.gnu.org; Mon, 15 Jan 2024 19:35:16 -0500
Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA
 id PXPyrhnNiQSiOPXQBrz6QY; Tue, 16 Jan 2024 01:35:15 +0100
x-libjamoibt: 1601
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021;
 t=1705365315; bh=rnFaa4+Fk+Ux/17NJxk8y5pEpJpgr7lGV7kJnssEEk8=;
 h=From;
 b=ai8j2sOix/mb8wz1VNQWdFJbbsWpjkR2Nl5CGo+tUAVI7IKT7wTx+Qy/NgSyxwgww
 xf+5vFjsgA50Sjo7ypMrZkOJ6bsAQ0B2uPfIEVNojoBPbkTsbENSRi4y5EsJRoTkHD
 ezOWRkqJqRTOJUz13GhgoAJ4i+/hZqQrQRpyTrom8Yr712P73m1giXwWHLcFbeiLIs
 lTd0EX9NxjAh0EPENeQ6g/mTO2d+lzmNAmcPTxOGv/yvT05FKBjkFK4Kv0Ce2rHDFO
 7muZLt6/EbxQniDqxB4V8IHlKxaozN+LqhfCENByPNC47kl5/+/xavOM37uPqSVC35
 qOjSyqjVy026A==
X-CNFS-Analysis: v=2.4 cv=M6buKDws c=1 sm=1 tr=0 ts=65a5cf43 cx=a_exe
 a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=NEAV23lmAAAA:8
 a=Oufrb8-UtVIp7YMsv1gA:9
From: rimarko@HIDDEN
To: 68052 <at> debbugs.gnu.org
Subject: [PATCH v1 3/3] gnu: portmidi: Add variant portmidi-2 updated to
 release 2.0.4.
Date: Tue, 16 Jan 2024 01:34:14 +0100
Message-ID: <3f5ce187fa230d83f3b79cc9bf3f091f122b1366.1705365254.git.rimarko@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1705365254.git.rimarko@HIDDEN>
References: <cover.1705365254.git.rimarko@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CMAE-Envelope: MS4xfMbJogMV+X1ad8MjmjT3kzg+xdICg55U5gT+YN4RSWwxG4CXGC6ZQM0df/tV40bxQrnyjBlV+x4es6t7L3H8kkILtawpEzYtSyYcf75pnbN4BVtpxxKd
 E6IULGKijnwH8N+o3DSBTrNiemTN5+NAkH61R/CdkIuqNXJ7L3J3+HA0Np/FhSTA0VDhIGtY9BbanrCGzkixfG1j3hEx6PojKP0=
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
Cc: Marco Rimoldi <rimarko@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

From: Marco Rimoldi <rimarko@HIDDEN>

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 (python-pyportmidi) [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 28141c11a5..2d7d3fdd0a 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 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"))
@@ -3063,7 +3096,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")
@@ -3098,7 +3131,7 @@ (define-public frescobaldi
     (inputs
      (list lilypond
            poppler
-           portmidi
+           portmidi-2
            python-ly
            python-poppler-qt5
            python-pyportmidi
-- 
2.41.0





Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 16 Jan 2024 00:35:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jan 15 19:35:18 2024
Received: from localhost ([127.0.0.1]:47292 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rPXQE-0003cN-4v
	for submit <at> debbugs.gnu.org; Mon, 15 Jan 2024 19:35:18 -0500
Received: from smtp-32.italiaonline.it ([213.209.10.32]:39064 helo=libero.it)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <rimarko@HIDDEN>) id 1rPXQ9-0003bg-QG
 for 68052 <at> debbugs.gnu.org; Mon, 15 Jan 2024 19:35:15 -0500
Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA
 id PXPyrhnNiQSiOPXQ8rz6QL; Tue, 16 Jan 2024 01:35:13 +0100
x-libjamoibt: 1601
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021;
 t=1705365313; bh=j2vCvKvFyQrSm95Dtlo6JUMx1s6GyYEJWHUfdY9Fnoo=;
 h=From;
 b=0URYy/qtjMI8LYZBf0G65ABKtgZX9qpukgUpWvoPqUD+TgPTCOB7KKM8NBI+HJXz8
 gOQ7Ps0bs4kGo5/Upa5BwbrvOrHugvGlwnN+PbVvD0WAjyLieF3K/3/kacUx48WiN5
 ArWq5z2PhdizZXTdIj67jqX15nEHyO+U2rwrA/ggEJMpftmCRX+7g2ATSSvH0Vsm/v
 fn79+OLMIKPlSGjT3CP4z8l5DHs26aQxzW8ozhB1bMNUapW6um4ZlkiN+UPMnQSpqV
 t78v+1sfyZMLljsdG9xu5ADu9eWYsmJO11fF/22mdioAesLUyLBln0VVYccgaKjQhF
 zyc/Jt4mg19Eg==
X-CNFS-Analysis: v=2.4 cv=M6buKDws c=1 sm=1 tr=0 ts=65a5cf41 cx=a_exe
 a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=FP58Ms26AAAA:8
 a=NEAV23lmAAAA:8 a=chmFKnp8fg3vtchoswQA:9
From: rimarko@HIDDEN
To: 68052 <at> debbugs.gnu.org
Subject: [PATCH v1 2/3] gnu: python-pyportmidi: Update to first working git
 revision since project restarted development, fixing build.
Date: Tue, 16 Jan 2024 01:34:13 +0100
Message-ID: <410a4779ff3db386147cc7b7761823d29d0c11cd.1705365254.git.rimarko@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1705365254.git.rimarko@HIDDEN>
References: <cover.1705365254.git.rimarko@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CMAE-Envelope: MS4xfJAe/vQPJ9G7ZK2NrOLkz2neSonFMYt112/701e4kiEPNa+SEN6AQcNHjbNPHUAw0ZtyliegmeZmJXWmx14MQUQmr3M2mftvwSkNDf1Ji3iZkPyjA8Qo
 ieGAWGo5uetqzQcA7MvV4aVfTScR6ynhbpZYiG2C98OPlfU1wpZl4i2U0/iQU/jFi9/+HuTZCVs0i1k6zBzz9i8Ij3nKI0jT/uY=
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
Cc: Marco Rimoldi <rimarko@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

From: Marco Rimoldi <rimarko@HIDDEN>

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 77e952d383..28141c11a5 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")
+               (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
-- 
2.41.0





Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 16 Jan 2024 00:35:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jan 15 19:35:15 2024
Received: from localhost ([127.0.0.1]:47288 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rPXQA-0003c2-QQ
	for submit <at> debbugs.gnu.org; Mon, 15 Jan 2024 19:35:15 -0500
Received: from smtp-32.italiaonline.it ([213.209.10.32]:39064 helo=libero.it)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <rimarko@HIDDEN>) id 1rPXQ6-0003bg-Bg
 for 68052 <at> debbugs.gnu.org; Mon, 15 Jan 2024 19:35:12 -0500
Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA
 id PXPyrhnNiQSiOPXPyrz6PG; Tue, 16 Jan 2024 01:35:02 +0100
x-libjamoibt: 1601
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021;
 t=1705365302; bh=gu8SzT3X1dTjM6Na96CL/o0mmijwZCd8KDyNVahQbwo=;
 h=From;
 b=jBGF1qHsIYN6G7QsQ//hJNGGAcJNjl18lH1KfVKfC1gE0OeNJpRiOL3vwieqSxGx0
 xy4kxf5uYnS5eumXa8nkkAxGQpojgqAbgYupWlNy1N7l0wVSc6x5vKrBWKQncaZZvX
 CbW9nvxtKWDtr4D4faV4+ZsdNWHU+8DPNeABlMD70SiCvAsJssf2hFC5OXwIiqObjE
 VaxHYOgcqk89p5BndLfuNwDo4S7AxJwGGYXj+OMsky3feHHDAZw5Jg6WONNTTBgOAf
 EcKkp7b5ISKIUXybBTVOZsLorUuTvvlAb6/ff06ByT6Vputltg+Czp+DO7Ft4gl9Si
 /hAkYHz718EVQ==
X-CNFS-Analysis: v=2.4 cv=M6buKDws c=1 sm=1 tr=0 ts=65a5cf36 cx=a_exe
 a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17
 a=yXuDXoyXD4XHWAqvbT0A:9
From: rimarko@HIDDEN
To: 68052 <at> debbugs.gnu.org
Subject: [PATCH v1 0/3] Collected patches fixing builds of various Frescobaldi
 dependencies
Date: Tue, 16 Jan 2024 01:34:11 +0100
Message-ID: <cover.1705365254.git.rimarko@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CMAE-Envelope: MS4xfBXiAkz78+/AnJpNtbUX9isRODdybQdNUVt3URSHy2Ic43qMWUGa7Cb7F/jJ4DFJ5JiSCigOVH6Q2YrrxDqG+uSuqavNAavmIWhypN5nZ7rfFBpWrprM
 iX2rsfjh/tD6CezmrVzDmgod+wlbXpTqdvb9Nae9xWeFdeNK8+TlTE591GRh8NbcUp0dWqlsPuLs/nG18QYHC2FHCkDp2S3EWpw=
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
Cc: Marco Rimoldi <rimarko@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

From: Marco Rimoldi <rimarko@HIDDEN>

I applied your suggestions as best as I could Maxim. Looking forward to refine these further if needed.

Thanks for your feedback!

Marco

Marco Rimoldi (3):
  gnu: python-poppler-qt5: Update to 21.3.0.
  gnu: python-pyportmidi: Update to first working git revision since
    project restarted development, fixing build.
  gnu: portmidi: Add variant portmidi-2 updated to release 2.0.4.

 gnu/local.mk                                  |   1 -
 gnu/packages/music.scm                        |  81 +++++++-----
 .../python-poppler-qt5-fix-build.patch        | 116 ------------------
 gnu/packages/pdf.scm                          |  50 +++-----
 4 files changed, 71 insertions(+), 177 deletions(-)
 delete mode 100644 gnu/packages/patches/python-poppler-qt5-fix-build.patch


base-commit: f6afaf58b0a0b04e5023141c8f56c204f9779e19
-- 
2.41.0





Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 4 Jan 2024 18:08:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 04 13:08:06 2024
Received: from localhost ([127.0.0.1]:55679 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rLS8U-0003dI-GY
	for submit <at> debbugs.gnu.org; Thu, 04 Jan 2024 13:08:06 -0500
Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]:54273)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1rLS8R-0003cl-An
 for 68052 <at> debbugs.gnu.org; Thu, 04 Jan 2024 13:08:04 -0500
Received: by mail-qt1-x835.google.com with SMTP id
 d75a77b69052e-427e59202ceso4127311cf.0
 for <68052 <at> debbugs.gnu.org>; Thu, 04 Jan 2024 10:07:59 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1704391673; x=1704996473; darn=debbugs.gnu.org;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=hfD7woilCmsR5+5lS8dFM+ZHfvCMn3uU9qfh5GaV/aI=;
 b=OHf2NNrFJ11XnMb/OiCZPnKepyiEkH5qy3DuFEqYSr5j9XRJog3f5Vhc12sB1gSUfz
 7uShy1ulCWrK9eB9YOaPEMKnD+UuxRKenjpJam5QG/4o2qHPJmA2QqdlxA7oGGmALOcr
 GAhoCUJEGm44Nr2XR2ss1Kl3yRskxFNIMko8FuWphopAinH1Zh/Za5LG0qytYwcWqAAP
 QrxMU65FtDxXylOUv0eQX6Qj22BDnFtwPxv5GZbiGK8VWmnQRuJG6lZR3YRsZfn1S4Fa
 M20nbKtRtvYCD9094P6mi3r3WtLO3z4qpTZN9T0bCE6lXzJPJ/7O61H/QdfX7pcz8v6e
 Ikew==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1704391673; x=1704996473;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=hfD7woilCmsR5+5lS8dFM+ZHfvCMn3uU9qfh5GaV/aI=;
 b=eS04lRrlz6hCafMzo2Q1ST6sPYlYPriC9w0lzdS65NjSHiL44beifs1PUr+Fv+0G5w
 FkyiqMIniCeos4KKSXODmVwXXYUejEqLgHw6SXyhIxmiAavdKESstxitsaWgkVyFJxgb
 /qN1Rkmt9t1d5laK+u9IFPnQt7eyR8AMkHHzWsOUbM6j5qjY3QMxisudP4aFkElBCZfk
 f5vkR0BnQ/Q9+qjRSGaSAxXkfTKYCQj/RXTXhpQPGxjoRvjIVYGm4k9E0sv7sDRe9Msu
 MZz7kdW+G7Bny4CnvshB+5UIDoLlc4bwRdvNDfdcy6N1ZScUoo7GEKQ5vjiSEbsJdwa6
 7ODw==
X-Gm-Message-State: AOJu0Yy0neVfAt7RPnRnP7t6PJuJfYtDsyxt/Xy4AF/TmaUu+9MTkYct
 SUgFk6LwaF4TbGn/+fn8D9cEZUOUyG+hNg==
X-Google-Smtp-Source: AGHT+IFMXZRQh19a6hQOvTfPoGFmPwhig8afRmMw26tv3XypocjZry2kUx+uCi2tE7pOs5Kn3YYetA==
X-Received: by 2002:ad4:5ec6:0:b0:67f:cf96:4749 with SMTP id
 jm6-20020ad45ec6000000b0067fcf964749mr1089026qvb.79.1704391673578; 
 Thu, 04 Jan 2024 10:07:53 -0800 (PST)
Received: from hurd (dsl-10-135-125.b2b2c.ca. [72.10.135.125])
 by smtp.gmail.com with ESMTPSA id
 hf8-20020a0562140e8800b0067f51698bacsm11930800qvb.119.2024.01.04.10.07.52
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 04 Jan 2024 10:07:53 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Marco Rimoldi <rimarko@HIDDEN>
Subject: Re: [bug#68052] [PATCH 4/4] gnu: portmidi: Add variant portmidi-2
 updated to release 2.0.4
In-Reply-To: <78e978968bbff5e9275bd1e75442eed18f15e8bb.1703627648.git.rimarko@HIDDEN>
 (Marco Rimoldi's message of "Tue, 26 Dec 2023 23:16:09 +0100")
References: <cover.1703627648.git.rimarko@HIDDEN>
 <78e978968bbff5e9275bd1e75442eed18f15e8bb.1703627648.git.rimarko@HIDDEN>
Date: Thu, 04 Jan 2024 13:07:52 -0500
Message-ID: <87edex0y6f.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
Cc: 68052 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello Marco,

Marco Rimoldi <rimarko@HIDDEN> writes:

> 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.

Thank you!

[...]

Here also, we'll want a GNU ChangeLog commit message, but otherwise,
LGTM.

Could you send a v2 taking care of my review comments, for this commit
and the earlier ones?

-- 
Thanks,
Maxim




Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 4 Jan 2024 18:06:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 04 13:06:33 2024
Received: from localhost ([127.0.0.1]:55675 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rLS6v-0003ai-Cx
	for submit <at> debbugs.gnu.org; Thu, 04 Jan 2024 13:06:33 -0500
Received: from mail-oi1-x22b.google.com ([2607:f8b0:4864:20::22b]:44489)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1rLS6f-0003aF-Vv
 for 68052 <at> debbugs.gnu.org; Thu, 04 Jan 2024 13:06:28 -0500
Received: by mail-oi1-x22b.google.com with SMTP id
 5614622812f47-3bbbc6bcc78so513820b6e.1
 for <68052 <at> debbugs.gnu.org>; Thu, 04 Jan 2024 10:06:10 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1704391564; x=1704996364; darn=debbugs.gnu.org;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=T/9JvgjPdY5DVNuQ3axojy4GrIfqe1pB/TQDM/raK8A=;
 b=hWaSqBYqFM48+iLi78LkDXbO/8SriUHEAHBRrO2kvrac59B0qDZQbCgP5lFYnBQT2C
 Vqdoz7debFEkwl+uv+j6NFogl8PfaILk67xBYh4PPYKy4TrTCSVpMkehkF9HcBxWlFj3
 uKz96yTdUfv8Rahk+ECw5nj+WoCZkeBo4PJQ2MHSPIQonWkDbt9TZ9+pwHkkvE/Gq96m
 e/lOsBPZlCGuzYg5KZZ9q/mlfXRTSo69WWkWBz/T6cofJZRFfx096sXXXK4K4+G6qQMB
 YTTQEDIE6USHMCgFBdHMqomsuSEEdkxrsnDz99OmoDCKj+gudm5v/uY3HfB4PxU3PQDI
 FMbg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1704391564; x=1704996364;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=T/9JvgjPdY5DVNuQ3axojy4GrIfqe1pB/TQDM/raK8A=;
 b=MgBRBIWB/PLVYmjxxaZDxzXU5+9lHwGth36PPU+ThtuNJHkT9rM8jDenw/u63zodu1
 M7VZFv7EWR0LtQ6jza65cqge4SJ9kbeKP1XlpU0r1GdclBfAtNK0nosWmbk4KV0Jb3ZI
 xVhYNu+STNtR5v4UQMpyFjNMBvfHNLEk5RMoQewQmyAysDiD/Dc4hQNVlpuQ8M4kcuSB
 0UQKruc3ZvnEsG0ScYjy4juWeVGp9Ig0h4wGvviQl3gh+f+nh+Hr6No38fc5eBzaduF2
 udiaBQJpgWXhgNX6G+aVqsR0CGxNafGahGXBTD+42QAAJkl2WF1kIX5qrqx9QNfRwluE
 CxwQ==
X-Gm-Message-State: AOJu0YzxCj5/VuPNqLlWburqcfxtw3yeWl+VEpEKYMVeRlZ5QSJS3S0N
 FdCMoW3FPvjljZ2mR282D6jKQEBcR0TpGg==
X-Google-Smtp-Source: AGHT+IFfE91S1vXe2nvjHjGVwqDsWpMGgJqiM/lLAMG5HasbPiIExZhVBRmyDKgHQKjRa0pPzAra/A==
X-Received: by 2002:a05:6808:2e98:b0:3bc:302c:bfe2 with SMTP id
 gt24-20020a0568082e9800b003bc302cbfe2mr1219679oib.111.1704391564031; 
 Thu, 04 Jan 2024 10:06:04 -0800 (PST)
Received: from hurd (dsl-10-135-125.b2b2c.ca. [72.10.135.125])
 by smtp.gmail.com with ESMTPSA id
 w3-20020a0562140b2300b0067f4507b64dsm11793838qvj.63.2024.01.04.10.06.03
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 04 Jan 2024 10:06:03 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Marco Rimoldi <rimarko@HIDDEN>
Subject: Re: [bug#68052] [PATCH 3/4] gnu: python-pyportmidi: Update to
 latest git revision, fixing build fail.
In-Reply-To: <f8e15b79edc966a07b01d8f6629fc2c5124fc31a.1703627648.git.rimarko@HIDDEN>
 (Marco Rimoldi's message of "Tue, 26 Dec 2023 23:15:54 +0100")
References: <cover.1703627648.git.rimarko@HIDDEN>
 <f8e15b79edc966a07b01d8f6629fc2c5124fc31a.1703627648.git.rimarko@HIDDEN>
Date: Thu, 04 Jan 2024 13:06:02 -0500
Message-ID: <87il490y9h.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
Cc: 68052 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi again,

Marco Rimoldi <rimarko@HIDDEN> writes:

[...]

> +  (let ((commit "d9e5ee00b208b09618fa0d4a5bbce3c9c077b386")
> +        (revision "0"))

Actually, why do we need this latest git version?  A explanatory comment
is needed in these case, as we normally ship stable/tagged releases.

-- 
Thanks,
Maxim




Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 4 Jan 2024 18:05:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 04 13:05:02 2024
Received: from localhost ([127.0.0.1]:55671 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rLS5V-0003YC-PB
	for submit <at> debbugs.gnu.org; Thu, 04 Jan 2024 13:05:02 -0500
Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]:48636)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1rLS5T-0003Xq-4n
 for 68052 <at> debbugs.gnu.org; Thu, 04 Jan 2024 13:05:00 -0500
Received: by mail-qk1-x72c.google.com with SMTP id
 af79cd13be357-7815fc8dd17so43661485a.1
 for <68052 <at> debbugs.gnu.org>; Thu, 04 Jan 2024 10:04:55 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1704391489; x=1704996289; darn=debbugs.gnu.org;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=gHQw/Kpe42hvx2/mB3PjbBJAHFCz34XuPdFOxCstWKk=;
 b=JvNnZodK+o9I7jmQbRMe/6gebr3zyJman3llzKSjcP62Tqf7Gi5eW9VX/mDFaCXNEy
 0bcE3+q5CCm1DOVYjoSzdeP8CjYbhZDAMo0a+d7hdzM+5J0uKsG6xcPhH+k/GgowjHxV
 j0xGAu6cwWjoai6iXH8D0NPM2TF/0pyp74/tH26r0LicsZWdAJ/8jMkKQr+vSyNNL+mb
 n7cNdnmqIpiQzIjVtx4Z09WA0A2ZYTtCi6FEx3oWUz7jpxIPyDnNR5xJy+ee8woAfMp5
 Tj7F5K83sMhkUe9+eX/lRMkNjyxvs6QXm5I+Q1v8ELJRaNrSYEwtKVQ++Sd6enCwhbMy
 qVyA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1704391489; x=1704996289;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=gHQw/Kpe42hvx2/mB3PjbBJAHFCz34XuPdFOxCstWKk=;
 b=iTEVajoKSCjTchjZXMgFZpKjT3J6pGKjMr2qmxc1f39MJv4mk8PapDZeajL9TbxWj4
 qxSDjRhpZwRCFBhJFyIWFMt3agM/opyu3O1XGoYorn0PB7vY5zfNjdQqUXxMURO9ugQJ
 CfZq/Gqwgcu8zC2500208E6VBUNR8csFrkk3bpJ62RjACmrBr8PP2ZrUWOLE2k37AEEK
 cpJDuyFVBNE2rclt2zGkCM/ADv136emF2wVSwRtxYey86pghuPKFglguUPANNOs7iX2+
 aSTS3tjxNOFfYmM944z1/HITLJtpdbvekjSFV90Wv6d1fxg8jRt/F0y3A9U3dGrVBghn
 kQYw==
X-Gm-Message-State: AOJu0Yz7kFD09LLt/Pvmj3J86la5XHA1jDtuU4aqLbiJ3hT3lIp6fsAJ
 qdqgNQAk4rnybACAabWdezvow309g+NIFA==
X-Google-Smtp-Source: AGHT+IHGlpBeOyZkU+xemdETZyNguMdPJ8fH2VzqR6uAX8og9aSzs27CWCLeJMwL0A5bKuJxAdwagg==
X-Received: by 2002:ae9:e201:0:b0:781:17de:80d with SMTP id
 c1-20020ae9e201000000b0078117de080dmr885832qkc.80.1704391489239; 
 Thu, 04 Jan 2024 10:04:49 -0800 (PST)
Received: from hurd (dsl-10-135-125.b2b2c.ca. [72.10.135.125])
 by smtp.gmail.com with ESMTPSA id
 ou30-20020a05620a621e00b0078172403677sm5883997qkn.72.2024.01.04.10.04.48
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 04 Jan 2024 10:04:48 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Marco Rimoldi <rimarko@HIDDEN>
Subject: Re: [bug#68052] [PATCH 3/4] gnu: python-pyportmidi: Update to
 latest git revision, fixing build fail.
In-Reply-To: <f8e15b79edc966a07b01d8f6629fc2c5124fc31a.1703627648.git.rimarko@HIDDEN>
 (Marco Rimoldi's message of "Tue, 26 Dec 2023 23:15:54 +0100")
References: <cover.1703627648.git.rimarko@HIDDEN>
 <f8e15b79edc966a07b01d8f6629fc2c5124fc31a.1703627648.git.rimarko@HIDDEN>
Date: Thu, 04 Jan 2024 13:04:48 -0500
Message-ID: <87mstl0ybj.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
Cc: 68052 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

Marco Rimoldi <rimarko@HIDDEN> writes:

Please write GNU ChangeLog commit messages, as mentioned in info '(guix)
Submitting Patches'.  This makes it easy to review the changes and match
if the actual changes match the author's intent.

> 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))))

Otherwise LGTM.

-- 
Thanks,
Maxim




Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 4 Jan 2024 18:02:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 04 13:02:33 2024
Received: from localhost ([127.0.0.1]:55667 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rLS37-0003UE-8h
	for submit <at> debbugs.gnu.org; Thu, 04 Jan 2024 13:02:33 -0500
Received: from mail-qt1-x82c.google.com ([2607:f8b0:4864:20::82c]:59872)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1rLS34-0003Ty-CU
 for 68052 <at> debbugs.gnu.org; Thu, 04 Jan 2024 13:02:31 -0500
Received: by mail-qt1-x82c.google.com with SMTP id
 d75a77b69052e-4277e2a95edso3586891cf.3
 for <68052 <at> debbugs.gnu.org>; Thu, 04 Jan 2024 10:02:26 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1704391340; x=1704996140; darn=debbugs.gnu.org;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=FnKxf4P2PEg04Jq/9W3ws/RsZVbT6zhVLHnhWhzcqBE=;
 b=lWR1+/rgxKrS0tFT9jaVHYdR8b75ZhnV72yc36WflieO3EYZyvIa5Po21fd9dpa7tc
 SXGW1u3a2MyFAmQC+I7bmxZHC1MyXLQeYx4yhobNdkbS5J4l/ooud/5Z3r8ukT909wI+
 Ovgp7FoZVL3titeYaM10pvjA7HV8L83fM7AjRFciZhj7J5g4yEDoy92PVdgwxPnWf0Py
 VV86MLPu7o/rSN2JPO4LG9gDh5K8ke1+loTAlDuyc5bO0BqZN5tD8IE4gm9gKxjWvwpA
 eu7Xo8X+//lzi6EZYXJ5ojNDKJ6/LA9son1FeIxvRiHuS6fohzN2yW63yHoGNP8OcInw
 r9rg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1704391340; x=1704996140;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=FnKxf4P2PEg04Jq/9W3ws/RsZVbT6zhVLHnhWhzcqBE=;
 b=ZeANQQJrjW85XU8QPDqVy6ETIBtAUOZcPJu94xhU9EOSM9evlvdcnxngR3SoYGr26T
 DIbCrmc39Oo+QkXOAuYug4+yLUn1ZqrdDS22et79OFpATVH1txUuU8EqHaIEg4LoMtO2
 C7A4dy3blTVMOgxbtsXDgeBx7K8ve+5kw/KKvnonemSWfexueThW6IFnEv25PjyWtHNQ
 YtPFrnFSqoy7NWnzE8k/S1xkXPCP9RVEJZdh9p5T2Mx5/lXj9puclRHUr9/j/Cy5whca
 i5Ezr5KOsycJRwZAs+MmobFk6/BNUXh4Wcu7hoLCCoWmZgzDLw8b+TxNmub+rwHOUdC5
 tbcA==
X-Gm-Message-State: AOJu0YwZMP0cwhNJNrVaJsMmK2i1nae4OdXpjCPEZNDiGJRFkG3WPZ3q
 QrSDaWv7mfGd4du5BxuW/Ki0hLkFJ3Tv2w==
X-Google-Smtp-Source: AGHT+IHBCySzTGdOsApFGYDyiA9r9aAZb6PdFj298ztTGnF8wp3qTf9dSU9ViKyTnqRnNKu+E4CdTw==
X-Received: by 2002:ac8:5745:0:b0:429:7252:f170 with SMTP id
 5-20020ac85745000000b004297252f170mr736720qtx.81.1704391340480; 
 Thu, 04 Jan 2024 10:02:20 -0800 (PST)
Received: from hurd (dsl-10-135-125.b2b2c.ca. [72.10.135.125])
 by smtp.gmail.com with ESMTPSA id
 bz21-20020a05622a1e9500b004281c19b277sm4865573qtb.67.2024.01.04.10.02.19
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 04 Jan 2024 10:02:20 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Marco Rimoldi <rimarko@HIDDEN>
Subject: Re: [bug#68052] [PATCH 2/4] gnu : python-poppler-qt5: Remove no
 longer needed patch
In-Reply-To: <32f6fa9d4a9ec6dc4932a04901788a3e6789055c.1703627648.git.rimarko@HIDDEN>
 (Marco Rimoldi's message of "Tue, 26 Dec 2023 23:14:41 +0100")
References: <cover.1703627648.git.rimarko@HIDDEN>
 <32f6fa9d4a9ec6dc4932a04901788a3e6789055c.1703627648.git.rimarko@HIDDEN>
Date: Thu, 04 Jan 2024 13:02:19 -0500
Message-ID: <87r0ix0yfo.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
Cc: 68052 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi,

Marco Rimoldi <rimarko@HIDDEN> writes:

Missing GNU changelog message, e.g.:

--8<---------------cut here---------------start------------->8---
* gnu/packages/patches/python-poppler-qt5-fix-build.patch: Delete file.
--8<---------------cut here---------------end--------------->8---

This change should be squashed in the previous commit, as they belong
together.

-- 
Thanks,
Maxim




Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.
Added tag(s) moreinfo. Request was from Maxim Cournoyer <maxim.cournoyer@HIDDEN> to control <at> debbugs.gnu.org. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 4 Jan 2024 18:01:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 04 13:01:13 2024
Received: from localhost ([127.0.0.1]:55654 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rLS1l-00031h-Tt
	for submit <at> debbugs.gnu.org; Thu, 04 Jan 2024 13:01:13 -0500
Received: from mail-vs1-xe34.google.com ([2607:f8b0:4864:20::e34]:47348)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1rLS1h-0002lv-HK
 for 68052 <at> debbugs.gnu.org; Thu, 04 Jan 2024 13:01:08 -0500
Received: by mail-vs1-xe34.google.com with SMTP id
 ada2fe7eead31-4673b620d95so163719137.2
 for <68052 <at> debbugs.gnu.org>; Thu, 04 Jan 2024 10:01:01 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1704391254; x=1704996054; darn=debbugs.gnu.org;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=yH3RC/scua7faPEKFoUb/qz6xUUdkDOlN4xIcpo9lhk=;
 b=fC7NrOIJDxye/SzaKZySAp36SK80cfM2Wt2ns2u5F7oFzkzoOMoillAktJhEZExI1K
 7XQTNSDNgL/GEOolctlxO4mj3JCl1nPZw7Y6ocwwGXzNfd6XJyJjKn7MPsHT/YfoLX/B
 FAnnXsPl1Mc1DS4DEN4Vxn8OapWRQSaMmRA/aeHhqEq+c7AIdrjdToWMf+HVLwpNGFbZ
 WSwPRm9QwwDvQmtqa9YwQ8logbD94yd6i0FcI42BxDymwaXVTi7PIWbazfO1mLmclIgS
 me5FH3x3uXuflhDhrTIh7vkeUHLCEebWG24Mfx8zdknrLoEOdr7y+MZwnFl67TEH4Rmg
 x1lg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1704391254; x=1704996054;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=yH3RC/scua7faPEKFoUb/qz6xUUdkDOlN4xIcpo9lhk=;
 b=WIvlRlMJyNPfP0eIIWb8Ap40oOZfX02uLdqJIdqbL+q7kQ8f4DtkmMJ1dKvdP+3Kxo
 H6DiQ9Tw9ZyxWJbOvIqE8UehxW4T4KNxe+uvZB1mc8wXygq0SVMRJPvCbsvzMoUg9zQM
 cF/KBVmJ4D/JgM2SXhAvQPs7nKFHNQzymeyT0TQH3bV2TENKjibMbGLLQUU3yCPF0OZp
 P95UoU4P7jQR/V4b9eE2iXM7GhE38sK7gbsBO1tnXnw2yekvRwJE67v7dpRTkfGlKydY
 C5UzEEb0UBBMXedi6/2R0oYvv/CYOhMuAazLg/lcgmz4t5bFdDLuv/9cTPfxwAW9kOUr
 i76w==
X-Gm-Message-State: AOJu0YzDeMYM+e8/bA2EkoK2J2eRWg1d10RDZu9NpOdeLjwZYtpLQJyr
 l/80XQfnLXLOPMenWG8naiNngyruCV3CNg==
X-Google-Smtp-Source: AGHT+IEhrdT58y5ibmxMTlQMBrs9nZGINGLjJ/61nP/TIV/98/Hr0G6UyDCFcfLnot3J8K6v/Us1Qg==
X-Received: by 2002:a05:6102:358e:b0:467:ae15:4d35 with SMTP id
 h14-20020a056102358e00b00467ae154d35mr598586vsu.8.1704391254224; 
 Thu, 04 Jan 2024 10:00:54 -0800 (PST)
Received: from hurd (dsl-10-135-125.b2b2c.ca. [72.10.135.125])
 by smtp.gmail.com with ESMTPSA id
 dm6-20020ad44e26000000b0067f6ec98ae9sm11889123qvb.32.2024.01.04.10.00.53
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 04 Jan 2024 10:00:53 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Marco Rimoldi <rimarko@HIDDEN>
Subject: Re: [bug#68052] [PATCH 1/4] gnu: python-poppler-qt5: update to 21.3.0
In-Reply-To: <20231226231408.6f2caeb5@HIDDEN> (Marco Rimoldi's message of
 "Tue, 26 Dec 2023 23:14:08 +0100")
References: <cover.1703627648.git.rimarko@HIDDEN>
 <20231226231408.6f2caeb5@HIDDEN>
Date: Thu, 04 Jan 2024 13:00:52 -0500
Message-ID: <87wmsp0yi3.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
Cc: 68052 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

Marco Rimoldi <rimarko@HIDDEN> writes:

> * gnu/packages/pdf.scm (python-poppler-qt5): Update tp 21.3.0

Please end complete sentences by a final period (also in the commit
summary).

> [build-system]: Change to pyproject, fix previous build failure.

The changelog should ideally detail each change, such as specifying the
'sipbuild.api' backend.

> 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"))))

Patches are also registered in the build system in gnu/local.mk, and
need to be de-registered there.

> -    (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.

Please use double space after period (that's an Emacs/Texinfo/Scheme
convention that allows navigating between sentences in Emacs).

> +       #: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.")

The rest LGTM.

-- 
Thanks,
Maxim




Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 26 Dec 2023 22:16:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Dec 26 17:16:11 2023
Received: from localhost ([127.0.0.1]:35114 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rIFid-0001h4-Ei
	for submit <at> 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 <rimarko@HIDDEN>) id 1rIFib-0001K3-AT
 for 68052 <at> 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
From: Marco Rimoldi <rimarko@HIDDEN>
To: 68052 <at> debbugs.gnu.org
Subject: [PATCH 4/4] gnu: portmidi: Add variant portmidi-2 updated to
 release 2.0.4
Message-ID: <78e978968bbff5e9275bd1e75442eed18f15e8bb.1703627648.git.rimarko@HIDDEN>
In-Reply-To: <cover.1703627648.git.rimarko@HIDDEN>
References: <cover.1703627648.git.rimarko@HIDDEN>
X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-CMAE-Envelope: MS4xfMqcrbyc8/5Sf+X+1bzcYV+JUpNwB9/ViRp4XYB3ZGcyblRxqoNkf7yN97qO08ZdZwQdIxAcFJTrty7hZNiute0EXsq1g/dJuY7tmEDunYLcuflscSXC
 ZkyoKzd4/2WAMKF1dBqZmEkTDdmauptTC1M4VsFw6BSj5wCP5AXeYI9AE8/BKzbPW6FRLwV3HQc+2Q==
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

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
-- 
2.41.0





Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 26 Dec 2023 22:16:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Dec 26 17:16:02 2023
Received: from localhost ([127.0.0.1]:35111 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rIFiT-0001Wp-Fk
	for submit <at> 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 <rimarko@HIDDEN>) id 1rIFiR-0001K3-7L
 for 68052 <at> 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
From: Marco Rimoldi <rimarko@HIDDEN>
To: 68052 <at> debbugs.gnu.org
Subject: [PATCH 3/4] gnu: python-pyportmidi: Update to latest git revision,
 fixing build fail.
Message-ID: <f8e15b79edc966a07b01d8f6629fc2c5124fc31a.1703627648.git.rimarko@HIDDEN>
In-Reply-To: <cover.1703627648.git.rimarko@HIDDEN>
References: <cover.1703627648.git.rimarko@HIDDEN>
X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-CMAE-Envelope: MS4xfCA84iBkE2OvWcyomNqwTze694V7aa8IYVjRxRxcbOCUEQJ0zvnJ+jeLwMQNamVM+e2gmb9ymd0Z4rPR3ihmm4D+4l+kfhY3L16XlJY2JzVlX+4f/sv/
 HmoS6Q7K8C+Dt4SeUe61AXfUfUQLBOHqW0hRpkZPRbQkU7rSkDDZ7UeZyGWi4gSaNbLZ5Dv20orVMw==
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

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
-- 
2.41.0





Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 26 Dec 2023 22:14:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Dec 26 17:14:44 2023
Received: from localhost ([127.0.0.1]:35099 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rIFhD-0007fN-VJ
	for submit <at> 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 <rimarko@HIDDEN>) id 1rIFhB-0007eO-LT
 for 68052 <at> 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
From: Marco Rimoldi <rimarko@HIDDEN>
To: 68052 <at> debbugs.gnu.org
Subject: [PATCH 2/4] gnu : python-poppler-qt5: Remove no longer needed patch
Message-ID: <32f6fa9d4a9ec6dc4932a04901788a3e6789055c.1703627648.git.rimarko@HIDDEN>
In-Reply-To: <cover.1703627648.git.rimarko@HIDDEN>
References: <cover.1703627648.git.rimarko@HIDDEN>
X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-CMAE-Envelope: MS4xfLx13CbYMphfYjsU7PQW4zh9Z6pKK6c7grNSF9KmnQ2l7Z+LoFvikcchPAzK9D1vN9ah1yB2K83SAfW9VNV+qRqT/kdSnupbno1gk95Irflm+b6kNm1K
 qvF8n3tx4x8TPwjZ4AKXGQPm2nBs+vZ4KxnTBzAq6CfP25syGHwAU2FW3sVSPzxBf0BIQ7jg8lfgrQ==
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

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 <code@HIDDEN>
-Date: Thu, 4 Mar 2021 17:02:51 +0100
-Subject: [PATCH] map type QVector< QPair<TYPE, TYPE> > 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 <TYPE>
- };
- 
- 
-+/**
-+ * Convert QVector< QPair<TYPE, TYPE> >
-+ * from and to a Python list of a 2-item tuple
-+ */
-+
-+template<TYPE>
-+%MappedType QVector< QPair<TYPE, TYPE> >
-+{
-+%TypeHeaderCode
-+#include <qvector.h>
-+#include <qpair.h>
-+%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<TYPE, TYPE>* p = new QPair<TYPE, TYPE>(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<TYPE, TYPE>");
-+
-+  // 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<TYPE, TYPE> > *qv = new QVector< QPair<TYPE, TYPE> >;
-+
-+  for (int i = 0; i < PySequence_Size(sipPy); ++i)
-+  {
-+    int state;
-+    QPair<TYPE, TYPE> * p = reinterpret_cast< QPair<TYPE, TYPE> * >(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; */
-- 
2.41.0





Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at 68052 <at> debbugs.gnu.org:


Received: (at 68052) by debbugs.gnu.org; 26 Dec 2023 22:14:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Dec 26 17:14:19 2023
Received: from localhost ([127.0.0.1]:35096 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rIFgp-0007eg-Ha
	for submit <at> 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 <rimarko@HIDDEN>) id 1rIFgk-0007eO-5k
 for 68052 <at> 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
From: Marco Rimoldi <rimarko@HIDDEN>
To: 68052 <at> debbugs.gnu.org
Subject: [PATCH 1/4] gnu: python-poppler-qt5: update to 21.3.0
Message-ID: <20231226231408.6f2caeb5@HIDDEN>
In-Reply-To: <cover.1703627648.git.rimarko@HIDDEN>
References: <cover.1703627648.git.rimarko@HIDDEN>
X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-CMAE-Envelope: MS4xfC5+QjQnI3ydIEQ2pkGBzPPBcVNQVdqsbcbR92ia3P16zRxx+0NrMNwlK6Xz94dr/qkVy+C4PC1Ix1H6J1HVFvtXhqVXbMb8ppw1bh8p+QpoNE0RytDh
 URCtc6BGre9I4hWdjxsqIjfoUMg8+oquHdcWoOTRWI9dvlhw+qx2C02gLM2zHWtGy1B9QhOWcxS5DA==
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68052
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* 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.")
-- 
2.41.0





Information forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 26 Dec 2023 22:10:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Dec 26 17:10:57 2023
Received: from localhost ([127.0.0.1]:35091 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rIFdY-0007Yx-TE
	for submit <at> debbugs.gnu.org; Tue, 26 Dec 2023 17:10:57 -0500
Received: from lists.gnu.org ([2001:470:142::17]:59116)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <rimarko@HIDDEN>) id 1rIFdX-0007Yl-4r
 for submit <at> debbugs.gnu.org; Tue, 26 Dec 2023 17:10:55 -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 <rimarko@HIDDEN>) id 1rIFdR-0007L3-QK
 for guix-patches@HIDDEN; Tue, 26 Dec 2023 17:10:49 -0500
Received: from smtp-32.italiaonline.it ([213.209.10.32] helo=libero.it)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <rimarko@HIDDEN>) id 1rIFdP-0004Ut-Ot
 for guix-patches@HIDDEN; Tue, 26 Dec 2023 17:10:49 -0500
Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA
 id IFdLrxhE7UvUzIFdLrGuUW; Tue, 26 Dec 2023 23:10:43 +0100
x-libjamoibt: 1601
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021;
 t=1703628643; bh=CcHIgbXKvvegJFWB6NatSYJ+aTjUfNtLSyLNS6GyL4w=;
 h=From;
 b=qU9laYGBej687Omrpvx/zShKKXeRXX8/K0fciZsYgPJ+Ca5ODG3qQOT6QFX+JOXKb
 1amn3g9I4oJ1ZQyBustsiFunzG+cICt362Tilvsgt8f0hfOuPuH4NWX1yqA/Ka8VBe
 Oh5F4sFCm0bksTq3ELRBy7K2I39ElA7+QlZJiLsXDbUiEXXkoWoZWUH4NK5ncMLWYH
 GQqDy6iN/wywlcKyj36j3y6y5fjy3hIUuxeQIG3Jg5rVVoTAfh3V30Ijxcozwvdc3j
 G596UGIeisCePCOV8CQJqQUz7cHqWbl0T//6ii+2BMzyArQnA9HwIxYu8oEASc2szn
 evUlNT+3ZN9Jg==
X-CNFS-Analysis: v=2.4 cv=MvuUqUWe c=1 sm=1 tr=0 ts=658b4f63 cx=a_exe
 a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17
 a=kj9zAlcOel0A:10 a=DwdvrSliIDo1rt-LrTEA:9 a=CjuIK1q_8ugA:10
Date: Tue, 26 Dec 2023 23:10:42 +0100
From: Marco Rimoldi <rimarko@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH 0/4] Collected patches fixing builds of various Frescobaldi
 dependencies
Message-ID: <cover.1703627648.git.rimarko@HIDDEN>
X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-CMAE-Envelope: MS4xfN1mtN8ZVqHTfB1ffXF0eSbxVZxGd1mQAt4u7XwvbBtEbhqb1LM8b8vejWGTErf9/b3F8L+u1gIwNwpnUmONA8CNE8IyEdBwFY1jiTRya7vFLF3geuec
 7nFcLOmV1at2tzzJnqDd7i//v+iaQY8iqce6lzmv8NH6yAruqrZ/qGJteL6WA6jtnOPuuySOb5lNgg==
Received-SPF: pass client-ip=213.209.10.32; envelope-from=rimarko@HIDDEN;
 helo=libero.it
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001,
 T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

I resubmit here the patches I've sent separately in the last couple of days, for your convenience. My apologies.

* Fixed builds for python-poppler-qt5, python-pyportmidi, frescobaldi.
* Added up-to-date variant definition for portmidi.

Marco Rimoldi (4):
  gnu: python-poppler-qt5: update to 21.3.0
  gnu : python-poppler-qt5: Remove no longer needed patch
  gnu: python-pyportmidi: Update to latest git revision, fixing build
    fail.
  gnu: portmidi: Add variant portmidi-2 updated to release 2.0.4

 gnu/packages/music.scm                        |  73 +++++++----
 .../python-poppler-qt5-fix-build.patch        | 116 ------------------
 gnu/packages/pdf.scm                          |  37 ++----
 3 files changed, 62 insertions(+), 164 deletions(-)
 delete mode 100644 gnu/packages/patches/python-poppler-qt5-fix-build.patch


base-commit: 103dc351111d7aff82b7b7883f79084faaa54abc
-- 
2.41.0




Acknowledgement sent to Marco Rimoldi <rimarko@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#68052; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Sat, 20 Jan 2024 12:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.