From patchwork Mon Jun 2 02:45:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nomike X-Patchwork-Id: 42975 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 A5C5227BC4B; Mon, 2 Jun 2025 03:48:54 +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=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 3CFD227BC49 for ; Mon, 2 Jun 2025 03:48:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uLvDa-0001e0-AC; Sun, 01 Jun 2025 22:48:06 -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 1uLvDX-0001ci-B0 for guix-patches@gnu.org; Sun, 01 Jun 2025 22:48:03 -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 1uLvDX-0007uc-3G for guix-patches@gnu.org; Sun, 01 Jun 2025 22:48:03 -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=zZGJCxkwvFh4HgQHvlVW8cAq01ti24eYlPhizcoPiwo=; b=RHoujlwoYbTo+AtxKQ/Eswz2FuNauwRj5ABoOPZXfFJSBFvww+mkdjRCKINmImdCkU4Dnyy2S/zndNNQGc4ePUnoI4M6EqlwR7mncjJwpVEbgbM6J8tq7wvE6RERRM5Tytaz8hPIDFSWvIyt6QxZmLKrQMKQD+1fo8pzpR8pMs+2UFTXyZ1bl6GpM38gzbVFcgG1UbLm1jsmesShWLWVXLMAjtYNL50QuBe75wwd8woOITTx+tDB0CEj62UfnoPdrPtFyscTIvpXhQiedlg18x2tBXp4B5K+UlYjT5ePDeEUxqXnnztoNqFNr691OcDD/b1rNGwSAJqleiVCRkbQRg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uLvDW-0008Vy-KB for guix-patches@gnu.org; Sun, 01 Jun 2025 22:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78668] [PATCH v2 1/4] gnu: opencsg: Update to 1.8.2 Resent-From: nomike Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jun 2025 02:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78668 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78668@debbugs.gnu.org Cc: nomike Received: via spool by 78668-submit@debbugs.gnu.org id=B78668.174883246032602 (code B ref 78668); Mon, 02 Jun 2025 02:48:02 +0000 Received: (at 78668) by debbugs.gnu.org; 2 Jun 2025 02:47:40 +0000 Received: from localhost ([127.0.0.1]:44772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uLvDA-0008Tm-EM for submit@debbugs.gnu.org; Sun, 01 Jun 2025 22:47:40 -0400 Received: from cadetblue.banana.relay.mailchannels.net ([23.83.217.28]:17193) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uLvD7-0008TM-7H for 78668@debbugs.gnu.org; Sun, 01 Jun 2025 22:47:37 -0400 X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id A68AB783690; Mon, 2 Jun 2025 02:47:35 +0000 (UTC) Received: from pdx1-sub0-mail-a206.dreamhost.com (100-116-194-202.trex-nlb.outbound.svc.cluster.local [100.116.194.202]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 44BFD783B7A; Mon, 2 Jun 2025 02:47:35 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1748832455; a=rsa-sha256; cv=none; b=qZMG2UwLtFEVlzCN2+jSgckLnUqB/6GHw6AqgKf+oXUCXzSWvKbFW32xAhuN53KSsT3Oo9 7cQsaHHl1mH+xh4tHJSgFixdb+v4PMEE13X9r5XqnvTVY891rV+z+nuqp4J03C9p5XZT5M A+r+zL0QjFPdtU2II4oy9sfpkDZaDBYqgikr5AOclVHsTAErmyZwDOMP/2fub47rXs0418 6bGY7zxKp3N0hZHvBLIzoOhr2D7B63MW6qGHHIBi8lDtIHe2K7vzVIq7lDEJchXJzHWlU/ kUAf14TSDuBjOvudN+mdhDNXumaW6hMFKc43X/QCcTkq2VzM2FTTk1HmaoupTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1748832455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=zZGJCxkwvFh4HgQHvlVW8cAq01ti24eYlPhizcoPiwo=; b=ijyWvJlM4fqEqrEBWAC8kL7My9jrrs+hJc/Qh41HsA4GtLePI0ft3sb37oCG7sxprMJjZ1 hWN3VB6yK+fUwV0A7RYE4i5X8V8p8V4RIjceMrtbHCHz7skELGHIpvymm5nwmGC1mR5vN7 bj1Pj0mOtg9tKn9ZSk0jX/2etv/K0uqKNZ9um0ZRVJhKuqmFwb64yUHcpZFf+IJG2L4MCP BCGIA5uUqUeEvkuHRFRmWQckrXlzhcjme8141mt45xo5x/iHLfKIn2gR51KSXaWRDjk3oW UNrg/iTWF67KPfxr9K7LYCZxikp5GW+ogRAECgmH9hgLR7hj4HOOUO+Aa1VYxw== ARC-Authentication-Results: i=1; rspamd-76569d6b7-58wtj; auth=pass smtp.auth=dreamhost smtp.mailfrom=nomike@nomike.com X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com X-MC-Relay: Bad X-MailChannels-SenderId: dreamhost|x-authsender|nomike@nomike.com X-MailChannels-Auth-Id: dreamhost X-Shrill-Chief: 44493f4b0fc1a2bc_1748832455505_155562661 X-MC-Loop-Signature: 1748832455505:133531469 X-MC-Ingress-Time: 1748832455505 Received: from pdx1-sub0-mail-a206.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.116.194.202 (trex/7.0.3); Mon, 02 Jun 2025 02:47:35 +0000 Received: from localhost (84-112-221-106.cable.dynamic.surfer.at [84.112.221.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nomike@nomike.com) by pdx1-sub0-mail-a206.dreamhost.com (Postfix) with ESMTPSA id 4b9dYL5S2szBZ; Sun, 1 Jun 2025 19:47:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1748832455; bh=zZGJCxkwvFh4HgQHvlVW8cAq01ti24eYlPhizcoPiwo=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=XtNtzHldtwnwIwyRelu4CONF/sKo2rNtZ5fqv+Yat0naY17bpEhlzU8HL1zVJkrHL 3qFtilcodJoKjVyNB/HzU24ywxPjE3y11McLUuFmO5Ab5Nnki03BTloZnd6mfwyaCO BKA9MMkbNQgw7zEqRswOIwkIM5BK7TWOhPprCYGOVABNP1QhokM/HbfFta4IgTZ9lz dP+9czbnNU8BQDwSjZcN/WgHzpAv+LEPnernGy/l3xlh9F5oEgEx7QiSS+akR89A9V 35YxBD6r79A787+G6W42GPEIeKuuHjpoUMEwt+23DR9LVv6EZVu4VTGaoO700wmvu+ gV3QCHARbe4yA== From: nomike Date: Mon, 2 Jun 2025 04:45:50 +0200 Message-ID: <20250602024724.3282058-2-nomike@nomike.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602024724.3282058-1-nomike@nomike.com> References: <20250602024724.3282058-1-nomike@nomike.com> MIME-Version: 1.0 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: , 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/graphics.scm (opencsg): Switch to cmake build system as project has switched to that. Change-Id: Iba5ee7f2d3a95b2df8226a5f4d42baa2806eec84 --- gnu/packages/graphics.scm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 4415c56660..e61b6bc0f6 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2212,7 +2212,7 @@ (define-public opencsg (let ((dot-to-dash (lambda (c) (if (char=? c #\.) #\- c)))) (package (name "opencsg") - (version "1.4.2") + (version "1.8.1") (source (origin (method git-fetch) @@ -2224,18 +2224,12 @@ (define-public opencsg (file-name (git-file-name name version)) (sha256 (base32 - "00m4vs6jn3scqczscc4591l1d6zg6anqp9v1ldf9ymf70rdyvm7m")))) - (build-system gnu-build-system) + "0q19mswyjlampdssqgik4q7j08fbj0dhxdr9mzg0i7ma2b2rhdhw")))) + (build-system cmake-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/Makefile" - (("/usr/local") (assoc-ref outputs "out"))) - #t)) - (add-before 'build 'skip-example - (lambda _ (chdir "src") #t))))) + `(#:phases (modify-phases %standard-phases + ;; library has no tests + (delete 'check)))) (inputs (list glew freeglut)) (synopsis "Library for rendering Constructive Solid Geometry (CSG)") From patchwork Mon Jun 2 02:45:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nomike X-Patchwork-Id: 42974 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 3B14627BC4B; Mon, 2 Jun 2025 03:48:44 +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=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 BBF9427BC49 for ; Mon, 2 Jun 2025 03:48:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uLvDa-0001eE-UV; Sun, 01 Jun 2025 22:48:06 -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 1uLvDX-0001ck-KR for guix-patches@gnu.org; Sun, 01 Jun 2025 22:48:03 -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 1uLvDX-0007uh-CY for guix-patches@gnu.org; Sun, 01 Jun 2025 22:48:03 -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=g0/4fziVUqDoiOgL2CY8n6tNgLH2MYiut6q+B6ULRik=; b=UT8RbV9UI0lREHyf+9auictRTXsYcgBrNwfy2d84mv4bnPqx/bDC7svfZlkMqWFePnYhB9OguL1kwK+s+NXQQlrtCEu1i2M/sWq/vXTnWwB8F+yI3mw18Cd2EAXlOnXjmAOl1Ka9BFqPRxIEhBiHugRbU9x5B8F+vhhd6GPaHV066nLVM6xaA6XQz7l717eptn0gkIHfUUXsVRPhCwiz9SWLP8JA32eX5PrP0M9poppODVF5EWjslezNU5AsXYTpsoyZ5yaC2VgNqYPhbLqxiLtWuRooKWSdDoubxYGvYMN/m9gI2dRPE0J90RAGqo93bmpyJiRlzLn7jbHVZU656A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uLvDX-0008W6-6O for guix-patches@gnu.org; Sun, 01 Jun 2025 22:48:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78668] [PATCH v2 2/4] gnu: opencsg: guix style Resent-From: nomike Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jun 2025 02:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78668 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78668@debbugs.gnu.org Cc: nomike Received: via spool by 78668-submit@debbugs.gnu.org id=B78668.174883246532628 (code B ref 78668); Mon, 02 Jun 2025 02:48:03 +0000 Received: (at 78668) by debbugs.gnu.org; 2 Jun 2025 02:47:45 +0000 Received: from localhost ([127.0.0.1]:44775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uLvDE-0008UC-Rc for submit@debbugs.gnu.org; Sun, 01 Jun 2025 22:47:45 -0400 Received: from cadetblue.ash.relay.mailchannels.net ([23.83.222.28]:21373) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uLvDB-0008Tl-Re for 78668@debbugs.gnu.org; Sun, 01 Jun 2025 22:47:42 -0400 X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id D1C1322A13; Mon, 2 Jun 2025 02:47:39 +0000 (UTC) Received: from pdx1-sub0-mail-a206.dreamhost.com (trex-green-8.trex.outbound.svc.cluster.local [100.118.166.165]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 83BE222957; Mon, 2 Jun 2025 02:47:39 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1748832459; a=rsa-sha256; cv=none; b=x+CmKh+287Bb+N8nSSkjM9SURnKKsmCu9hspRt/GUoUIie6s/XzJZYXs+uj3fyEh9Q4nwN N3JbbD/tNYNeyJNhmABKkgHDLVEYHZAIEIjo7HQPhAT4GheIEv7Q/SCk4nXI+mGiWkjZoK qcX8RZnQw5ezH97dTKR9xWu3V5OwGYLtubyMV7JWGEMKyPqhEvVcboT8uoHl7JhWzfCJL9 WdFXXiPAjFzYZMELMDIkbUNmmg2JEEeWhO2FFPVDnNJkooJm1eTOKJc4xnRTMwJOCQQ+t4 kKFgfRxzoxP71vyCJaaNyMPJaQ0kxJRNZINbCFERG4/+g8bd+ee/ZkkaOPK9lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1748832459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=g0/4fziVUqDoiOgL2CY8n6tNgLH2MYiut6q+B6ULRik=; b=9zXDhykhNDlY3zJT9OJSZ9uZb3tRCW0jhf1SzN/n/JZgF191r/O83HPet56QZMbq3JAK6P kuMh7YwvyIj2gVsAebru+QIuJ73JUum7acGN6BZ+FaxlXaZaX9fm+FOwnoIwPWIRFJqO19 g6fK/1+EzJ76NoEIaFVu9aiLC9cW0QRQsNGRpculIKx/Nd6PZzSQ2ozsEUuSgUeGXOekSE /UeCnMKy8aWDGKmIFtBiB8tuyovghEpgBomuTEHBVBZXNVyVXcx36zsO9Fs9zzuBRwMBBx 3osahK7VR0GZWrD8Fj2rtLIff6XTomfLdDkPYFvmVp0GXF2Cf9QMp+nyfPedVg== ARC-Authentication-Results: i=1; rspamd-76569d6b7-xp8w6; auth=pass smtp.auth=dreamhost smtp.mailfrom=nomike@nomike.com X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com X-MC-Relay: Bad X-MailChannels-SenderId: dreamhost|x-authsender|nomike@nomike.com X-MailChannels-Auth-Id: dreamhost X-Share-Interest: 68ed330f060f36ac_1748832459767_4025445564 X-MC-Loop-Signature: 1748832459767:1335303854 X-MC-Ingress-Time: 1748832459767 Received: from pdx1-sub0-mail-a206.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.118.166.165 (trex/7.0.3); Mon, 02 Jun 2025 02:47:39 +0000 Received: from localhost (84-112-221-106.cable.dynamic.surfer.at [84.112.221.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nomike@nomike.com) by pdx1-sub0-mail-a206.dreamhost.com (Postfix) with ESMTPSA id 4b9dYR00BRzCT; Sun, 1 Jun 2025 19:47:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1748832459; bh=g0/4fziVUqDoiOgL2CY8n6tNgLH2MYiut6q+B6ULRik=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=K8nNZS6+rMyxEEe5M7gY/as8VyZ7pNmpZOFuFmhJtnAuk5fTt1ZDFiBTjMmkTujqm SLeisjtMY0x5CpQKWNx5nmfpqdjY08HhY/9id70AwrxPao4XLE7lvc4PjX3pS+Ifgh LS+SP1JM6IDKMjnMIOVcMLIlIRP71R1JUlemz4QQ/exJ+uJq6cq1mTalIz+5qwAyXn YkM9T8M/255/TJTS2bXWapHPwmgXwnGwLusqnsft8gnvMSHqmyENeZEoSAlkmwYykO 9NURdDSHInJsuNpOQp2VNHUM7YIn/Isn1z3fdWti6ODf4UStERbh/tp8pjQCzOizG8 kbpYJ5plrmjQg== From: nomike Date: Mon, 2 Jun 2025 04:45:51 +0200 Message-ID: <20250602024724.3282058-3-nomike@nomike.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602024724.3282058-1-nomike@nomike.com> References: <20250602024724.3282058-1-nomike@nomike.com> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Change-Id: Id59101442badbf8206d536b9c0124ba763ae26ff --- gnu/packages/graphics.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index e61b6bc0f6..e6ddd21727 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2209,7 +2209,8 @@ (define-public opensubdiv (license license:asl2.0))) (define-public opencsg - (let ((dot-to-dash (lambda (c) (if (char=? c #\.) #\- c)))) + (let ((dot-to-dash (lambda (c) + (if (char=? c #\.) #\- c)))) (package (name "opencsg") (version "1.8.1") @@ -2223,15 +2224,13 @@ (define-public opencsg "-release")))) (file-name (git-file-name name version)) (sha256 - (base32 - "0q19mswyjlampdssqgik4q7j08fbj0dhxdr9mzg0i7ma2b2rhdhw")))) + (base32 "0q19mswyjlampdssqgik4q7j08fbj0dhxdr9mzg0i7ma2b2rhdhw")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases ;; library has no tests (delete 'check)))) - (inputs - (list glew freeglut)) + (inputs (list glew freeglut)) (synopsis "Library for rendering Constructive Solid Geometry (CSG)") (description "OpenCSG is a library for rendering Constructive Solid Geometry (CSG) using From patchwork Mon Jun 2 02:45:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nomike X-Patchwork-Id: 42973 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 CC97827BC49; Mon, 2 Jun 2025 03:48:37 +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=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 CB37C27BC49 for ; Mon, 2 Jun 2025 03:48:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uLvDb-0001eb-CH; Sun, 01 Jun 2025 22:48:07 -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 1uLvDY-0001d8-5Q for guix-patches@gnu.org; Sun, 01 Jun 2025 22:48:04 -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 1uLvDX-0007ut-T3 for guix-patches@gnu.org; Sun, 01 Jun 2025 22:48:03 -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=ATstl1RY0QTTuq1m+SnE8bxZtDgLDZZ+3tRnCsL/zqE=; b=PsTTvMgZQJqMEIW0D1mUcxuyoXcVTQyLOqGrraJlpgzldinE8hFwa1YFuAy0suj4YA7yN8+9kewavjYTsijfwD5QkysDGLeJerSFpfhMjT5l6kKcsTd87g0PflchZJcnwuQrwvanGwgKj66HgZWhJK2TxJoeQejfVh92w5gSjFKvNCnN+O7qm4ub8kIKqj90rJULHnSQpr40XGS3iZ4z6v9clCuJc3xihuober8vwson4Y0UQQyBYveYBOwyNLu/tmgeTuN3ZzTCsT2RDUVxAfirjVboA3NDVYiIntokA6CK9mVpJawhNC2JWHD/nIc2588OIaXMyDEaFdAMkFuCeQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uLvDX-0008WE-LL for guix-patches@gnu.org; Sun, 01 Jun 2025 22:48:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78668] [PATCH v2 3/4] gnu: manifold: Update to 3.0.1-0.7c8fbe1 Resent-From: nomike Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jun 2025 02:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78668 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78668@debbugs.gnu.org Cc: nomike Received: via spool by 78668-submit@debbugs.gnu.org id=B78668.174883246732648 (code B ref 78668); Mon, 02 Jun 2025 02:48:03 +0000 Received: (at 78668) by debbugs.gnu.org; 2 Jun 2025 02:47:47 +0000 Received: from localhost ([127.0.0.1]:44778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uLvDH-0008UV-Bl for submit@debbugs.gnu.org; Sun, 01 Jun 2025 22:47:47 -0400 Received: from basenji.aspen.relay.mailchannels.net ([23.83.221.12]:62473) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uLvDE-0008U2-Vw for 78668@debbugs.gnu.org; Sun, 01 Jun 2025 22:47:45 -0400 X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 29F431C369E; Mon, 2 Jun 2025 02:47:43 +0000 (UTC) Received: from pdx1-sub0-mail-a206.dreamhost.com (trex-green-7.trex.outbound.svc.cluster.local [100.117.211.171]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id CB0871C2FBA; Mon, 2 Jun 2025 02:47:42 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1748832462; a=rsa-sha256; cv=none; b=IM6aNwakCYjYx3lWs27unKlBFUHMcwIOzN3S7zxiMERowKEq46hKv2wkLB3d4OneaLd2ot NxASlqqzK9CKisbUNUrJUT6wiOmC43BsZ20AnrPu1PjB2J9QE2fjG67Af6KNCWv+F2snuS 5Lkst2pG6DtzEg0FOWD8/APXjjdh5gBftzxao3zPhCePWxiQdsDsS/O8hjfuGaRIbv+pwD 6uF8Obrkwa9feGK0gICmYd/JzBJdfCbaAxI8MLTeAg53QgK1xZGvdOtYcMGw0VNi9VtXGM VsaDon2s7zksVloO9gTW8XBhobTy8Y5TEzn3l6+AO07Gin6FzjkPK6hHanEVpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1748832462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ATstl1RY0QTTuq1m+SnE8bxZtDgLDZZ+3tRnCsL/zqE=; b=GYIiR5k0BwZ59MCVQSOrWxSIj6uFOp34G0x6nsM+qtqSNiGVYiSF+fhrBuZaaXT2allyhw sxgWBAvVQEp2loKqdC6+YRk2EFukpkGq9gnDTL8BeUJJEa/+NR4iMg7eGrxpKA3WZ//GNA bX2yWUJpSMlH7jssYNuUCYWvoKApCPuoyWXMe0yDT6g5EyrZl+A5vnnv/uDw5LrG93M5jf 42YVIICjnCtTk4gBqsvT1VDZtZFPFAdONLxhobaSR8KGCFBqUK/C8xuTwnO62HEgpqYgnw pUqZoWqSfiKb9VZUaxx0J3HWO8kwfCsoREtIf1DEtJDdd9IThpTKTD1HGLvQRw== ARC-Authentication-Results: i=1; rspamd-76569d6b7-vzwq6; auth=pass smtp.auth=dreamhost smtp.mailfrom=nomike@nomike.com X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com X-MC-Relay: Bad X-MailChannels-SenderId: dreamhost|x-authsender|nomike@nomike.com X-MailChannels-Auth-Id: dreamhost X-Obese-Duck: 7b00e298099077c2_1748832463063_1575488628 X-MC-Loop-Signature: 1748832463063:1067624024 X-MC-Ingress-Time: 1748832463063 Received: from pdx1-sub0-mail-a206.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.117.211.171 (trex/7.0.3); Mon, 02 Jun 2025 02:47:43 +0000 Received: from localhost (84-112-221-106.cable.dynamic.surfer.at [84.112.221.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nomike@nomike.com) by pdx1-sub0-mail-a206.dreamhost.com (Postfix) with ESMTPSA id 4b9dYV273pzCT; Sun, 1 Jun 2025 19:47:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1748832462; bh=ATstl1RY0QTTuq1m+SnE8bxZtDgLDZZ+3tRnCsL/zqE=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=GYhSmaretzcNrvsYq3FrvklyCWpO8FPC9YtA4O0Tc5tLjlBFsKJLYuGNUt1bQl4Lw 0BwpC8A+5+7M4sggvIqpYVypWbvWWMj2XjXoeq6ONhBahQjEZbGsyE/P+6SyaaqQ6a BMIpPar5CsqcT0LAJ0R7MQRM67g8XlVZwRyaH/djxKhS436mN20Fr3aNZGcw5c7OqJ hUR2LvmEmRFXp/GQrf2o27kYxFWv8hnOeODTqut1vvumjb7nyHipbal4WFyrIXU4j3 wMd5AWlORcuO9GKlLCzo2HCRBKGT6GCMkVLkk9UnTpWdMgxg+wgr3Mguy63B8QnQfV a7+dstQ14wKdA== From: nomike Date: Mon, 2 Jun 2025 04:45:52 +0200 Message-ID: <20250602024724.3282058-4-nomike@nomike.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602024724.3282058-1-nomike@nomike.com> References: <20250602024724.3282058-1-nomike@nomike.com> MIME-Version: 1.0 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: , 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/engineering.scm (manifold): Update to commit 7c8fbe. OpenSCAD is currently the only dependant on this package and some tests will fail with version 3.0.1 of manifold whereas some other tests will fail with the most recent version 3.1.1. The OpenSCAD project currently uses that commit of manifold itself. Change-Id: Id9524d8d436a5e6a830867a4c7a28c3436219341 --- gnu/packages/engineering.scm | 47 +++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 8b1332e186..32427568e5 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2924,32 +2924,35 @@ (define-public lib3mf (license license:bsd-2))) (define-public manifold - (package - (name "manifold") - (version "3.0.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/elalish/manifold") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1f0k8937gk7b9100k99pmz1f17nzczpdk7797p2aijla0z29ddy1")))) - (build-system cmake-build-system) - (inputs (list tbb clipper2 assimp python-nanobind googletest)) - (arguments - ;; can be removed when emscripten is packaged - `(#:configure-flags '("-DMANIFOLD_JSBIND=OFF"))) - (synopsis "Geometry library for topological robustness") - (description - "Manifold is a geometry library dedicated to creating and operating on + (let ((commit "7c8fbe186aa1ac5eb73f12c28bdef093ee4d11c9") + (version "3.0.1") + (revision "0")) + (package + (name "manifold") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elalish/manifold") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09s4r4hlarl5lzbbihfd1fpfd3987lma5m26wkkvi7zssdbis9zc")))) + (build-system cmake-build-system) + (inputs (list tbb clipper2 assimp python-nanobind googletest)) + (arguments + ;; can be removed once emscripten is packaged + `(#:configure-flags '("-DMANIFOLD_JSBIND=OFF"))) + (synopsis "Geometry library for topological robustness") + (description + "Manifold is a geometry library dedicated to creating and operating on manifold triangle meshes. A manifold mesh is a mesh that represents a solid object, and so is very important in manufacturing, CAD, structural analysis, etc.. Manifold also supports arbitrary vertex properties and enables mapping of materials for rendering use-cases.") - (home-page "https://github.com/elalish/manifold") - (license license:asl2.0))) + (home-page "https://github.com/elalish/manifold") + (license license:asl2.0)))) (define-public python-keithley2600 (package From patchwork Mon Jun 2 02:45:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nomike X-Patchwork-Id: 42976 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 5BF1527BC49; Mon, 2 Jun 2025 03:48: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 CCD8527BC4A for ; Mon, 2 Jun 2025 03:48:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uLvDh-0001f2-AR; Sun, 01 Jun 2025 22:48:13 -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 1uLvDY-0001dG-Ko for guix-patches@gnu.org; Sun, 01 Jun 2025 22:48:04 -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 1uLvDY-0007uy-C5 for guix-patches@gnu.org; Sun, 01 Jun 2025 22:48:04 -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=HUcJpJqUe1XCkpUiuDIXBYHT3FN32o3E9qs1uX5Akc8=; b=pHLY4VpETFS0H9R2ucJ93LHVHMh5l6zhfA9XCfyWnltroAUmbTMGrGmDiI/ZYJnNL0KtyL+SauUCJAJVkSDS0puSegnZmqqSQkQ8uxU5VAzFwC0Eqmc0tBOU1IAbTdnXSirnlUODrDrl528kRVm+0z20nGZcAvgOF2mqirg2Xv+7X0ncD1q+/AROk9fW0Yies+fXJF7kmZUg00NDof6Qvo2JtRQf/lg0QtXmEtRkcCLheVZUF6XTE55BA1cJu0hdtXkgIpak19go2RqWeCKbAcgvs3uU1/BEoTcfMzyNX/qP61aOGkBw5m6ds8f+n60lr5TGO8St237+xl6hIY3EvQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uLvDY-0008WN-6C for guix-patches@gnu.org; Sun, 01 Jun 2025 22:48:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78668] [PATCH v2 4/4] gnu: openscad: Update to 2025.06.01 Resent-From: nomike Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jun 2025 02:48:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78668 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78668@debbugs.gnu.org Cc: nomike Received: via spool by 78668-submit@debbugs.gnu.org id=B78668.174883247232672 (code B ref 78668); Mon, 02 Jun 2025 02:48:04 +0000 Received: (at 78668) by debbugs.gnu.org; 2 Jun 2025 02:47:52 +0000 Received: from localhost ([127.0.0.1]:44781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uLvDK-0008Up-TG for submit@debbugs.gnu.org; Sun, 01 Jun 2025 22:47:52 -0400 Received: from cheetah.banana.relay.mailchannels.net ([23.83.217.34]:38659) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uLvDH-0008UR-8x for 78668@debbugs.gnu.org; Sun, 01 Jun 2025 22:47:48 -0400 X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 1AEA81824A7; Mon, 2 Jun 2025 02:47:46 +0000 (UTC) Received: from pdx1-sub0-mail-a206.dreamhost.com (100-117-153-205.trex-nlb.outbound.svc.cluster.local [100.117.153.205]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id C66611821AD; Mon, 2 Jun 2025 02:47:45 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1748832465; a=rsa-sha256; cv=none; b=wn3nJx4fPZT+cMAtshPBciRPdN78e4erqD2KlDRdXdkdsLgd4zFYfkBv/H7hupSeO6zb/D tsfrOieLoLREDRGg15n1iKHFKtx+3Ub3dWRmlv5mXieM5xWcv4FX83dt2PnfJOL5KhPaey vvAp90IzIu3eruVJB57RTtTE8utRXHAVh14ZL1+GDHRaiauNp9zQFm2D8WHr8k1OmYTMTK T89Aw+77e9rORGzLMoXmySjSTtnp+mGTWYLUUt0JwfP6Gk0iSb1BWy3d2Xb/3xxzy4v4d3 CqjJQZohXn6kEb5qROVfBDcFADFaRkumKaXHfP4YH6KEuWTRi6XFqeqK48Qtlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1748832465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=HUcJpJqUe1XCkpUiuDIXBYHT3FN32o3E9qs1uX5Akc8=; b=GEkS7B+b3MOP7UNDQCZ8n0zPV9MSyCRDqSujcinjAVK1AILp4eaTj2wk+9XdGWeBHG/Sp4 R5TB+DcObrHm0ijUWAzSon+1nZnModHiRtp+s8OcZVpeA2SZqL8/E47zs0UjnZ8FRFfYW0 53kE9ZyKjsBoHly+s4Kn2shOdDwoTRhrfCb1IjSvnDcJgIu7YF9l8SUiczVOjZg4KRvBKR n6qCIZnjQHCrO683xQlBjsZnSxVbEAekFHvDm1K7aYsBhaCE2aMxcU9JTKAExnKHjP8l4q Cmsax0tFR3K17TamLjcPTrlsGidge/zjK5hgv+2FULk9emLTBvfTadPz/sKYBA== ARC-Authentication-Results: i=1; rspamd-76569d6b7-8kvd6; auth=pass smtp.auth=dreamhost smtp.mailfrom=nomike@nomike.com X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com X-MC-Relay: Bad X-MailChannels-SenderId: dreamhost|x-authsender|nomike@nomike.com X-MailChannels-Auth-Id: dreamhost X-Hysterical-Sponge: 54be0dbd06fdc67f_1748832466055_3831126296 X-MC-Loop-Signature: 1748832466055:1788394595 X-MC-Ingress-Time: 1748832466054 Received: from pdx1-sub0-mail-a206.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.117.153.205 (trex/7.0.3); Mon, 02 Jun 2025 02:47:46 +0000 Received: from localhost (84-112-221-106.cable.dynamic.surfer.at [84.112.221.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nomike@nomike.com) by pdx1-sub0-mail-a206.dreamhost.com (Postfix) with ESMTPSA id 4b9dYY21qjzBZ; Sun, 1 Jun 2025 19:47:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1748832465; bh=HUcJpJqUe1XCkpUiuDIXBYHT3FN32o3E9qs1uX5Akc8=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=QplDkjbXJIhhcZZFBNdJcpVTJwgvQRup/tX9im8W75vRlcVHH/jdxJ0u0ODd2CfRk sasxgtMjXQPMrpgSFrCtS/LBsTDOXQLFyHfugr/Wjqau8JydTKGBQbRI4aaRcnaS9o YYq9bkjxhEqK53fvr2MxNlxJfsVJV4SkzRr52rLWKqqVPOH47FznYd4baZUTokAHD5 jG45vLsb7+MRLo7hzKoP2g2LuZknYfRf4IA4JRjCofMiXI47D8djrg6wC3RZldN+dV mIe3Mxun1OW9BCaycPm2whiDfVVzw4nUjtLmK9zZEXkT5pC9mFPkICs10jEqukPPsV ZFsZw9WlYtSnQ== From: nomike Date: Mon, 2 Jun 2025 04:45:53 +0200 Message-ID: <20250602024724.3282058-5-nomike@nomike.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602024724.3282058-1-nomike@nomike.com> References: <20250602024724.3282058-1-nomike@nomike.com> MIME-Version: 1.0 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: , 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/engineering.scm (openscad): Update to 2025.06.01, unundle bundles libraries, fix all tests, properly comment all fixes currently in place including links to upstream tickets. Change-Id: Iec0e9201732a814af20e73a43ebc76bfaac494bb --- gnu/packages/engineering.scm | 58 ++++++--- ...cted-test-results-to-acommodate-diff.patch | 117 ++++++++++++++++++ 2 files changed, 158 insertions(+), 17 deletions(-) create mode 100644 gnu/packages/patches/openscad-fix-path-in-expected-test-results-to-acommodate-diff.patch diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 32427568e5..24bba7e9c4 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3189,8 +3189,8 @@ (define-public python-lcapy (license license:lgpl2.1+))) (define-public openscad - (let ((commit "72c9919d63116f8e711f3566ae34e9eb63a2d6e6") - (version "2025.05.08") + (let ((commit "7245089d3226de41ab55faee62ffe326f6efcb69") + (version "2025.06.01") (revision "0")) (package (name "openscad") @@ -3201,23 +3201,27 @@ (define-public openscad (uri (git-reference (url "https://github.com/openscad/openscad") (commit commit) + ;; Needed for libraries/MCAD, a library specific to OpenSCAD + ;; which is included as a submodule. All other libraries are + ;; deleted in the patch-source build phase. (recursive? #t))) (sha256 - (base32 "077x7s3z65mz6rnrzan3qn06045d2fkqnd6ss6ibw1fhlaypzfbf")) + (base32 "0lynjxa5y9wi443vxgaj2r8lr98dyfxinq7n4gcw9gz7cfc52a4a")) + (patches (search-patches + "openscad-fix-path-in-expected-test-results-to-acommodate-diff.patch")) (file-name (git-file-name name version)))) (build-system qt-build-system) (arguments (list #:configure-flags #~(list "-DCMAKE_BUILD_TYPE=Release" - "-DUSE_BUILTIN_OPENCSG=ON" + "-DUSE_BUILTIN_CLIPPER2=OFF" + "-DUSE_BUILTIN_MANIFOLD=OFF" + "-DUSE_BUILTIN_OPENCSG=OFF" "-DMANIFOLD_PYBIND=OFF" "-DMANIFOLD_TEST=OFF" - "-DENABLE_TESTS=OFF" "-DEXPERIMENTAL=ON" - "-DSNAPSHOT=ON" "-DENABLE_PYTHON=ON" - "-DUSE_BUILTIN_CLIPPER2=OFF" (string-append "-DOPENSCAD_VERSION=" #$version) (string-append "-DOPENSCAD_COMMIT=" @@ -3226,27 +3230,47 @@ (define-public openscad "-DENABLE_GLX=ON") #:phases #~(modify-phases %standard-phases - (delete 'check) (add-after 'unpack 'patch-source (lambda* (#:key inputs #:allow-other-keys) - ;; + ;; Delete all unbundled libraries to replace them with guix + ;; packages. + (delete-file-recursively "submodules") + ;; Fix: Dependency lib3mf is not found due to using a wrong + ;; variable name in the CMake config (see + ;; https://github.com/openscad/openscad/issues/5877). (substitute* "cmake/Modules/FindLib3MF.cmake" (("PC_LIB3MF_INCLUDE_DIRS") "PC_LIB3MF_INCLUDEDIR")) (substitute* "CMakeLists.txt" - ;; + ;; Remove bundled libraries from cmake. + (("add_subdirectory\\(submodules\\)") + "") + ;; Fix detection of EGL (see + ;; https://github.com/openscad/openscad/issues/5880). (("target_link_libraries\\(OpenSCAD PRIVATE OpenGL::EGL\\)") - " find_package(ECM REQUIRED NO_MODULE) + "find_package(ECM REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package(EGL REQUIRED) target_link_libraries(OpenSCAD PRIVATE EGL::EGL)") - ;; - (("find_package\\(Nettle 3.4\\)") - "find_package(Nettle 3.4 REQUIRED)") ;; Use the system sanitizers-cmake module. (("\\$\\{CMAKE_SOURCE_DIR\\}/submodules/sanitizers-cmake/cmake") (string-append (assoc-ref inputs "sanitizers-cmake") - "/share/sanitizers-cmake/cmake")))))))) + "/share/sanitizers-cmake/cmake"))) + ;; Fix test-tool expecting build directory to be a direct + ;; subdirectory of the source directory (see + ;; https://github.com/openscad/openscad/issues/5937). + (substitute* "tests/test_cmdline_tool.py" + (("build_to_test_sources = \"../../tests\"") + "build_to_test_sources = \"../../source/tests\"")))) + (add-before 'check 'patch-tests + (lambda _ + ;; Fix tests expecting build directory to be a direct descendant + ;; of the source dir (see + ;; https://github.com/openscad/openscad/issues/5938). + (copy-recursively "../source/color-schemes" "./color-schemes") + (copy-recursively "../source/shaders" "./shaders") + ;; Required for fontconfig + (setenv "HOME" "/tmp")))))) (inputs (list boost cairomm cgal @@ -3267,7 +3291,7 @@ (define-public openscad libxml2 libzip manifold - mesa ; or libglvnd if we had mesa-glvnd, too + mesa mimalloc mpfr nettle @@ -3275,9 +3299,9 @@ (define-public openscad python python-numpy python-pillow - python-pip qscintilla qtbase-5 + qtgamepad qtmultimedia-5 qtsvg-5 qtwayland-5 diff --git a/gnu/packages/patches/openscad-fix-path-in-expected-test-results-to-acommodate-diff.patch b/gnu/packages/patches/openscad-fix-path-in-expected-test-results-to-acommodate-diff.patch new file mode 100644 index 0000000000..595acb8a68 --- /dev/null +++ b/gnu/packages/patches/openscad-fix-path-in-expected-test-results-to-acommodate-diff.patch @@ -0,0 +1,117 @@ +From 4fd0053f89728d03c3123c9473c36209556d1018 Mon Sep 17 00:00:00 2001 +From: nomike +Date: Sat, 31 May 2025 23:54:08 +0200 +Subject: [PATCH] Fix path in expected test results to acommodate different + directory structure in guix build + (see https://github.com/openscad/openscad/issues/5938) +--- + .../echo/bitwise-operators-expected.echo | 10 +++++----- + .../echo/include-recursive-test-expected.echo | 18 +++++++++--------- + .../echo/include-tests-expected.echo | 8 ++++---- + tests/regression/echo/linenumber-expected.echo | 18 +++++++++--------- + tests/regression/echo/use-tests-expected.echo | 8 ++++---- + 5 files changed, 31 insertions(+), 31 deletions(-) + +diff --git a/tests/regression/echo/bitwise-operators-expected.echo b/tests/regression/echo/bitwise-operators-expected.echo +index d85a95915..91f3155ba 100644 +--- a/tests/regression/echo/bitwise-operators-expected.echo ++++ b/tests/regression/echo/bitwise-operators-expected.echo +@@ -1,8 +1,8 @@ +-WARNING: Hexadecimal constant "0x10000000000000000" too large in file ../../tests/data/scad/functions/bitwise-operators.scad, line 106 +-WARNING: Integer "0x1000000000000001" cannot be represented precisely in file ../../tests/data/scad/functions/bitwise-operators.scad, line 108 +-WARNING: Integer "1152921504606846977" cannot be represented precisely in file ../../tests/data/scad/functions/bitwise-operators.scad, line 109 +-WARNING: Integer "0xfffffffffffffff0" cannot be represented precisely in file ../../tests/data/scad/functions/bitwise-operators.scad, line 113 +-WARNING: Integer "18446744073709551600" cannot be represented precisely in file ../../tests/data/scad/functions/bitwise-operators.scad, line 113 ++WARNING: Hexadecimal constant "0x10000000000000000" too large in file ../../source/tests/data/scad/functions/bitwise-operators.scad, line 106 ++WARNING: Integer "0x1000000000000001" cannot be represented precisely in file ../../source/tests/data/scad/functions/bitwise-operators.scad, line 108 ++WARNING: Integer "1152921504606846977" cannot be represented precisely in file ../../source/tests/data/scad/functions/bitwise-operators.scad, line 109 ++WARNING: Integer "0xfffffffffffffff0" cannot be represented precisely in file ../../source/tests/data/scad/functions/bitwise-operators.scad, line 113 ++WARNING: Integer "18446744073709551600" cannot be represented precisely in file ../../source/tests/data/scad/functions/bitwise-operators.scad, line 113 + ECHO: "Expect two warnings:" + WARNING: undefined operation (number | bool) in file bitwise-operators.scad, line 42 + WARNING: undefined operation (bool | number) in file bitwise-operators.scad, line 44 +diff --git a/tests/regression/echo/include-recursive-test-expected.echo b/tests/regression/echo/include-recursive-test-expected.echo +index c20e44cbe..855c16d10 100644 +--- a/tests/regression/echo/include-recursive-test-expected.echo ++++ b/tests/regression/echo/include-recursive-test-expected.echo +@@ -1,12 +1,12 @@ +-WARNING: Can't open include file 'include-recursive-test.scad'. in file ../../tests/data/scad/misc/include-recursive-test.scad, line 1 +-WARNING: Can't open include file '../misc/include-recursive-test.scad'. in file ../../tests/data/scad/misc/include-recursive-test.scad, line 2 +-WARNING: Can't open include file '../../scad/misc/include-recursive-test.scad'. in file ../../tests/data/scad/misc/include-recursive-test.scad, line 3 +-WARNING: Can't open include file 'include-recursive-test.scad'. in file ../../tests/data/scad/misc/include-recursive-test.scad, line 1 +-WARNING: Can't open include file '../misc/include-recursive-test.scad'. in file ../../tests/data/scad/misc/include-recursive-test.scad, line 2 +-WARNING: Can't open include file '../../scad/misc/include-recursive-test.scad'. in file ../../tests/data/scad/misc/include-recursive-test.scad, line 3 +-WARNING: Can't open include file 'include-recursive-test.scad'. in file ../../tests/data/scad/misc/include-recursive-test.scad, line 1 +-WARNING: Can't open include file '../misc/include-recursive-test.scad'. in file ../../tests/data/scad/misc/include-recursive-test.scad, line 2 +-WARNING: Can't open include file '../../scad/misc/include-recursive-test.scad'. in file ../../tests/data/scad/misc/include-recursive-test.scad, line 3 ++WARNING: Can't open include file 'include-recursive-test.scad'. in file ../../source/tests/data/scad/misc/include-recursive-test.scad, line 1 ++WARNING: Can't open include file '../misc/include-recursive-test.scad'. in file ../../source/tests/data/scad/misc/include-recursive-test.scad, line 2 ++WARNING: Can't open include file '../../scad/misc/include-recursive-test.scad'. in file ../../source/tests/data/scad/misc/include-recursive-test.scad, line 3 ++WARNING: Can't open include file 'include-recursive-test.scad'. in file ../../source/tests/data/scad/misc/include-recursive-test.scad, line 1 ++WARNING: Can't open include file '../misc/include-recursive-test.scad'. in file ../../source/tests/data/scad/misc/include-recursive-test.scad, line 2 ++WARNING: Can't open include file '../../scad/misc/include-recursive-test.scad'. in file ../../source/tests/data/scad/misc/include-recursive-test.scad, line 3 ++WARNING: Can't open include file 'include-recursive-test.scad'. in file ../../source/tests/data/scad/misc/include-recursive-test.scad, line 1 ++WARNING: Can't open include file '../misc/include-recursive-test.scad'. in file ../../source/tests/data/scad/misc/include-recursive-test.scad, line 2 ++WARNING: Can't open include file '../../scad/misc/include-recursive-test.scad'. in file ../../source/tests/data/scad/misc/include-recursive-test.scad, line 3 + ECHO: "INC" + ECHO: "INC" + ECHO: "INC" +diff --git a/tests/regression/echo/include-tests-expected.echo b/tests/regression/echo/include-tests-expected.echo +index d0aaecf88..64098d5d6 100644 +--- a/tests/regression/echo/include-tests-expected.echo ++++ b/tests/regression/echo/include-tests-expected.echo +@@ -1,6 +1,6 @@ +-WARNING: Can't open include file 'not_exist.scad'. in file ../../tests/data/scad/misc/sub1/included.scad, line 3 +-WARNING: Can't open include file 'non/existent/path/non-file'. in file ../../tests/data/scad/misc/include-tests.scad, line 8 +-WARNING: Can't open include file 'test/'. in file ../../tests/data/scad/misc/include-tests.scad, line 20 +-WARNING: Can't open include file '/'. in file ../../tests/data/scad/misc/include-tests.scad, line 23 ++WARNING: Can't open include file 'not_exist.scad'. in file ../../source/tests/data/scad/misc/sub1/included.scad, line 3 ++WARNING: Can't open include file 'non/existent/path/non-file'. in file ../../source/tests/data/scad/misc/include-tests.scad, line 8 ++WARNING: Can't open include file 'test/'. in file ../../source/tests/data/scad/misc/include-tests.scad, line 20 ++WARNING: Can't open include file '/'. in file ../../source/tests/data/scad/misc/include-tests.scad, line 23 + ECHO: "included.scad" + ECHO: "included2.scad" +diff --git a/tests/regression/echo/linenumber-expected.echo b/tests/regression/echo/linenumber-expected.echo +index 35a74ebe0..f243ae2c0 100644 +--- a/tests/regression/echo/linenumber-expected.echo ++++ b/tests/regression/echo/linenumber-expected.echo +@@ -1,12 +1,12 @@ +-WARNING: Can't open library 'line 1'. in file ../../tests/data/scad/misc/linenumber.scad, line 1 +-WARNING: Can't open include file 'line 1'. in file ../../tests/data/scad/misc/linenumber.scad, line 1 +-WARNING: new lines in 'include<>'-statement is not defined - behavior may change in the future in file ../../tests/data/scad/misc/linenumber.scad, line 7 +-WARNING: new lines in 'include<>'-statement is not defined - behavior may change in the future in file ../../tests/data/scad/misc/linenumber.scad, line 8 +-WARNING: new lines in 'include<>'-statement is not defined - behavior may change in the future in file ../../tests/data/scad/misc/linenumber.scad, line 9 +-WARNING: new lines in 'include<>'-statement is not defined - behavior may change in the future in file ../../tests/data/scad/misc/linenumber.scad, line 10 +-WARNING: Can't open include file 'line 9'. in file ../../tests/data/scad/misc/linenumber.scad, line 10 +-WARNING: new lines 'use<>'-statement is not defined - behavior may change in the future in file ../../tests/data/scad/misc/linenumber.scad, line 16 +-WARNING: Can't open library 'line 16'. in file ../../tests/data/scad/misc/linenumber.scad, line 16 ++WARNING: Can't open library 'line 1'. in file ../../source/tests/data/scad/misc/linenumber.scad, line 1 ++WARNING: Can't open include file 'line 1'. in file ../../source/tests/data/scad/misc/linenumber.scad, line 1 ++WARNING: new lines in 'include<>'-statement is not defined - behavior may change in the future in file ../../source/tests/data/scad/misc/linenumber.scad, line 7 ++WARNING: new lines in 'include<>'-statement is not defined - behavior may change in the future in file ../../source/tests/data/scad/misc/linenumber.scad, line 8 ++WARNING: new lines in 'include<>'-statement is not defined - behavior may change in the future in file ../../source/tests/data/scad/misc/linenumber.scad, line 9 ++WARNING: new lines in 'include<>'-statement is not defined - behavior may change in the future in file ../../source/tests/data/scad/misc/linenumber.scad, line 10 ++WARNING: Can't open include file 'line 9'. in file ../../source/tests/data/scad/misc/linenumber.scad, line 10 ++WARNING: new lines 'use<>'-statement is not defined - behavior may change in the future in file ../../source/tests/data/scad/misc/linenumber.scad, line 16 ++WARNING: Can't open library 'line 16'. in file ../../source/tests/data/scad/misc/linenumber.scad, line 16 + WARNING: Unable to convert cube(size="line 3", ...) parameter to a number or a vec3 of numbers in file linenumber.scad, line 3 + WARNING: Unable to convert cube(size="line 12", ...) parameter to a number or a vec3 of numbers in file linenumber.scad, line 12 + WARNING: Unable to convert cube(size="line 18", ...) parameter to a number or a vec3 of numbers in file linenumber.scad, line 18 +diff --git a/tests/regression/echo/use-tests-expected.echo b/tests/regression/echo/use-tests-expected.echo +index 2da158d03..1cfa234e7 100644 +--- a/tests/regression/echo/use-tests-expected.echo ++++ b/tests/regression/echo/use-tests-expected.echo +@@ -1,7 +1,7 @@ +-WARNING: Can't open library ''. in file ../../tests/data/scad/misc/use-tests.scad, line 2 +-WARNING: Can't open library 'non/existent/path/non-file'. in file ../../tests/data/scad/misc/use-tests.scad, line 8 +-WARNING: Can't open library 'test/'. in file ../../tests/data/scad/misc/use-tests.scad, line 20 +-WARNING: Can't open library '/'. in file ../../tests/data/scad/misc/use-tests.scad, line 23 ++WARNING: Can't open library ''. in file ../../source/tests/data/scad/misc/use-tests.scad, line 2 ++WARNING: Can't open library 'non/existent/path/non-file'. in file ../../source/tests/data/scad/misc/use-tests.scad, line 8 ++WARNING: Can't open library 'test/'. in file ../../source/tests/data/scad/misc/use-tests.scad, line 20 ++WARNING: Can't open library '/'. in file ../../source/tests/data/scad/misc/use-tests.scad, line 23 + WARNING: Ignoring unknown module 'test3' in file use-tests.scad, line 42 + WARNING: Ignoring unknown module 'test4' in file use-tests.scad, line 43 + WARNING: Ignoring unknown variable "test2_variable" in file use-tests.scad, line 49 +-- +2.49.0