From patchwork Wed May 7 05:31:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "nomike (they/them)" X-Patchwork-Id: 42363 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 C8F9127BC49; Wed, 7 May 2025 06:33: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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 BB92427BC4B for ; Wed, 7 May 2025 06:33:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCXP5-0007GU-TI; Wed, 07 May 2025 01:33:11 -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 1uCXOx-0007Fy-Bn for guix-patches@gnu.org; Wed, 07 May 2025 01:33: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 1uCXOx-0002sE-2q for guix-patches@gnu.org; Wed, 07 May 2025 01:33: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=V1GRWHaig37GSLQgSzjJgxqLZp3OcsfJgWY1BkIb6X4=; b=HfVwxIJAF+4c9m4zslWSxwTBar92oFjmrJ63Rd23V0Iu/SM/957p7qOYgtb5i27evLW4Uoyhiu1EJa+BDDDfsVUVvN+o2Jd3rBk+/pWuxn3p09rcIQyus4wdq2vvmE62SNd/KV75Y2c2/2cS+Y5f6m5x+qEbv9JDQcjEjw/JIisUZtyUJNwAuh+6IW6ALroSSXurifzoJWRQnlUoMmFKSM8Z0H1TrUSZqecD7KlEHHpCy+QR4eq/JcOboXX27TE0mvyXLvpiHQRQkVcgFo5MKdBNbVOmQV2wrn4knUzapNTIR9r4LjQCEbWJ4J1Jis1M77vEwMceUqUXuJ5US2Vqog==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCXOw-0003LS-SR; Wed, 07 May 2025 01:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78293] [PATCH 2/2] gnu: openscad: Upate to 2025.05.02 Resent-From: nomike Original-Sender: "Debbugs-submit" Resent-CC: nomike@nomike.com, guix-patches@gnu.org Resent-Date: Wed, 07 May 2025 05:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78293 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78293@debbugs.gnu.org Cc: nomike , nomike X-Debbugs-Original-Xcc: nomike Received: via spool by 78293-submit@debbugs.gnu.org id=B78293.174659594612757 (code B ref 78293); Wed, 07 May 2025 05:33:02 +0000 Received: (at 78293) by debbugs.gnu.org; 7 May 2025 05:32:26 +0000 Received: from localhost ([127.0.0.1]:38661 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCXOL-0003Jh-Np for submit@debbugs.gnu.org; Wed, 07 May 2025 01:32:26 -0400 Received: from seashell.cherry.relay.mailchannels.net ([23.83.223.162]:29557) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uCXOI-0003JU-Mz for 78293@debbugs.gnu.org; Wed, 07 May 2025 01:32:23 -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 8D68316492F; Wed, 7 May 2025 05:32:21 +0000 (UTC) Received: from pdx1-sub0-mail-a227.dreamhost.com (100-118-113-197.trex-nlb.outbound.svc.cluster.local [100.118.113.197]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 4B93816590E; Wed, 7 May 2025 05:32:21 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1746595941; a=rsa-sha256; cv=none; b=R5C3W0iFh7bLBHj8MdTDWo1GOmt+UyipQE+oUXTU85iCz9LamLlm/dpgSALCF8WOMDRkvJ eHcakCz8tt0E+ApY/fwIXxBOJpLYEfObbRxOE/GGkww84jou9FZdrdT7yDsyB6JuyoQGh+ MAkbczfaHFfghtiQloNsWpS/9AVBGWOlLx5phVwX/q/SjaXJpvLqZBfBkDy48itpZfB7fU pvtodZB6e1AWWqGbOSzLpjIS7J9xLEdAlP5VkqKtZf/meci7erETGfNWMDeAN8JOfgWseI bTXAosDnnA+7Wiau87v8IPyq29rGQGrsi3HakZ9iLzEViRLFOJyuja/vQOzczA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1746595941; 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=V1GRWHaig37GSLQgSzjJgxqLZp3OcsfJgWY1BkIb6X4=; b=acGYFi+e2AgITwLu/ULbsMwsVzp2If6uBMG2/gsiZHLExqzB35VoKTvi7roImyxOS0y3ub 5h8FpqvR0RCV+0xb/xproIkeHZNIonYB/3Ibqah///UabEOTRpEWFZMc/O7SEq2A+vj34v tpUN/0tV9UYEj7XBCybDoI0g8+lBxSKffR/wkExCMTKaB3qzm7Kj5y1jkZxU5vpo2jQenv xUAcdyR5g2dh5moZyGbPTXWn65jJtQMJpTy7XQQGb+HxcHb5mgO23kH30+5Lp2acMS7Rh/ I6EBgAQJzD8OpkCmB2LilzqnBPMOOk2vekCKta1BgGWz/yJHrCbfpAhQlwiNHw== ARC-Authentication-Results: i=1; rspamd-6954bcdf67-vbd95; auth=pass smtp.auth=dreamhost smtp.mailfrom=nomike@nomike.com X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|nomike@nomike.com X-MailChannels-Auth-Id: dreamhost X-Tank-Blushing: 1a1741b55f26134b_1746595941521_2022902932 X-MC-Loop-Signature: 1746595941521:1782113521 X-MC-Ingress-Time: 1746595941520 Received: from pdx1-sub0-mail-a227.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.118.113.197 (trex/7.0.3); Wed, 07 May 2025 05:32:21 +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-a227.dreamhost.com (Postfix) with ESMTPSA id 4ZskRS5fFvz7f; Tue, 6 May 2025 22:32:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1746595941; bh=V1GRWHaig37GSLQgSzjJgxqLZp3OcsfJgWY1BkIb6X4=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=PJ+I8gE09Kusx/Anh/0/BUmt+1DmXgMjhtU5ArJaC28V72bxNqLvZZiGJ/JEZ+pD0 Bd0iKfUO/ogQ+cNMxtjvHsGob0DTzEgsQNBUzoSsI3QSIUl/NF5Adek83y+52MEBwI e+ynAeni9yIFaPOXJ+TH8h4wn1tqGvi7e8DNLWHlHr7Ja2ROVqy9OIxl2t/GclLJtg J9C5ywoVKkDo+7Vv22Rhuc8q7fDO4yuC19VGEx4fB+bkooHio3Nsl9QsYYW3t+soje nFgT+GNd3aige41MruNqGlkYhm99dOi6o4D403M7o+AwNXaaLUxBPMBrIoJuhViw1k sFcobPrPjyi+A== From: nomike Date: Wed, 7 May 2025 07:31:50 +0200 Message-ID: <20250507053152.3613895-2-nomike@nomike.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250507053152.3613895-1-nomike@nomike.com> References: <20250507053152.3613895-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): Upate to 2025.05.02 Change-Id: Ie260ce208f03c34bc29f01dadabf94ae840b8164 --- gnu/packages/engineering.scm | 224 ++++++++++++++++++++--------------- 1 file changed, 126 insertions(+), 98 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3c0dcde0ea..1bc90b47c2 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -123,6 +123,7 @@ (define-module (gnu packages engineering) #:use-module (gnu packages imagemagick) #:use-module (gnu packages image-processing) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages libcanberra) #:use-module (gnu packages libevent) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) ;FIXME: for pcb @@ -3182,104 +3183,131 @@ (define-public python-lcapy (license license:lgpl2.1+))) (define-public openscad - (package - (name "openscad") - (version "2021.01") - (source - (origin - (method url-fetch) - (uri (string-append "https://files.openscad.org/openscad-" version - ".src.tar.gz")) - (sha256 - (base32 - "0n83szr88h8snccjrslr96mgw3f65x3sq726n6x5vxp5wybw4f6r")) - (patches - ;; Upstream patches to make version 2021.01 build with recent versions - ;; of boost and cgal. - (search-patches "openscad-with-cgal-5.3.patch" - "openscad-with-cgal-5.4.patch" - "openscad-fix-boost-join.patch")))) - (build-system cmake-build-system) - (inputs - (list boost - cgal - double-conversion - eigen - fontconfig - glew - gmp - harfbuzz - lib3mf - libxml2 - libzip - mpfr - opencsg - qscintilla - qtbase-5 - qtmultimedia-5)) - (native-inputs - (list bison - flex - gettext-minimal - pkg-config - which - ;; the following are only needed for tests - imagemagick - procps - python - xorg-server-for-tests)) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (invoke "qmake" - (string-append "PREFIX=" (assoc-ref outputs "out"))))) - (replace 'check - (lambda _ - (with-directory-excursion "tests" - (invoke "cmake" ".") - (invoke "make") - (invoke "ctest" "--exclude-regex" - (string-join - (list - "astdumptest_allexpressions" - "echotest_function-literal-compare" - "echotest_function-literal-tests" - "echotest_allexpressions" - "lazyunion-*" - "pdfexporttest_centered" - "pdfexporttest_simple-pdf" - - ;; Broken due since cgal@5.2 + - ;; https://github.com/CGAL/cgal/pull/5371 (security) - ;; FIXME: Investigate or wait for future releases to - ;; fix it. - ;; Unsure if wrong test-suite or wrong security - ;; patch. - "cgalpngtest_nef3_broken" - "opencsgtest_nef3_broken" - "csgpngtest_nef3_broken" - "throwntogethertest_nef3_broken" - - ;; FIXME: Tests probably broken by the patches allowing - ;; to build with recent cgal versions. - "cgalpngtest_polyhedron-nonplanar-tests" - "csgpngtest_polyhedron-nonplanar-tests" - "monotonepngtest_polyhedron-nonplanar-tests" - "cgalstlcgalpngtest_polyhedron-nonplanar-tests" - "cgalbinstlcgalpngtest_polyhedron-nonplanar-tests") - "|"))) - ;; strip python test files since lib dir ends up in out/share - (for-each delete-file - (find-files "libraries/MCAD" ".*\\.py"))))))) - (synopsis "Script-based 3D modeling application") - (description - "OpenSCAD is a 3D Computer-aided Design (CAD) application. Unlike an -interactive modeler, OpenSCAD generates 3D models from a script, giving you -full programmatic control over your models.") - (home-page "https://www.openscad.org/") - (license license:gpl2+))) + (let ((commit "d1351d6282abfd239cdd0c657f755d8c4a123ff8") + (version "2025.05.02") + (revision "0")) + (package + (name "openscad") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openscad/openscad") + (commit commit) + (recursive? #t))) + (sha256 + (base32 "0cgls75dk9hjfym8rp0vpnnlz1fdawd746nnw3343gvhljqv36cn")) + (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" + "-DMANIFOLD_PYBIND=OFF" + "-DMANIFOLD_TEST=OFF" + "-DENABLE_TESTS=OFF" + "-DEXPERIMENTAL=ON" + "-DSNAPSHOT=ON" + "-DUSE_BUILTIN_CLIPPER2=OFF" + (string-append "-DOPENSCAD_VERSION=" + #$version) + (string-append "-DOPENSCAD_COMMIT=" + #$commit) + "-DENABLE_EGL=ON" + "-DENABLE_GLX=ON") + #:phases + #~(modify-phases %standard-phases + (delete 'check) + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + ;; https://github.com/openscad/openscad/issues/5877 + (substitute* "cmake/Modules/FindLib3MF.cmake" + (("PC_LIB3MF_INCLUDE_DIRS") + "PC_LIB3MF_INCLUDEDIR")) + (substitute* "CMakeLists.txt" + ;; https://github.com/openscad/openscad/issues/5880 + (("target_link_libraries\\(OpenSCAD PRIVATE OpenGL::EGL\\)") + " 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)") + ;; Use the system sanitizers-cmake module. + (("\\$\\{CMAKE_SOURCE_DIR\\}/submodules/sanitizers-cmake/cmake") + (string-append (assoc-ref inputs "sanitizers-cmake") + "/share/sanitizers-cmake/cmake")))))))) + (inputs (list boost + cairomm + cgal + clipper2 + double-conversion + eigen + egl-wayland + fontconfig + freetype + glew + glib + gmp + harfbuzz + hidapi + lib3mf + libcanberra + libspnav + libxml2 + libzip + manifold + mesa + ;; mesa-glvnd + mimalloc + mpfr + opencsg + qscintilla + qtbase-5 + qtmultimedia-5 + qtsvg-5 + qtwayland-5 + sanitizers-cmake + tbb)) + (native-inputs (list bison + extra-cmake-modules + flex + gettext-minimal + pkg-config + which + xvfb-run + ;; the following are only needed for tests + imagemagick + ghostscript + procps + python-numpy + python-pillow + python + xorg-server-for-tests)) + (synopsis "Script-based 3D modeling application") + (description + "OpenSCAD is a software for creating solid 3D CAD objects. It is free +software and available for Linux/UNIX, MS Windows and macOS. +Unlike most free software for creating 3D models (such as the famous +application Blender), OpenSCAD focuses on the CAD aspects rather than the +artistic aspects of 3D modeling. Thus this might be the application you are +looking for when you are planning to create 3D models of machine parts but +probably not the tool for creating computer-animated movies. +OpenSCAD is not an interactive modeler. Instead it is more like a 3D-compiler +that reads a script file that describes the object and renders the 3D model +from this script file. This gives you, the designer, complete control over the +modeling process and enables you to easily change any step in the modeling +process or make designs that are defined by configurable parameters. +OpenSCAD provides two main modeling techniques: First there is constructive +solid geometry (aka CSG) and second there is extrusion of 2D outlines. As the +data exchange format for these 2D outlines Autocad DXF files are used. In +addition to 2D paths for extrusion it is also possible to read design +parameters from DXF files. Besides DXF files OpenSCAD can read and create 3D +models in the STL and OFF file formats.") + (home-page "https://openscad.org/") + (license license:gpl2+)))) + + (define-public emacs-scad-mode (package