From patchwork Fri Jan 1 14:37:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ekaitz Zarraga X-Patchwork-Id: 26152 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 C202F27BC08; Fri, 1 Jan 2021 14:44:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 74C0227BC09 for ; Fri, 1 Jan 2021 14:44:10 +0000 (GMT) Received: from localhost ([::1]:57310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kvLez-0002pT-E7 for patchwork@mira.cbaines.net; Fri, 01 Jan 2021 09:44:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kvLes-0002p0-K4 for guix-patches@gnu.org; Fri, 01 Jan 2021 09:44:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48286) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kvLes-0007cs-DE for guix-patches@gnu.org; Fri, 01 Jan 2021 09:44:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kvLes-0002vA-BR for guix-patches@gnu.org; Fri, 01 Jan 2021 09:44:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45573] [PATCH] Correct freecad runtime errors Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Jan 2021 14:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari , "45573@debbugs.gnu.org" <45573@debbugs.gnu.org> Received: via spool by 45573-submit@debbugs.gnu.org id=B45573.160951218210723 (code B ref 45573); Fri, 01 Jan 2021 14:44:02 +0000 Received: (at 45573) by debbugs.gnu.org; 1 Jan 2021 14:43:02 +0000 Received: from localhost ([127.0.0.1]:59662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvLdt-0002mc-JZ for submit@debbugs.gnu.org; Fri, 01 Jan 2021 09:43:02 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:29928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvLYt-0002GT-Rs for 45573@debbugs.gnu.org; Fri, 01 Jan 2021 09:37:55 -0500 Date: Fri, 01 Jan 2021 14:37:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail2; t=1609511863; bh=iqIam2VlHRM0iE1fASVAvpZ77nuLraofDjXHSPQm/QI=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=dryepQ0cIqtjciB0NrNCX5lppw7y+Y2sxCOxAflgjRNtsOg1xDcFRDNC8s1c0TT/R zqj7AVa/DWrN+WXqU6GFQ2sRq9zKDboekjc9sESorTz7dMFoT7h+8Q0hZmeRk3cnrs Fn0YEcdomniBdEbdFOqkvyJGw8KWG381n4LPWusKMgOGxZGniU5z1XD0/HHZvfLdIG IPIlRzeG/3VC5t5uqBMjr/h7sIL8c1b10k/RSepJRZc+ApHzEB916Nijcs3rNFgtf5 erD+RrLJ58hAlU3hIF8945XrUcYLYRNiva6q7DdkAsLp30sTydjihQziJU6dIzx++u qL8W22IVCze7A== From: Ekaitz Zarraga Message-ID: In-Reply-To: <6b2IbqX7a-q86Pjb_nOtz_XcCOrATSHf2T7vfIU5qrXWhYtQFsoex3XlfmDVhLt8UXjnOonMiLCS-1oKUzxXpp8x3HSUjNkzUjhUsKGc3Iw=@elenq.tech> References: <6b2IbqX7a-q86Pjb_nOtz_XcCOrATSHf2T7vfIU5qrXWhYtQFsoex3XlfmDVhLt8UXjnOonMiLCS-1oKUzxXpp8x3HSUjNkzUjhUsKGc3Iw=@elenq.tech> 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: , Reply-To: Ekaitz Zarraga Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, I attach the corrected patch set. If something is missing please let me know. Thanks. Happy new year. Ekaitz From 42a78d572abdddbed86b69de0e87468823bfe8d9 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Fri, 1 Jan 2021 15:22:02 +0100 Subject: [PATCH 4/6] gnu: FreeCad: Update to 0.18.5-1.7616153. Fixes Draft module import errors * gnu/packages/engineering.scm (freecad): Update to 0.18.5-1.7616153. [inputs]: Add python-pivy. --- gnu/packages/engineering.scm | 41 ++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index e436994492..4bb7f68939 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2432,28 +2432,21 @@ full programmatic control over your models.") (license license:gpl2+))) (define-public freecad - (package - (name "freecad") - (version "0.18.5") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/FreeCAD/FreeCAD") - (commit version))) - (modules '((guix build utils))) - (snippet - '(begin - ;; Fix build with Python 3.8, see - ;; . - (substitute* "src/Base/swigpyrun.inl" - (("PyObject \\*modules = interp->modules;") - "PyObject *modules = PyEval_GetBuiltins();")) - #t)) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0r31jzzkamf76l19fb175hhv48irk06fpi8ldxdlr31w8c1ix4aa")))) + (let ((commit-ref "7616153b3c31ace006169cdc2fdafab484498858") + (revision "1")) + (package + (name "freecad") + (version (git-version "0.18.5" revision commit-ref)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FreeCAD/FreeCAD") + (commit commit-ref))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16965yxnp2pq7nm8z3p0pjkzjdyq62vfrj8j3nk26bwc898czyn2")))) (build-system qt-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -2479,6 +2472,7 @@ full programmatic control over your models.") ("python-pyside-2" ,python-pyside-2) ("python-pyside-2-tools" ,python-pyside-2-tools) ("python-shiboken-2" ,python-shiboken-2) + ("python-pivy" ,python-pivy) ("python-wrapper" ,python-wrapper) ("qtbase" ,qtbase) ("qtsvg" ,qtsvg) @@ -2546,7 +2540,8 @@ customization.") license:lgpl2.1+ license:lgpl2.0+ license:gpl3+ - license:bsd-3)))) + license:bsd-3))))) + (define-public libmedfile (package -- 2.29.2