From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 25 16:57:10 2024 Received: (at submit) by debbugs.gnu.org; 25 Nov 2024 21:57:10 +0000 Received: from localhost ([127.0.0.1]:42065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFh4w-0007Ad-7S for submit@debbugs.gnu.org; Mon, 25 Nov 2024 16:57:10 -0500 Received: from lists.gnu.org ([209.51.188.17]:37252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFh4u-0007AU-VF for submit@debbugs.gnu.org; Mon, 25 Nov 2024 16:57:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tFh4t-0005P2-NJ for guix-patches@gnu.org; Mon, 25 Nov 2024 16:57:07 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tFh4s-000615-6i for guix-patches@gnu.org; Mon, 25 Nov 2024 16:57:07 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4349e1467fbso13982365e9.1 for ; Mon, 25 Nov 2024 13:57:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732571823; x=1733176623; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zhoZp+6UvQ3SIT7H94XQO06bZq1fCFjSFlbsOLTbj2w=; b=VB5bcSJNWiPIhIxYum96Vvu3sZlwvEl1V6GMVcUz2ZOP40CN9io1AV+Pepeo6MMKb8 eY6fG67vQ9klCUk9uBt97vQLfUddNZt/DqgztXjB5zrxp7Gkl2gavbwnltOXix6P5mhL rSCUZRu0l3o674sQTUSjmh/y/bEayBV60n44rOc1hHZZUW68AZAapRtADhGfks8q6FLr 3cMYRLEhBYnagDzIE1ZNmtjlmrjjiI1ei1km7n6zqpoXbY9kNJW2Tb15hBC8PDyYy82x dvqHTdEiSaoFzpHljEfnpRt++zDKZqxY+395K9uHCJhV3g6twwJoiMESLwpWT6/rjK4J RSag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732571823; x=1733176623; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zhoZp+6UvQ3SIT7H94XQO06bZq1fCFjSFlbsOLTbj2w=; b=luCf7RGV1mewXdGYBYucrfbZ6EwxnGPcAJTVps3YGhnE5mMMz4Jb9UvT4120Y8v6sp XF2b/sCrpGfcufVPUc/64SJ5FlzEH2OlGRqlamXgkRsSA/Fe7VEQbzDlfFLxebc6BehF daZV0L2MahDa/K/bGhU3csU697hMimMmVoqxtF9gGg+voiMoLghKgCm0JybO2gDDbVj7 5N7T+Tdonjbv92I9j8gMCQlyE/+khQVxxU3xAKony/g0nQ36Gp7yahXCKvGDiWnyArHh IJpv4BfeD6/Ltuls3Pzq7tPfU1OmZ5V7Ku9PMYFUM+NkQNaDNqyYjKLTzrgssbAr0yQx ifJw== X-Gm-Message-State: AOJu0Yx9lQFFL8GdlWQSAvZtGlNYUd50yDm8+TyhZh2vo9jj3+No8yhJ UVcpyJhR7TxTRAmHFshmvnsIO9FoTUMzsdPm3wH2TF6s4ZerztuEtQPm0Q== X-Gm-Gg: ASbGncvrmNl7/chPA296xMNiU93azmw5X+YpaNR+AAkNjzrkSSt2wwH3mFIkgcGFUIm Tn4bZgUuPxM91IxTKgBnW7J61ifGrfRNzZFycqeWoHeC7WwSrJZ7r0dyslCpKB7TzLKn7o7zmBe as6zW7WDhL3/Hjh7bUUQYZeuQq/vk1sEtK7Sp8DBqzGeq9vIOXCheNy0zXR8Y2Qa6GlDuvRbX37 m+II74QFiyZXcUu5cKDjdUsoi+VSyXDhPze/9zvRl6KBEd3FMwYzkwj54p105qCta3R+nZE6zGT PS8Q X-Google-Smtp-Source: AGHT+IE4B7EsWNZE8SMdPant3KlT/vyKUnqDn490iObPZ1aWziBRbEguI6K/sjA4AbqfUEiz19JAxA== X-Received: by 2002:a05:6000:2d01:b0:382:5077:afe8 with SMTP id ffacd0b85a97d-38260bd01b5mr8659653f8f.44.1732571822912; Mon, 25 Nov 2024 13:57:02 -0800 (PST) Received: from ryzen.lan (82-65-243-93.subs.proxad.net. [82.65.243.93]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3825fd04ec7sm11546819f8f.110.2024.11.25.13.57.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2024 13:57:02 -0800 (PST) From: Vincent Legoll To: guix-patches@gnu.org Subject: [PATCH 0/2] update FreeCAD to 1.0.0 & other misc. enhancements Date: Mon, 25 Nov 2024 22:56:48 +0100 Message-ID: <20241125215659.8017-1-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=vincent.legoll@gmail.com; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Vincent Legoll X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This series updates FreeCAD to the recent 1.0.0. This also unbundles the onsdel-solver, which is added as a separate package. Some other 3rdparty code is unbundled. The VTK patch is not required any more, it has been merged upstream in d0fb2b8b29fe0428d9dd8aa790b0d6e45c8a9516. This version has been tested a bit (through a guix pack, transplanted onto another distribution): created some geometry, meshed & exported as STL. The UI has been modified, but overall the experience is good, progress has definitely been made. Kudos to the FreeCAD team. Vincent Legoll (2): gnu: Add ondsel-solver. gnu: freecad: Update to 1.0.0. gnu/local.mk | 1 - gnu/packages/engineering.scm | 50 +++++++++++++++++++--- gnu/packages/patches/freecad-vtk-9.3.patch | 43 ------------------- 3 files changed, 43 insertions(+), 51 deletions(-) delete mode 100644 gnu/packages/patches/freecad-vtk-9.3.patch base-commit: 047967c42f237695d5af2af53321c70f157685a3 -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 25 17:01:30 2024 Received: (at 74538) by debbugs.gnu.org; 25 Nov 2024 22:01:30 +0000 Received: from localhost ([127.0.0.1]:42136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFh97-0007RA-NV for submit@debbugs.gnu.org; Mon, 25 Nov 2024 17:01:30 -0500 Received: from mail-wm1-f49.google.com ([209.85.128.49]:61821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFh94-0007Qz-Tr for 74538@debbugs.gnu.org; Mon, 25 Nov 2024 17:01:28 -0500 Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-434a2f3bae4so6670565e9.3 for <74538@debbugs.gnu.org>; Mon, 25 Nov 2024 14:01:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732572026; x=1733176826; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/cpQWeH9WshBVfFZVEmALNo0FdPcruTvih89pHP2hFY=; b=jsvNBY3qUVEkqGNjXtP7CE/D/s7W1EMmFvxC5FDM/t49tpOwS9AuJJDpKWbHZkuB3r RVN+5sscVY+31iNAkKpwYIeL8dLEhn07oKmcOF2/GaVfOpD8JfoMWTE4IsI0VTfXzx7j NNBuXphIl7qlrHTbwGsHNBaBJjYkNwaKvLCJNbzky55SKYZItJUQ3ZeKe70cAGUMv/J8 ukdDiHZJ+glfndRkcvBH91FUdv5I4g8Z//zc7dYz49LA2wcIMfYmn7t1SU5AhM9uoE3u +acQtn3Zuz+Guts8WKgpab8M8W+On0FINDkcCPMDBWmEazC7n3VCbQZ0JypAIFbhtmGh 4WzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732572026; x=1733176826; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/cpQWeH9WshBVfFZVEmALNo0FdPcruTvih89pHP2hFY=; b=RLL7T7CRCg1CCJPVDQx3twGLzNO93JuU04iTe+bDgR69imGhBxTV8+WXyblu6DaPBe 0F6Z7xWoi16ULHxCEsCM3WfcV/coiMG1u49DYIrlrSJMncoRV9297WlAuBjQ8+LsJ7Fo 896YV6iOyMoKUGyAfBUEh3SfnubaUQGCdc3a/b22Dy9TjrURL6X12dt4MieJEdUpdW8o eJD53NLzCnHv3APzfTvA6+fdsuiwoXrqCHWbLMMHxKbq3bgSrYYMiqRXd/JQTFwxQiZw 0gKBHcAU29iID3tqSjcJ7axgLaSn8rKZGiiaZ3w7ov+SROc8xDPfHzkzinEx6MQwb3qN QwAg== X-Gm-Message-State: AOJu0YyeW9h5D4QxhJQQMsD6IYoo/6b0RmUqn6v8s0KE4QgWgCqCQPh5 OLtjxpVv5w910Tx5zaGawSypaVCgDudiSbz+rPh8XskkOUHPR/Kg9dRl1A== X-Gm-Gg: ASbGnctszkNpZSSKo7UpgdgHofY/CAxUAOji6zIT4V3I4yuC50l6TonyGjax784moNu XQ0+a5xuVnZhWJ9BNjB2ze7OLmI9sZ4RMwp62V+ZPLYxHzTIMr8f6EatZCGKjGLpKfIHsC2Yzy6 Ka/DbCNVVC6uqTmjkYgkrEwQhG16ZDNFg3I1Qpfcx2hNYBnpXw9+089jiQEiYFSedTyrDfmRlWZ XHvNAPqqRZVkRXeA+Gbm6FmHTvylBceiL94L+DzKQsTwAAR1zaD7vt2gzp80KIKuFk6m7/9QSQA e9yt X-Google-Smtp-Source: AGHT+IFk+qY2aB/2URicTvAbKR6wlak6G4QOiCIQG6pPqlBP6X8byt886x/8m2Q/Pj2E+zxkPj5tGQ== X-Received: by 2002:a05:600c:1c98:b0:434:a525:724b with SMTP id 5b1f17b1804b1-434a525753fmr5686995e9.29.1732572025630; Mon, 25 Nov 2024 14:00:25 -0800 (PST) Received: from ryzen.lan (82-65-243-93.subs.proxad.net. [82.65.243.93]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-433cde10eabsm143239765e9.13.2024.11.25.14.00.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2024 14:00:24 -0800 (PST) From: Vincent Legoll To: 74538@debbugs.gnu.org Subject: [PATCH 1/2] gnu: Add ondsel-solver. Date: Mon, 25 Nov 2024 23:00:13 +0100 Message-ID: <20241125220016.8338-1-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 74538 Cc: Vincent Legoll X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) * gnu/packages/engineering.scm (ondsel-solver): New variable. Change-Id: Ie966b13d1ec5351ef8b9f2459780f3da47f96db8 Signed-off-by: Vincent Legoll --- gnu/packages/engineering.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3ceeb4425a..5178043a52 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 John Soo ;;; Copyright © 2020 Brice Waegeneire -;;; Copyright © 2020,2021 Vincent Legoll +;;; Copyright © 2020,2021,2024 Vincent Legoll ;;; Copyright © 2020, 2023 Marius Bakke ;;; Copyright © 2020, 2021 Ekaitz Zarraga ;;; Copyright © 2020 B. Wilson @@ -2930,6 +2930,29 @@ (define-public emacs-scad-mode OpenSCAD code. It supports syntax highlighting, indenting and refilling of comments."))) +(define-public ondsel-solver + (package + (name "ondsel-solver") + ;; There's no tagged release + (version "2e3659c4bce3e6885269e0cb3d640261b2a91108") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ondsel-Development/OndselSolver") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bgk3asyz47r1kvdgcz8q7sh1g29przdsx9ib1jqqbc0nv8ww68v")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) ;; Tests require Google's gtest and gmock + ;; The company is shutting down, so https://ondsel.com may not exist for long + (home-page "https://github.com/Ondsel-Development/OndselSolver") + (synopsis "Assembly Constraints and Multibody Dynamics code") + (description "Used by FreeCAD 1.0.0 for its new Assembly workbench") + (license license:lgpl2.1+))) + (define-public freecad (package (name "freecad") -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 25 17:01:36 2024 Received: (at 74538) by debbugs.gnu.org; 25 Nov 2024 22:01:36 +0000 Received: from localhost ([127.0.0.1]:42141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFh9D-0007RT-Jm for submit@debbugs.gnu.org; Mon, 25 Nov 2024 17:01:36 -0500 Received: from mail-wm1-f52.google.com ([209.85.128.52]:44478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFh9B-0007R3-Lq for 74538@debbugs.gnu.org; Mon, 25 Nov 2024 17:01:34 -0500 Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-434a10588f3so9573135e9.1 for <74538@debbugs.gnu.org>; Mon, 25 Nov 2024 14:01:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732572028; x=1733176828; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+xqBwL6pKikcPBpd2PgaWDylY7IVUupoR0SZMIgJyjM=; b=MBBNvJtbYz7VREVP2uZYvqdVAK3faRF4JRZyj+oog+s2nFiO8+vchApLBGpS8okRBw Tyhx4le0PT8HklXwcv4SlpUSmZjOamrqP1+8FVIJWNobhgUamhp1PUFFDR1/15c6t9H4 6jJGGd6NrTvcJ9d5rCjGNWzdcQQoqLMMwBZ6ihRpojKi0W6dH1yuZPwY+DpjVOI2iL0U gG2n2vzakJK8ysFbviIJ+MTpstvGf3HP1yaMF9/ssM3poE1iAjZTmwH7mzsVAAP1+66y v1hvV3kTsmai1qkBuqwyNTkTVaA7tz4fu3QGkATSa8+6K8wQTMau9JUOVZpVJDw8qXG/ p35g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732572028; x=1733176828; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+xqBwL6pKikcPBpd2PgaWDylY7IVUupoR0SZMIgJyjM=; b=FJPOwL+opp0O082qtZdR/joQY13vUN2TTeVzrp9ccTn3vJKTny6lxMsk6lV2hPQB+5 m/VDaNn56JRYuYc4TaCQoWIB1ZvR3Mt3AsjkVCOeJZp3/fINXYz5iieRj2DI0FXvCnQK qE/poVQBI66oNXswVDXywIKAbbB/wFixj/4LoyOCOpeGMd6pb/gLgsc0MPFjh0k2zXqb oTCIRc9/SkTEUQmCVl4LcjYxSFJ5bhMzfLwSCWrMaZfRozu2wowncuZ2ZdLOL86rvVom cXHBB3PI7aRuCIh9fQq0YelbcX1yfx9cR0FLH+YERS8xyMrEPhJHahpQpTEFrM1NRdCz +9FQ== X-Gm-Message-State: AOJu0Yxnc7SE6rN9sUb/P3eeZkkN191+H3nr99ImwZEuQZj8iy3ddNxR Y3BUT7BgLXIFMkqCdDtt+HaIWX1O0f1iOELYy21g+cEzew1X1clmalC3CA== X-Gm-Gg: ASbGncv6F2r/fv3mrMUQ4+jaAZXRkKPqEbvATE3S2WWG8Hwi+AixY7SJWrEXXRNiznn vR5Ylff3AVRRQvRoUTXBm2q17wpy02cwgX3tXOBuq4TzKR3zRRxmg43W7gZCtVXFjjO49P1RM8d hCu0bjusBbigZZ6e61qJNiERlnoTCOpxuBm9YYF/lrjo2yfmjLxOQPqcWt/ZxYWMt37prnpvpWi JZBBcE/iKLiKUM6Iw/xwWgTfijfSX6t2LPXrRFbS76jm7lhtdnFxfQwcdL04VMbBT/kKI21RdKO CCLk X-Google-Smtp-Source: AGHT+IG7g0M1WJUsXNlzWR9DNh2bRkOfCUzHrBGf8/NyRtszZc/RbhJfKY+9D9leU6+dAl6BiHfELw== X-Received: by 2002:a7b:cb52:0:b0:431:6153:a258 with SMTP id 5b1f17b1804b1-43487435826mr126425285e9.13.1732572027693; Mon, 25 Nov 2024 14:00:27 -0800 (PST) Received: from ryzen.lan (82-65-243-93.subs.proxad.net. [82.65.243.93]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-433cde10eabsm143239765e9.13.2024.11.25.14.00.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2024 14:00:26 -0800 (PST) From: Vincent Legoll To: 74538@debbugs.gnu.org Subject: [PATCH 2/2] gnu: freecad: Update to 1.0.0. Date: Mon, 25 Nov 2024 23:00:14 +0100 Message-ID: <20241125220016.8338-2-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241125220016.8338-1-vincent.legoll@gmail.com> References: <20241125220016.8338-1-vincent.legoll@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74538 Cc: Vincent Legoll X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/freecad-vtk-9.3.patch: Has been upstreamed, remove. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/engineering (freecad)[source]: Update to 1.0.0, remove patches, add snippet to unbundle some 3rdparty code. [native-inputs]: Add c++-gsl. [inputs]: Add onsdel-solver, yaml-cpp. [configure-flags]: Add some flags. Change-Id: I3005a3b5cccc8aae4129a49e123fd5ab8293b3f2 Signed-off-by: Vincent Legoll --- gnu/local.mk | 1 - gnu/packages/engineering.scm | 25 ++++++++++--- gnu/packages/patches/freecad-vtk-9.3.patch | 43 ---------------------- 3 files changed, 19 insertions(+), 50 deletions(-) delete mode 100644 gnu/packages/patches/freecad-vtk-9.3.patch diff --git a/gnu/local.mk b/gnu/local.mk index 04e9b1c0fd..c89fd88282 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1284,7 +1284,6 @@ dist_patch_DATA = \ %D%/packages/patches/fpc-reproducibility.patch \ %D%/packages/patches/fpc-glibc-2.34-compat.patch \ %D%/packages/patches/fpm-newer-clamp-fix.patch \ - %D%/packages/patches/freecad-vtk-9.3.patch \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freeimage-libtiff-compat.patch \ %D%/packages/patches/freeimage-libraw-0.21-compat.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5178043a52..125f8fdfea 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2956,7 +2956,7 @@ (define-public ondsel-solver (define-public freecad (package (name "freecad") - (version "0.21.2") + (version "1.0.0") (source (origin (method git-fetch) @@ -2965,12 +2965,19 @@ (define-public freecad (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0s720q6vxlh78jzahqp69nl8wagb42l05dym5aqhfnr31dx666hc")) - ;; https://github.com/FreeCAD/FreeCAD/pull/11496 - (patches (search-patches "freecad-vtk-9.3.patch")))) + (base32 "0wwymcfgi0cybj7m6awflk8c7n6iy97lpgpfhfncx3zwvjrxv588")) + (modules '((guix build utils))) + (snippet + '(begin + ;; not required, because 3D mouse support if OFF + (delete-file-recursively "src/3rdParty/3Dconnexion") + (delete-file-recursively "src/3rdParty/GSL") ;; c++-gsl + (delete-file-recursively "src/3rdParty/OndselSolver") ;; ondsel-solver + (delete-file-recursively "src/3rdParty/OpenGL"))))) ;; glext.h from mesa (build-system qt-build-system) (native-inputs - (list doxygen + (list c++-gsl + doxygen graphviz qttools-5 pkg-config @@ -3000,6 +3007,7 @@ (define-public freecad libxmu lz4 netcdf + ondsel-solver opencascade-occt openmpi proj @@ -3022,14 +3030,19 @@ (define-public freecad tbb-2020 ; Same version as opencascade-occt vtk xerces-c + yaml-cpp zlib)) (arguments - `(#:tests? #f ; Project has no tests + `(#:tests? #f ;; Project has tests, but they are a pain to build #:configure-flags ,#~(list "-DBUILD_QT5=ON" "-DBUILD_FLAT_MESH:BOOL=ON" "-DBUILD_ENABLE_CXX_STD:STRING=C++17" + "-DENABLE_DEVELOPER_TESTS=OFF" ;; see the above: #:tests? comment + "-DFREECAD_USE_EXTERNAL_ONDSELSOLVER=ON" ;; unbundle ondsel-solver + ;; Do not try to install modules into system python + "-DINSTALL_TO_SITEPACKAGES=OFF" (string-append "-DCMAKE_INSTALL_LIBDIR=" #$output "/lib")) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/freecad-vtk-9.3.patch b/gnu/packages/patches/freecad-vtk-9.3.patch deleted file mode 100644 index af9d654046..0000000000 --- a/gnu/packages/patches/freecad-vtk-9.3.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d0fb2b8b29fe0428d9dd8aa790b0d6e45c8a9516 Mon Sep 17 00:00:00 2001 -From: Adrian Insaurralde Avalos -Date: Wed, 22 Nov 2023 16:42:06 -0300 -Subject: [PATCH] 3rdPart/salomesmesh - fix for vtk 9.3 compatibility - -minimum required version is 7.1 ---- - src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx | 4 ---- - src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp | 5 +++++ - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx -index 7f89573efd0d..47a52fe585fe 100644 ---- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx -+++ b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx -@@ -39,10 +39,6 @@ - #define SMDS_EXPORT - #endif - --#ifdef VTK_HAS_MTIME_TYPE - #define VTK_MTIME_TYPE vtkMTimeType --#else --#define VTK_MTIME_TYPE unsigned long --#endif - - #endif -diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp -index 7e3de0070a02..e9895d615717 100644 ---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp -+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp -@@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks() - GetLinks()->Allocate(this->GetNumberOfPoints()); - GetLinks()->Register(this); - //FIXME: vtk9 -+ #if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0) - GetLinks()->BuildLinks(this); -+ #else -+ GetLinks()->SetDataSet(this); -+ GetLinks()->BuildLinks(); -+ #endif - GetLinks()->Delete(); - #else - this->Links = SMDS_CellLinks::New(); \ No newline at end of file -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 26 09:24:57 2024 Received: (at 74538-done) by debbugs.gnu.org; 26 Nov 2024 14:24:57 +0000 Received: from localhost ([127.0.0.1]:48262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFwUr-0004fw-1y for submit@debbugs.gnu.org; Tue, 26 Nov 2024 09:24:57 -0500 Received: from mout02.posteo.de ([185.67.36.66]:38679) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFwUo-0004fX-PH for 74538-done@debbugs.gnu.org; Tue, 26 Nov 2024 09:24:55 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4D623240101 for <74538-done@debbugs.gnu.org>; Tue, 26 Nov 2024 15:24:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1732631088; bh=tLGFMk+3TPmVBv6Azjgp41SAamvvw6gkyg85D4Y1URw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: From; b=m1eGdtRf4X47H+aEmh30k/4fqtJFlIfy1mfvJqcew9vvhzNvbDWcfNqqTJ3yqGjRi 31sKjzExLibQk7+P7qryHvbfyV92Lj1WDbRgaO/C+Z25fhTiKy3TTUfjFs1OB2zCqE hGLoHG0Xsh189T3sQ09BNJKEyzHo8HaGk8TaKr9DGH2pTd/TXS9IF3X3p2gvVwVmb4 +wC9EdNTYh7NIB0QkeTNjrvFgMoUg7TrmWMP6tkKzqY2O4i9GxS7YCBO9JyzAQQkMZ VVEGFx05TRE7bW/HMC1evIuLgYaAgYR2TrtQrMwKD2SUlXewQEAunY83OuCQ01f12l dVTpw5ntDUWzw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XyPwZ6lfXz6tvq; Tue, 26 Nov 2024 15:24:46 +0100 (CET) From: Guillaume Le Vaillant To: Vincent Legoll Subject: Re: [bug#74538] [PATCH 0/2] update FreeCAD to 1.0.0 & other misc. enhancements In-Reply-To: <20241125215659.8017-1-vincent.legoll@gmail.com> (Vincent Legoll's message of "Mon, 25 Nov 2024 22:56:48 +0100") References: <20241125215659.8017-1-vincent.legoll@gmail.com> Date: Tue, 26 Nov 2024 14:24:45 +0000 Message-ID: <87y1169ioi.fsf@kitej> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74538-done Cc: 74538-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Patches applied as e11ab2a6e9628af6c37d4ae5e0faabde79bcea34 and following (I made a few minor modifications for ondsel-solver). Thanks. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCZ0XaLQ8cZ2x2QHBvc3Rl by5uZXQACgkQa+ggit8h/j+4zgD9FAHhX8a0ZBJub90v8rdbTBUg9VkR53yyCcK7 pTOQ9zAA/2JjDfDHQy8rM/ODJmuh3e6coyfOVT7jcgS1ULqfeRnh =pDwU -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 11:48:17 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 25 Dec 2024 12:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator