From patchwork Mon Mar 31 06:18:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41066 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 E02C927BBE2; Mon, 31 Mar 2025 07:21:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B944A27BBE9 for ; Mon, 31 Mar 2025 07:21:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tz8WM-00054Q-D9; Mon, 31 Mar 2025 02:21:18 -0400 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 1tz8WK-000535-Op for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:17 -0400 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 1tz8WK-0008BD-Fe for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3GGpZz9ep/7sG2TJiTWk+kuZUhSzybJ3rlWnA1yNxhM=; b=N/yErwPqDNbYbA9qnP6AGdtXzXXCZRg888GeMDNpxEy3cCEQIJqdmqVgEtfRgwgFdEyGK4jF67jkVQ2sb/WXwZDh/gqEumWUWMC1etgPd+7/egJzq4StSBx5X9AFLYpLqezoZj8q+PCo7fmLmdBK5EgJ+UQy1n8lAaKIE9OHZzjQGUQeXEBl1IWRYKbk51x1aMssK579Ek3P1n2iwmebVNMn9d3XJx9odUSim/+5w51kRbb0rOONhx9t8JHesBcRCbf/VU6sBAfafrtCEGjABrVNTWfpQVoePsLz+7t2H3w5Ct6JvlzYTzHygum3oxqEBn5vkNPNaRjspZhPrul+/g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tz8WK-0007PJ-84 for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77400] [PATCH 21/26] gnu: veusz: Update to 3.6.2. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Mar 2025 06:21:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77400 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77400@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 77400-submit@debbugs.gnu.org id=B77400.174340204428107 (code B ref 77400); Mon, 31 Mar 2025 06:21:16 +0000 Received: (at 77400) by debbugs.gnu.org; 31 Mar 2025 06:20:44 +0000 Received: from localhost ([127.0.0.1]:39294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tz8Vm-0007J7-PQ for submit@debbugs.gnu.org; Mon, 31 Mar 2025 02:20:43 -0400 Received: from 6.mo563.mail-out.ovh.net ([46.105.55.200]:59167) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tz8UY-00070U-Fm for 77400@debbugs.gnu.org; Mon, 31 Mar 2025 02:19:27 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZR1Ds3hMgz1dGn; Mon, 31 Mar 2025 06:19:25 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77400@debbugs.gnu.org>; Mon, 31 Mar 2025 06:19:25 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.176.114]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZR1Ds2hZ1z7wVr; Mon, 31 Mar 2025 06:19:25 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id B1811C393B; Mon, 31 Mar 2025 06:19:24 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-103G005dd3e4a8b-bebb-400a-9be5-59cbbb302326, 87830A87949A0BA70EB5F3889DD10BC79FDA47E2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Mon, 31 Mar 2025 08:18:49 +0200 Message-ID: <20250331061901.22670-21-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250331061901.22670-1-ngraves@ngraves.fr> References: <20250331061901.22670-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 3741646869348868834 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 49 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeeludekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgoufhushhpvggtthffohhmrghinhculdegledmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeefieehueeigeeufeffieejtddukeehjeduvdevgedtuddvieejheejgfdtvedvleenucffohhmrghinhepghhithhhuhgsrdhiohenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeejgedttdesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=3GGpZz9ep/7sG2TJiTWk+kuZUhSzybJ3rlWnA1yNxhM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1743401965; v=1; b=B70nwXGx8n44AC/98fRuvMk8epJPBDQjM8MCPmFOMBAcesGGxFzbVYIxURuUwqdwa0PwBY12 Mi2beeTSKIFKNCwzi5JdR2Ez4qX3gkKyrV0jnhS0qYiVdPczSH+HDUPFilm9I4THHOAW8MQL8Vw UUuznojIHurBaJxVnWGXrcUidYJjklBEV7Xc2Pqy1lFbz9fxOflD3X38dUWwiAW0uAy7xBVA+5W C+lOrJfchmLPFw0OeF7A1KCc7kfuMdmKk8ekpppxFVLsf+Pxnu1UF/UHObrm7mgVWobXagQJo3e 8Re1rn0gldfUcaDAIBaDuuLXXTjNHqgXDQBUQnpqjckDw== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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/maths.scm (veusz): Update to 3.6.2. [build-system]: Switch to pyproject-build-system. [arguments]: Improve style, use gexps. {phases}: Remove phase 'fix-sip-dir. Add phase 'fix-pyqt5-include-dir. Refresh phase 'wrap-executable. [native-inputs]: Add python-astropy, python-setuptools, python-wheel. Remove python-sip-4. [inputs]: Add qtwayland-5. --- gnu/packages/maths.scm | 73 +++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6826139580..ec8554520b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -107,6 +107,7 @@ (define-module (gnu packages maths) #:use-module (guix build-system python) #:use-module (guix build-system ruby) #:use-module (gnu packages algebra) + #:use-module (gnu packages astronomy) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) @@ -3511,46 +3512,51 @@ (define-public gmsh (define-public veusz (package (name "veusz") - (version "3.3.1") + (version "3.6.2") (source (origin (method url-fetch) (uri (pypi-uri "veusz" version)) (sha256 - (base32 "1q7hi1qwwg4pgiz62isvv1pia85m13bspdpp1q3mrnwl11in0ag0")))) - (build-system python-build-system) + (base32 "1lcmcfr0dcam8g1fp5qip8jnxglxx7i62ln3ix6l4c2bbv21l5y2")))) + (build-system pyproject-build-system) (arguments - `(;; Tests will fail because they depend on optional packages like - ;; python-astropy, which is not packaged. - #:tests? #f - #:phases - (modify-phases %standard-phases - ;; Veusz will append 'PyQt5' to sip_dir by default. That is not how - ;; the path is defined in Guix, therefore we have to change it. - (add-after 'unpack 'fix-sip-dir - (lambda _ - (substitute* "pyqtdistutils.py" - (("os.path.join\\(sip_dir, 'PyQt5'\\)") "sip_dir")))) - ;; Now we have to pass the correct sip_dir to setup.py. - (replace 'build - (lambda* (#:key inputs #:allow-other-keys) - ;; We need to tell setup.py where to locate QtCoremod.sip - ((@@ (guix build python-build-system) call-setuppy) - "build_ext" - (list (string-append "--sip-dir=" - (search-input-directory inputs "share/sip")))))) - ;; Ensure that icons are found at runtime. - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/veusz") - `("QT_PLUGIN_PATH" prefix - ,(list (string-append (assoc-ref inputs "qtsvg") - "/lib/qt5/plugins/")))))))))) + (list + ;; Tests currently fail with exception TypeError: + ;; calling returned 3.6.2, not a test + #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; Veusz uses python's site-packages to look for pyqt5_include_dir. + (add-after 'unpack 'fix-pyqt5-include-dir + (lambda _ + (substitute* "pyqt_setuptools.py" + (("get_path\\('platlib'\\)") + (format #f "~s" + (string-append + #$(this-package-input "python-pyqt") + "/lib/python" + #$(version-major+minor + (package-version python-wrapper)) + "/site-packages")))))) + ;; Ensure that icons are found at runtime. + (add-after 'wrap 'wrap-executable + (lambda* (#:key inputs #:allow-other-keys) + (wrap-program (string-append #$output "/bin/veusz") + `("QT_PLUGIN_PATH" prefix + ,(list (string-append + (string-join + (list #$(this-package-input "qtbase") + #$(this-package-input "qtsvg") + #$(this-package-input "qtwayland")) + "/lib/qt5/plugins:") + "/lib/qt5/plugins"))))))))) (native-inputs (list pkg-config - ;;("python-astropy" ,python-astropy) ;; FIXME: Package this. - qttools-5 python-sip-4)) + python-astropy + python-setuptools + python-wheel + qttools-5)) (inputs (list bash-minimal ghostscript ;optional, for EPS/PS output @@ -3558,7 +3564,8 @@ (define-public veusz python-h5py ;optional, for HDF5 data python-pyqt qtbase-5 - qtsvg-5)) + qtsvg-5 + qtwayland-5)) (propagated-inputs (list python-numpy)) (home-page "https://veusz.github.io/")