From patchwork Mon Jun 2 02:12:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nomike X-Patchwork-Id: 42969 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 44E5227BC4D; Mon, 2 Jun 2025 03:13:30 +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 7FF6E27BC49 for ; Mon, 2 Jun 2025 03:13:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uLufi-0005OE-Mo; Sun, 01 Jun 2025 22:13: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 1uLufg-0005NP-2w for guix-patches@gnu.org; Sun, 01 Jun 2025 22:13: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 1uLuff-000523-58 for guix-patches@gnu.org; Sun, 01 Jun 2025 22:13: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:Date:From:To:In-Reply-To:References:Subject; bh=zZGJCxkwvFh4HgQHvlVW8cAq01ti24eYlPhizcoPiwo=; b=AtKL2cLNdi8JLn2cSdrstKHihliW2VQHQ7zs/0eAQJFv2NNq/d5dVPue9eRmUoto7hrXGeoKGf+RNKedXm3I+6149C9hAHj2+WXwTFGZbRCZ5nWQTFzWTkDh2BpHMhnHuGtc9P1wfhcVP7KfBnoBAmLTmtsu3m3pBoAg7aJbrGIXtU6xQCC1upapw7wyQxDyCYCufKQKSQfxSrjbSOL5bBWDYvPI9E68S8BFRVGOhm9aSrXS26h/rOlhnZ3EeLGSRCsNNar/PDpLcjCUKourQNfcMbXVXYV4n4mWqaxC6yn9TN4aJXrvq+duPBcbdDyAqDm+/AJ7NBueo8z+ehvW3A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uLufd-00062B-Vt for guix-patches@gnu.org; Sun, 01 Jun 2025 22:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78668] [PATCH 1/4] gnu: opencsg: Update to 1.8.2 References: <20250602020916.3217860-1-nomike@nomike.com> In-Reply-To: <20250602020916.3217860-1-nomike@nomike.com> Resent-From: nomike Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jun 2025 02:13:01 +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.174883036823111 (code B ref 78668); Mon, 02 Jun 2025 02:13:01 +0000 Received: (at 78668) by debbugs.gnu.org; 2 Jun 2025 02:12:48 +0000 Received: from localhost ([127.0.0.1]:44527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uLufQ-00060h-4T for submit@debbugs.gnu.org; Sun, 01 Jun 2025 22:12:48 -0400 Received: from black.aspen.relay.mailchannels.net ([23.83.221.19]:33847) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uLufN-00060L-GK for 78668@debbugs.gnu.org; Sun, 01 Jun 2025 22:12:46 -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 B6A682C5466; Mon, 2 Jun 2025 02:12:43 +0000 (UTC) Received: from pdx1-sub0-mail-a206.dreamhost.com (100-126-10-237.trex-nlb.outbound.svc.cluster.local [100.126.10.237]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 414532C5446; Mon, 2 Jun 2025 02:12:43 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1748830363; a=rsa-sha256; cv=none; b=JiARu+Q/c5GBKPQXzSpUoA2QBMI31MaFVn6Q0Ux8F9GsxEobXwPc9F7FkHiX/efsH+2iCF lwfO0BHM61reoyAfs72S9TT5M5jpTXOJGg9nol1ZwerlmW9GMR1vaIwuzM5Hax7W5fVehC +g2K1VojyC4tqjTdjGRrn7D7oHQUyKRY6uCjYFlP9f3OlqpWvYZ3SRNWAaIpSjaUXjrPXk tUbFUurpAAFPaatpQz3ewh/hQ5NwAG6hFS62opOXoJ7YottsSGbUbHfPWi6MxwPUq6UfjI QKJo+r+sCvuj427Gc9lc9l+KPmMURILWT0m0rcnkPtEvqaUt9Ce0kq6GLa4SQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1748830363; 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:dkim-signature; bh=zZGJCxkwvFh4HgQHvlVW8cAq01ti24eYlPhizcoPiwo=; b=VCDcrbQRSCpbtO09fYZSnEwn9vFiNyvv/WDH7Ye7ESDc32OsJtLysryEdJ0+Rfr/2gVMjR xBh41NlRg3VFKRDU3NgH3oWp6nlnfn4eUJgBchFM8qrYKoCWSUwOn/+u2Vk6tIsDolS6Ti WHBToiOP7i1qmvabsL6dyE06NeGAG4rwxas1Lp2sr/lmQFOF4KfO7dAdiufoBf4UGTvTGD YBscFNMs4QTT/HADEmTrQuzuRiqNC5h6c4K7xIfdIL/dKdRYRu+1m1EPRnYshU+AnwIKDX Iggy3Rbt3CEU9QOB48RNlz93kcIzJiNz7HTFMYFqsSEFIvZ2cPc6rIhajCvtmw== ARC-Authentication-Results: i=1; rspamd-cc9cfccc-qlhnx; 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-Abaft-Celery: 171c7b9822d25a80_1748830363493_240146424 X-MC-Loop-Signature: 1748830363493:1929541854 X-MC-Ingress-Time: 1748830363493 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.126.10.237 (trex/7.0.3); Mon, 02 Jun 2025 02:12: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 4b9cn65B0qzC9; Sun, 1 Jun 2025 19:12:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1748830363; bh=zZGJCxkwvFh4HgQHvlVW8cAq01ti24eYlPhizcoPiwo=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=N8e/czV1H0THQHlGlLEReuYOjeUItTCjk5u+4+rAtZULKgfMPnnRJbkTosR3LI7yp WtMsc9g+qNjiuAONqgHKu72qDNsTJpjSoDFnTqvMNPmsOOnL2m5u346+8Vgb8bgZgB nLD6KRH3OHHAIbngtMjXTR7gzQGmiN4RjzD/JZO3K0v8UAK3atwlloXVMJwH6a0DBB Tb3DYhTsaMjcxkXQvC90NbICZmp7aIvuppVusNSo4hg4e80LqW0OUPM66JrVRfKLN3 6Yf1fpwxf5AjU39cehWYeUlX60QRcR+3+vcgugJvpK4GQQq1pfN4PToIvJygVsi+dM Zj9GrAgauYivA== From: nomike Date: Mon, 2 Jun 2025 04:12:27 +0200 Message-ID: <20250602021230.3231771-1-nomike@nomike.com> X-Mailer: git-send-email 2.49.0 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:12:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nomike X-Patchwork-Id: 42970 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 B7B1827BC4B; Mon, 2 Jun 2025 03:13:35 +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 4727127BC49 for ; Mon, 2 Jun 2025 03:13:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uLufi-0005OC-7B; Sun, 01 Jun 2025 22:13: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 1uLufe-0005NB-Ta for guix-patches@gnu.org; Sun, 01 Jun 2025 22:13: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 1uLufe-000524-Kf for guix-patches@gnu.org; Sun, 01 Jun 2025 22:13:02 -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=NSIOi2bo9kOJdLozZ+08u0ftxSwCevisuyYslaMBQhrXrIdSCBHO0vunkYUt1yZLxPSPMdtWB9qaJuQl8b/7q1Hz1jPvjSk5EcMgjUTd6dcDnYWAWA4QCh3wlopo4le/i6cWjqPQoP8MSgEX6pbHqo5oqQh/G/4/2gEVs5DfocWRgc5fVLdNa8sjt/w5uJoSq/25FLK4JYE5xe1NiqZvjwioHsCbF6gTwj/SmNGHDosNoctOliMrsWkRd7Fw4/ek7erXhCT1At8+GO26eMZWSHuLH0ceibWpUhBesDVPAbgTcxd4ojMkGxumRpiPeq0mdQJlwkreV46XWCVQnqW0gg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uLufe-00062J-EM for guix-patches@gnu.org; Sun, 01 Jun 2025 22:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78668] [PATCH 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:13: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.174883037223138 (code B ref 78668); Mon, 02 Jun 2025 02:13:02 +0000 Received: (at 78668) by debbugs.gnu.org; 2 Jun 2025 02:12:52 +0000 Received: from localhost ([127.0.0.1]:44530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uLufT-000616-Ml for submit@debbugs.gnu.org; Sun, 01 Jun 2025 22:12:52 -0400 Received: from caracal.cherry.relay.mailchannels.net ([23.83.223.30]:33275) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uLufQ-00060g-T8 for 78668@debbugs.gnu.org; Sun, 01 Jun 2025 22:12:49 -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 C06EF84565F; Mon, 2 Jun 2025 02:12:47 +0000 (UTC) Received: from pdx1-sub0-mail-a206.dreamhost.com (trex-green-2.trex.outbound.svc.cluster.local [100.124.32.19]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 7207A844874; Mon, 2 Jun 2025 02:12:47 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1748830367; a=rsa-sha256; cv=none; b=jD0VEtbhUS/ni0DD3gIyyLzHGBFslkju7dhzbw3tuEBma18ctPvUiScy1D6g/yQmczBSAQ FKSDbZ1kbtnifvCvbxR/MEbCBhLDvMfKkWH3YPY4CilPmgpx1Nwi5o2ikTkj6mwDAWHf5V p1fZ4kGMBRqWTdY3SHReeVB2ShYgiV47HGU7npAow5BC+SL8glc5USNxC0Qm/m5ygeUMXW eW4fU0gRhwHEb6/KxeU1+zSvLMfOliTRaJcAfUre4i2eeixWczoqelP9i0/c5Tl/uPC0Fx 5cUSd+5wlJXkMSraNIaiLuCm8T2P6dNZsDXepqO6SWT3eMD8lS8vksFE4oxzsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1748830367; 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=ms+8BKBpnyEV6JVZ3GXiB2O2/JG2506eR4bnocsGdjzGBJsXz+tG3byx+6BqdkzRgJ36wc 2O62Tv2UsFpv+fFkAXLjhzy8Ro5fA46JDDT/rWXMr0bZ+7UFE7FXT8K6wxm/LAy+t84WnG wOdJw9J9tB58Vz06ADQeZ7TF4EB2pFW42gAMYEBCtSU5Y9nQCl/zgYbciFK5g4CmcRgGKJ wkZ64xnhxxHF0Q7JXaPgyj/bLUMNSuC+4dCIa9Ir7aWdwHJzH/06qucpVPdE6ZNDRyN2zZ VpdASZZvDAv61gOq4rLrDJDEsRTXvVXrwnBn2dzQMA2NPrmKZqFXVLyLq6+W3A== ARC-Authentication-Results: i=1; rspamd-cc9cfccc-nq842; 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-Irritate-Blushing: 3cc715080e40b7f0_1748830367687_2744314790 X-MC-Loop-Signature: 1748830367687:2455573052 X-MC-Ingress-Time: 1748830367687 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.124.32.19 (trex/7.0.3); Mon, 02 Jun 2025 02:12:47 +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 4b9cnB5cSKzBZ; Sun, 1 Jun 2025 19:12:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1748830367; bh=g0/4fziVUqDoiOgL2CY8n6tNgLH2MYiut6q+B6ULRik=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=GYJaOo62SY8+cHjB706/WUeV9em0dReuGEH7E9oV71yEL+WA9b/RrWzhRyQa+PyGC 71+AE1/XtEObS4/6iUen+hnLpfaqI59PIY09hqgF+whLatu+Jb+AOkt3v2Ml1YxO0l +1yPX/8+5dA8TCq0lq3VqKq6HqFX4vin/SHY+iKZTu6Vo1g7cHlgNLCoU3aIioncAN J1gyqLV0/mbiRUqL7rSCCUaG1u64fv+dOU5MHsa0gZAGVMlK+nMdjg0oSdRxXiEIPn GPqMF4KP6VcPOjTxwGNFXNtd0EcZSxjfHRLqjw8ePbl0CQA+ZhfSw06smyMBITZ7e3 ene6inmo7yeQg== From: nomike Date: Mon, 2 Jun 2025 04:12:28 +0200 Message-ID: <20250602021230.3231771-2-nomike@nomike.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602021230.3231771-1-nomike@nomike.com> References: <20250602021230.3231771-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:12:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nomike X-Patchwork-Id: 42971 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 5EE0B27BC49; Mon, 2 Jun 2025 03:13:30 +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 8356727BC4A for ; Mon, 2 Jun 2025 03:13:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uLufj-0005OV-Fq; Sun, 01 Jun 2025 22:13: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 1uLufg-0005NQ-3H for guix-patches@gnu.org; Sun, 01 Jun 2025 22:13: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 1uLuff-00052B-57 for guix-patches@gnu.org; Sun, 01 Jun 2025 22:13: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=JQDyoSm6kI0dolcAG/q8zvHFwszn3pge22wePnIYDXE=; b=mKZy9Oh9irdMim+lt/Kehe36iEfnNScx5EspDzH633vhslAMBkYE5HogPTwJRe2+4uBMfuHuC7zSFDB/3KhsOhjiKdEdZ/OuH2wlPcPWXeoqPM87ZMj9R9d/5PRRCYFQXn7ePS4r2eXWwkLOATlWi3nJWbm+KYwCaEwHvA5y+Ek66FdQhdOCZco5KXZqgU2vSN1EmBiw2KIDyDoWtgEcrBMiY+MqO8FVEaP3xGUQC1XpzGb2+48c/fcmbeEJoO5EGpiXeHMTU/5p0eZkjcgasjGELEqwXETQoGDyy9XuHKD6HcvIe6OurWzQBbA3c5W82Xk5/J5o9MlRdkAvd39Ssw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uLufe-00062Q-Vw for guix-patches@gnu.org; Sun, 01 Jun 2025 22:13:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78668] [PATCH 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:13: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.174883037823168 (code B ref 78668); Mon, 02 Jun 2025 02:13:02 +0000 Received: (at 78668) by debbugs.gnu.org; 2 Jun 2025 02:12:58 +0000 Received: from localhost ([127.0.0.1]:44534 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uLufX-00061U-Br for submit@debbugs.gnu.org; Sun, 01 Jun 2025 22:12:57 -0400 Received: from egyptian.larch.relay.mailchannels.net ([23.83.213.56]:12439) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uLufU-000615-H0 for 78668@debbugs.gnu.org; Sun, 01 Jun 2025 22:12:53 -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 3E5702C22CA; Mon, 2 Jun 2025 02:12:51 +0000 (UTC) Received: from pdx1-sub0-mail-a206.dreamhost.com (100-117-210-190.trex-nlb.outbound.svc.cluster.local [100.117.210.190]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id E05EB2C296F; Mon, 2 Jun 2025 02:12:50 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1748830370; a=rsa-sha256; cv=none; b=6ow3IsaO9bCmZ8Rmy5nkUkJOwXedpkOnyTPwIwiFz4ig0Y6wjvenDTGPO0vYC4EduNzlIT o3/uynUYsXNMHhDDM0Q7AuHN3kyAY3llXsPehWkK4z53w3R/WKZyVj31yskLmxsBFeM3im QNTY7oTHnpck3NY4BYnWhc09IX/q/2aUvdE+K0/RsaECXid31ogLbHnkm6LOTRcNZBbR5H rjSSuIwnUIme9+BUtuXONhDnifGZGkfZppBJmMwWFPrLz7zsqWPdrOtp4tC2zuzuT4AI3V YwJJ3QpmOt/MpM2M7rTB6Av07E04hwc+h3pIBbE8RWt6Rjm1qsq/kHj/WooBgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1748830370; 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=JQDyoSm6kI0dolcAG/q8zvHFwszn3pge22wePnIYDXE=; b=ULjwgklskgGORC/6Fa7KuIx2CnIpPNi8Pr1unYGBRROUNM8PhPq67qcXZV2tKcaeUn0N5y IfQPmCMdicFEXyt2UMTmLHvu+g7r51b+S7HEBAWoOo89Vlvq4Z5A4sqI+Ty1iuRS8xzk7R 0pYmOYyrkHT2E5qI/qMO6iYAanjyLL6gyFzDkTuf4CnK7/34Tok9CRYWXEac2HGq0v/kHz OKOEzx7IaFa+o51ts9tio7QM8TOKYBGJJEhNoThx7YOg2V9M96/OPGeawiLvnlcl0nV4++ mNN1aOcOmGFKL1sFgnMna0Bpf9p7zh8y2SmrZ/aIiuNXl9Z8wtdBeU0kzHZu6w== ARC-Authentication-Results: i=1; rspamd-76569d6b7-hxgn7; 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-Rock-Soft: 051ca4143c686903_1748830371155_2462802151 X-MC-Loop-Signature: 1748830371155:2864035565 X-MC-Ingress-Time: 1748830371155 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.210.190 (trex/7.0.3); Mon, 02 Jun 2025 02:12:51 +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 4b9cnG2l3DzC9; Sun, 1 Jun 2025 19:12:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1748830370; bh=JQDyoSm6kI0dolcAG/q8zvHFwszn3pge22wePnIYDXE=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=bbvv9AA4yLsMLKWGGsaZlTKgYMqVwdGOOIdQvM9Otc7tB3QK42RVsyCJVHa7RJV8r Lkbmx/Iq52Dq4k7W2KZAYcYftMrd9JR/wrpL0k2g2g5qS9H/VDCjj8EPVM60DkS5M1 /hEuq3xOsvhXsgx5RYohmpEQ3kSD9WYO5CAOuB19EyVVJfPbWm115e2/5H3tBDJgm8 UwokunASjSQxjlSF3Q0kqR81IH0NZ8zHMKm4UQuvEJKIqOIp9jRBFH79P6nZqHPMIx BTd3PjK163CWhrzyYHyT1EVr20QOlngQCh3a3M6ZFS9XNbWKH/oT94zfI/SNafbgxz y7Liz6KVRHZiw== From: nomike Date: Mon, 2 Jun 2025 04:12:29 +0200 Message-ID: <20250602021230.3231771-3-nomike@nomike.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602021230.3231771-1-nomike@nomike.com> References: <20250602021230.3231771-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: If7ddc903b8b6d78b6cc5c35031cbb2a840b961c2 --- 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..d9be7a50c4 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 "1vipfy68crvik3760jjmsqnyci6rabb26iiw22p2qpb3cj6r683l")))) + (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:12:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nomike X-Patchwork-Id: 42972 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 6F39F27BC4A; Mon, 2 Jun 2025 03:13:43 +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 F161A27BC49 for ; Mon, 2 Jun 2025 03:13:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uLufl-0005P3-1P; Sun, 01 Jun 2025 22:13:09 -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 1uLufg-0005NR-3q for guix-patches@gnu.org; Sun, 01 Jun 2025 22:13:05 -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 1uLuff-00052D-My for guix-patches@gnu.org; Sun, 01 Jun 2025 22:13: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=ZLdp+T9uAivvM25u/oQym76Ye6RlaxRaPVtIq8vBMyA=; b=CUYTo3Nq3u+/gNzpgGc4C4hCxyZ94VpG+Eb7QKczGGj/nxis0iDDqAA8WnZYxrmceJ+GFzX2rD7hbWIoOcLPrpwj3uEnKvEurl90LI7jB9y5vr2ahMayG90iXn4isnOgpmYoXTztmXT7WZzEjqTvHuIfwXNsqZLy4yqhW/AUqhscbR5VhOz04sSqdFu6zfs0CV3W/QT46IOxJKbdQPW7fB9brow8r2iaizAFWS7eh6/EYdws1MXPJ5BROUNsRjENkP2NYOgks+3CaNutypqXCDGqOpHpza0v25AJRe28/HAU43u6KXXTEOa2nqbeMzYJdxHr6g9Oi+lJkoPIJqN+Zw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uLuff-00062Z-Gv for guix-patches@gnu.org; Sun, 01 Jun 2025 22:13:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78668] [PATCH 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:13: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.174883037923176 (code B ref 78668); Mon, 02 Jun 2025 02:13:03 +0000 Received: (at 78668) by debbugs.gnu.org; 2 Jun 2025 02:12:59 +0000 Received: from localhost ([127.0.0.1]:44536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uLufa-00061i-17 for submit@debbugs.gnu.org; Sun, 01 Jun 2025 22:12:59 -0400 Received: from camel.cherry.relay.mailchannels.net ([23.83.223.29]:25081) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uLufW-00061O-Mt for 78668@debbugs.gnu.org; Sun, 01 Jun 2025 22:12:56 -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 AE036782977; Mon, 2 Jun 2025 02:12:53 +0000 (UTC) Received: from pdx1-sub0-mail-a206.dreamhost.com (100-118-166-165.trex-nlb.outbound.svc.cluster.local [100.118.166.165]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 63643782B23; Mon, 2 Jun 2025 02:12:53 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1748830373; a=rsa-sha256; cv=none; b=QN0f0ztRGwx4+0Z0N0on4VFHTazxu+Wwskhjsuq8zpU1pQq0xfvbFNk6xR4b0L9GkZLKSX EiKfQncfdy5B7PkLuukIyTWBggOhRSsUYqAwcnG7O5Vv08hOIMRjGQCNX8cb21Z3OqCRmO amattH1YzxCsRauhJ9M3sPaW0eYiIRreFSmEy8woC9z2OdGL/1bughrMzlNj/XHU/nUMNf GwinLWapPnNDGCzjOQ1qoHyhq6cu/3Lk6LMQn4GQbLtW6sf5Yxy/5tVb8Hw6iljDYPIfaM ecdUa7ruWAdGzQ/VWt/+rtgzKJ48C3LXrBWdJ4Ae/+0KTeYPAotDWrhYv3SzEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1748830373; 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=ZLdp+T9uAivvM25u/oQym76Ye6RlaxRaPVtIq8vBMyA=; b=Lq/hrx7cnH/3i1gqTdpSJ/UC3aKdLvDIk0FXCkhpLC3C8YwxJ1TEguvBGfJj8qWeNO17hE +Su0ppO+DGLVxXQzgKGoW15gHlIowZj0u20fDfNcjJ0NDivKsyMnsoRs5PkQqSmgj5tG0s 2jU/JnoqYRzUmAxUAcTZGymOmJmIVhV1MZTIy4xvxxsU8MEOwEhxQYFDRfyybmEvFFWqux Q0SVTe0hTaBOor+hyI6IcomqMw7TxsXD5cVb716GT3ZEnvh5rnK/B8JurP1Tm287UHufEE ZCPHODardWr6QY4Hug44jPs7nNDk+5elaQpzGwwpODMNjYRarAR+AicJa58hwA== 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-Tart-Invention: 425cd703521a8539_1748830373652_2949983262 X-MC-Loop-Signature: 1748830373652:10516764 X-MC-Ingress-Time: 1748830373652 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:12:53 +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 4b9cnJ6BNSzC9; Sun, 1 Jun 2025 19:12:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1748830373; bh=ZLdp+T9uAivvM25u/oQym76Ye6RlaxRaPVtIq8vBMyA=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=LnoBMUlnuGl8LAxuUNkd+ZYPQlp0LM4KSBQxfyn9WVVqFEFH5ksG3Ud2uz8KZuX1H tftl7PCzmmBSJRG6KDseH4OFNbJ3PtCBfzv5STnhfPjBgD7FA3t+hcIwIeDIv5QbbG s0WUXuu+roU+Yalar62jE0RoGtrIX35TD/mngGn6Wc0mf6dNRESItvwTSqZreNrFNw SCl+bHn5IaDGKG+ay1KRZyLDVkGzofE+OsMYreBniD/zaq5Ii0YKX0Xj+SCKnGGMJe W5En89eYPqjQ8O4uGtWcHjZO93cQ/Tvea1dDUd4xHa/DWhbkXhREjc/PQeDFCiFrfj MhoRUBrE7GwIQ== From: nomike Date: Mon, 2 Jun 2025 04:12:30 +0200 Message-ID: <20250602021230.3231771-4-nomike@nomike.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602021230.3231771-1-nomike@nomike.com> References: <20250602021230.3231771-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: I8537290ebd23c14f1d5eef66440d905db7a1e773 --- 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 d9be7a50c4..a2a7177b79 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 "1bkzrjjp0qvfg7pj24j5pa0i6zj0zsqjb5z4w4l6pjdb5q9in0qi")) + (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 ;or libglvnd if we had mesa-glvnd, too 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