From patchwork Tue Dec 26 22:14:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Rimoldi X-Patchwork-Id: 58091 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 30B4B27BBEA; Tue, 26 Dec 2023 22:15:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 858BC27BBE9 for ; Tue, 26 Dec 2023 22:15:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIFhZ-0000A8-HM; Tue, 26 Dec 2023 17:15:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rIFhX-00009i-To for guix-patches@gnu.org; Tue, 26 Dec 2023 17:15:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rIFhX-0005Rq-HZ for guix-patches@gnu.org; Tue, 26 Dec 2023 17:15:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIFhV-0007gD-O1 for guix-patches@gnu.org; Tue, 26 Dec 2023 17:15:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68052] [PATCH 1/4] gnu: python-poppler-qt5: update to 21.3.0 Resent-From: Marco Rimoldi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Dec 2023 22:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68052 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68052@debbugs.gnu.org Received: via spool by 68052-submit@debbugs.gnu.org id=B68052.170362886029434 (code B ref 68052); Tue, 26 Dec 2023 22:15:01 +0000 Received: (at 68052) by debbugs.gnu.org; 26 Dec 2023 22:14:20 +0000 Received: from localhost ([127.0.0.1]:35096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIFgp-0007eg-Ha for submit@debbugs.gnu.org; Tue, 26 Dec 2023 17:14:19 -0500 Received: from smtp-32.italiaonline.it ([213.209.10.32]:40204 helo=libero.it) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIFgk-0007eO-5k for 68052@debbugs.gnu.org; Tue, 26 Dec 2023 17:14:17 -0500 Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA id IFgfrxjeNUvUzIFgfrGw6C; Tue, 26 Dec 2023 23:14:10 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1703628850; bh=22jF2V/5Gym67qeb6O0GeFXsv2IRHRXYo6hAByEJpt4=; h=From; b=aKFOTRKNk2qQio3QQyJdxmRVJrr4oPvE1xvevd6t13wUnWJbfY+2dfMC5Uemgclch OgNsTUIODzfejCMRWW2IlidFryuzWL6MGcZiFzRMxXPgHzWWpRuk5p5g/na4XjqvgL HPajJydFLMPBWRPypOHLhmujLZhpb6kbMBqlEUPZP+pNr4nIrBnrKfGRAsHoN1dZpd j3nGNieBTmL6ZXaEdq4TtHMWZkE6upx3x+r6k6sktz6YJyf9IPe+7Al/nYJQin8O81 6ye5GHySV2xFMlB3FoOWcgKNB6Z2wC86bnrI4e6aaPv05qCZVxhL2pdWxi8ko+e0xU Dv7X+iDy60hgQ== X-CNFS-Analysis: v=2.4 cv=MvuUqUWe c=1 sm=1 tr=0 ts=658b5032 cx=a_exe a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=kj9zAlcOel0A:10 a=8AHkEIZyAAAA:8 a=CckQENj0AAAA:8 a=NEAV23lmAAAA:8 a=Z42u9cC_KPnAsnA-tEQA:9 a=CjuIK1q_8ugA:10 a=-XWihg8NfbdYC9mmq4w4:22 Date: Tue, 26 Dec 2023 23:14:08 +0100 Message-ID: <20231226231408.6f2caeb5@libero.it> In-Reply-To: References: X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CMAE-Envelope: MS4xfC5+QjQnI3ydIEQ2pkGBzPPBcVNQVdqsbcbR92ia3P16zRxx+0NrMNwlK6Xz94dr/qkVy+C4PC1Ix1H6J1HVFvtXhqVXbMb8ppw1bh8p+QpoNE0RytDh URCtc6BGre9I4hWdjxsqIjfoUMg8+oquHdcWoOTRWI9dvlhw+qx2C02gLM2zHWtGy1B9QhOWcxS5DA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Marco Rimoldi X-ACL-Warn: , Marco Rimoldi via Guix-patches X-Patchwork-Original-From: Marco Rimoldi via Guix-patches via From: Marco Rimoldi Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pdf.scm (python-poppler-qt5): Update tp 21.3.0 [build-system]: Change to pyproject, fix previous build failure. Change-Id: I30d6e2a3180505091d8072ed452211b0bb3a0178 --- gnu/packages/pdf.scm | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 644a4617a6..787f5a2a6f 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -415,40 +415,29 @@ (define-public poppler-qt5 (define-public python-poppler-qt5 (package (name "python-poppler-qt5") - (version "21.1.0") + (version "21.3.0") (source (origin (method url-fetch) (uri (pypi-uri "python-poppler-qt5" version)) (sha256 (base32 - "0b82gm4i75q5v19kfbq0h4y0b2vcwr2213zkhxh6l0h45kdndmxd")) - (patches (search-patches "python-poppler-qt5-fix-build.patch")))) - (build-system python-build-system) + "1q3gvmsmsq3llf9mcbhlkryrgprqrw2z7wmnvagy180f3y2fhxxl")))) + (build-system pyproject-build-system) (arguments - `(;; There are no tests. The check phase just causes a rebuild. - #:tests? #f - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "setup.py" - ;; This check always fails, so disable it. - (("if not check_qtxml\\(\\)") - "if True")) - ;; We need to pass an extra flag here. This cannot be in - ;; configure-flags because it should not be passed for the - ;; installation phase. - ((@@ (guix build python-build-system) call-setuppy) - "build_ext" (list (string-append "--pyqt-sip-dir=" - (assoc-ref inputs "python-pyqt") - "/share/sip")) #t)))))) + `( + ;; The backend builder expects a Python dictionary as per + ;; https://peps.python.org/pep-0517/#config-settings, but we + ;; give it lists and it fails. The next line is a workaround. + #:configure-flags '#nil + #:build-backend "sipbuild.api" + #:tests? #f)) (native-inputs (list pkg-config)) (inputs - (list python-sip-4 python-pyqt poppler-qt5 qtbase-5)) - (home-page "https://pypi.org/project/python-poppler-qt5/") - (synopsis "Python bindings for Poppler-Qt5") + (list python-sip python-pyqt-builder python-pyqt poppler-qt5 qtbase-5)) + (home-page "https://github.com/frescobaldi/python-poppler-qt5") + (synopsis "Python binding to Poppler-Qt5") (description "This package provides Python bindings for the Qt5 interface of the Poppler PDF rendering library.")