From patchwork Wed Jul 10 14:02:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Soo X-Patchwork-Id: 14554 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 671C017192; Wed, 10 Jul 2019 15:04:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,HTML_MESSAGE, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id A54AC171AC for ; Wed, 10 Jul 2019 15:04:16 +0100 (BST) Received: from localhost ([::1]:33276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlDCi-0006ML-4W for patchwork@mira.cbaines.net; Wed, 10 Jul 2019 10:04:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35059) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlDCY-0006GC-FP for guix-patches@gnu.org; Wed, 10 Jul 2019 10:04:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlDCU-0000MH-S0 for guix-patches@gnu.org; Wed, 10 Jul 2019 10:04:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55727) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlDCU-0000Lh-5O for guix-patches@gnu.org; Wed, 10 Jul 2019 10:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlDCU-0004oV-0P for guix-patches@gnu.org; Wed, 10 Jul 2019 10:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36440] [PATCH] Add FreeCAD Resent-From: John Soo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jul 2019 14:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36440 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36440@debbugs.gnu.org Received: via spool by 36440-submit@debbugs.gnu.org id=B36440.156276739018441 (code B ref 36440); Wed, 10 Jul 2019 14:04:01 +0000 Received: (at 36440) by debbugs.gnu.org; 10 Jul 2019 14:03:10 +0000 Received: from localhost ([127.0.0.1]:36311 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlDBW-0004mZ-DI for submit@debbugs.gnu.org; Wed, 10 Jul 2019 10:03:10 -0400 Received: from mail-vk1-f195.google.com ([209.85.221.195]:46614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlDBR-0004ls-Ar for 36440@debbugs.gnu.org; Wed, 10 Jul 2019 10:02:59 -0400 Received: by mail-vk1-f195.google.com with SMTP id b64so478931vke.13 for <36440@debbugs.gnu.org>; Wed, 10 Jul 2019 07:02:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=Hw1pnfok3V1ynflsAdXaaduGrs9rczKb4sxavqMRIUE=; b=pXkpGnG6DWgfd/xl5kndtpjruTGETrd8R8pnRhfqGNRcCw3URp0FJahiILdNli3Hb7 NzOqEwAvhnt6l0F5bMaZdpaUiJ8L2ha909BQkK4QrllrDQvo8jPhEetWhCHU1fX3OIMH IjOmpsxA2FoR+KyOZOA1zh0fxLAw2ZlpqSndwYWS6pPbTFnkChamy42SSB/EIiHNjBfP 3DssO09BrnL6Pu2OmM4a7qiZbrX8Sn0jyYFewVmiCvRBKS05CKkCU4mZNsVTJ2V9lA3Y F9vppx25Eijrg9yZqK3fVUzsPC7u+YEc7oCqChjJ5si0Qpdjpn8pz/doK7kGtlnR0RRU xK1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=Hw1pnfok3V1ynflsAdXaaduGrs9rczKb4sxavqMRIUE=; b=rZzpxZuST40Bx+6Diy7rYCyZABU7mcFb6Rw8UeRjRx+YOTlm9MWUFhAhWPdBteJW2x 4BY0iY85OYi3jAD21RGAenV+CZ1rkBvy1QKSnGBEHlUPL4vlcv1M0Aj+2S+ewJQ0wD5F dhbk04ewMnpI7xVltdPib9nkTdZuI4dJhcRUjfG21c4H+7/XsnxhwpsIohlaOrlQdv8E 4ZY2xbDd0f5azT/3cSENxEhHBGRcHkDpuHSj/sfMNF5LzWX6bOPbjrOOyCb5wkqpXCEn HsNnFgCoyAlvr74Ddo8LY1YfTma2P2RCiC7F4cSIW6aqt4kGHif3hK4AzIYxC+vnOVb/ TgfQ== X-Gm-Message-State: APjAAAUqMcgzUscycuzRX/0Z6Hjll+sWcAaZoO/ciWwisej4XAa/EoRG Rp9wuFdO0bJrcGu5Klu9xafL2lR5sPlSErlom8MWknL7MQQ= X-Google-Smtp-Source: APXvYqz0M5l90pV1hN0XJ93QHhxTGIIBRTowTQTUmyAd4v74cVu116EdAqiyMsy3WzwM+Xgj34hQFyb3tg2f6gLkvdw= X-Received: by 2002:a1f:f282:: with SMTP id q124mr10225788vkh.4.1562767371154; Wed, 10 Jul 2019 07:02:51 -0700 (PDT) MIME-Version: 1.0 References: <20190702090642.2e07bc01@alma-ubu> In-Reply-To: From: John Soo Date: Wed, 10 Jul 2019 14:02:38 +0000 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches Updated patches with rebase on master. - John On Mon, Jul 8, 2019 at 1:17 AM John Soo wrote: > Hi Bjorn, > > Thanks for taking a look. Here are the patches with one package in each. > > - John > > From 2297370df3ccba58e3e0625af5835e730e04207d Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 7 Jul 2019 10:32:10 -0700 Subject: [PATCH 11/11] gnu: Add freecad. --- gnu/packages/engineering.scm | 85 ++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index dd7f15abe1..e2ee8ee40b 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -52,6 +52,7 @@ #:use-module (gnu packages commencement) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages fpga) @@ -64,10 +65,13 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gperf) + #:use-module (gnu packages graphics) + #:use-module (gnu packages graphviz) #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages image) + #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) #:use-module (gnu packages linux) ;FIXME: for pcb #:use-module (gnu packages m4) @@ -88,6 +92,7 @@ #:use-module (gnu packages tex) #:use-module (gnu packages version-control) #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) (define-public librecad @@ -2064,6 +2069,86 @@ analysis and AC analysis. The engine is designed to do true mixed-mode simulation.") (license license:gpl3+))) +(define-public freecad + (let ((commit "dbb4cc6415bac848a294f03b80f65e888d531742") + (revision "1")) + (package + (name "freecad") + (version (git-version "0.18.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FreeCAD/FreeCAD.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01ay9wdacm1hymnaw67y8sg63pv0ar1n72ap77q12dv3qibmwz75")))) + (build-system cmake-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("graphviz" ,graphviz) + ("qttools" ,qttools) + ("pkg-config" ,pkg-config) + ("swig" ,swig))) + (inputs + `(("boost" ,boost) + ("coin3D" ,coin3D) + ("eigen" ,eigen) + ("freetype" ,freetype) + ("glew" ,glew) + ("hdf5" ,hdf5) + ("libarea" ,libarea) + ("libspnav" ,libspnav) + ("libmedfile" ,libmedfile) + ("openmpi" ,openmpi) + ("opencascade-oce" ,opencascade-oce) + ("python-matplotlib" ,python-matplotlib) + ("python-pyside-2" ,python-pyside-2) + ("python-pyside-2-tools" ,python-pyside-2-tools) + ("python-shiboken-2" ,python-shiboken-2) + ("python-wrapper" ,python-wrapper) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras) + ("qtxmlpatterns" ,qtxmlpatterns) + ("qtwebkit" ,qtwebkit) + ("soqt" ,soqt) + ("vtk" ,vtk) + ("xerces-c" ,xerces-c) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f + #:configure-flags + (list + "-DBUILD_QT5=ON" + (string-append "-DCMAKE_INSTALL_LIBDIR=" + (assoc-ref %outputs "out") "/lib")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'restore-pythonpath + (lambda _ + (substitute* "src/Main/MainGui.cpp" + (("_?putenv\\(\"PYTHONPATH=\"\\);") "")) + #t)) + (add-after 'install 'wrap-pythonpath + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/FreeCAD") + (list "PYTHONPATH" + 'prefix (list (getenv "PYTHONPATH"))))) + #t))))) + (home-page "https://www.freecadweb.org/") + (synopsis "Your Own 3D Parametric Modeler") + (description + "FreeCAD is a general purpose feature-based, parametric 3D modeler for +CAD, MCAD, CAx, CAE and PLM, aimed directly at mechanical engineering and +product design but also fits a wider range of uses in engineering, such as +architecture or other engineering specialties. It is 100% Open Source (LGPL2+ +license) and extremely modular, allowing for very advanced extension and +customization.") + ;; Help! + (license license:lgpl2.1+)))) (define-public libmedfile (package -- 2.22.0