[PATCH] Add LibreCAD.

[PATCH] Add LibreCAD.

[Ricardo Wurmus]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-Add-muparser.patch --]
[-- Type: text/x-patch, Size: 1804 bytes --]

From 874285b37143f049c1714f783ef246f33eb072c1 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 4 Mar 2015 09:16:57 +0100
Subject: [PATCH 1/2] gnu: Add muparser.

* gnu/packages/maths.scm (muparser): New variable.
---
 gnu/packages/maths.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 8c4eb3b..67204d4 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -28,6 +28,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix svn-download)
   #:use-module (guix utils)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
@@ -963,6 +964,31 @@ point numbers")
     ;; GPLv2 only is therefore the smallest subset.
     (license license:gpl2)))
 
+(define-public muparser
+  (package
+    (name "muparser")
+    (version "2.2.5")
+    (source
+     (origin
+       (method svn-fetch)
+       (uri (svn-reference
+             (url "http://muparser.googlecode.com/svn/trunk/")
+             (revision 34)))
+       (sha256
+        (base32
+         "1d6bdbhx9zj3srwj3m7c9hvr18gnx1fx43h6d25my7q85gicpcwn"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--enable-samples=no")
+       #:tests? #f)) ;no "check" target
+    (home-page "http://muparser.beltoforion.de/")
+    (synopsis "Fast parser library for mathematical expressions")
+    (description
+     "muParser is an extensible high performance math parser library.  It is
+based on transforming an expression into a bytecode and precalculating
+constant parts of it.")
+    (license license:expat)))
+
 (define-public atlas
   (package
     (name "atlas")
-- 
2.1.0


[-- Attachment #2: 0002-gnu-Add-LibreCAD.patch --]
[-- Type: text/x-patch, Size: 4350 bytes --]

From 9868dc327a649bcf712f9115b902426de286ced9 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 4 Mar 2015 09:46:04 +0100
Subject: [PATCH 2/2] gnu: Add LibreCAD.

* gnu/packages/engineering.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am                |  1 +
 gnu/packages/engineering.scm | 83 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 gnu/packages/engineering.scm

diff --git a/gnu-system.am b/gnu-system.am
index a500ec7..639902f 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -90,6 +90,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/elf.scm				\
   gnu/packages/emacs.scm			\
   gnu/packages/enchant.scm			\
+  gnu/packages/engineering.scm			\
   gnu/packages/feh.scm                          \
   gnu/packages/file.scm				\
   gnu/packages/firmware.scm			\
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
new file mode 100644
index 0000000..bd74f33
--- /dev/null
+++ b/gnu/packages/engineering.scm
@@ -0,0 +1,83 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages audio)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages maths)
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages which)
+  #:use-module (srfi srfi-1))
+
+(define-public librecad
+  (package
+    (name "librecad")
+    (version "2.0.6-rc")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/LibreCAD/LibreCAD/archive/"
+                    version ".tar.gz"))
+              (file-name (string-append name "-" version))
+              (sha256
+               (base32
+                "1n1mh8asj6yrl5hi438dvizmrbqk1kni5xkizhi3pdmkg7z3hksm"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (alist-cons-after
+        'unpack
+        'patch-paths
+        (lambda* (#:key outputs #:allow-other-keys)
+          (let ((out (assoc-ref outputs "out")))
+            (substitute* "librecad/src/lib/engine/rs_system.cpp"
+              (("/usr/share") (string-append out "/share")))))
+        (alist-replace
+         'configure
+         (lambda* (#:key inputs #:allow-other-keys)
+           (system* "qmake" (string-append "BOOST_DIR="
+                                           (assoc-ref inputs "boost"))))
+         (alist-replace
+          'install
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let ((out (assoc-ref outputs "out")))
+              (mkdir-p (string-append out "/bin"))
+              (mkdir-p (string-append out "/share/librecad"))
+              (copy-file "unix/librecad"
+                         (string-append out "/bin/librecad"))
+              (copy-recursively "unix/resources"
+                                (string-append out "/share/librecad"))))
+          %standard-phases)))))
+    (inputs
+     `(("boost" ,boost)
+       ("muparser" ,muparser)
+       ("qt" ,qt-4)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("which" ,which)))
+    (home-page "http://librecad.org/")
+    (synopsis "Computer-aided design (CAD) application")
+    (description
+     "LibreCAD is a 2D Computer-aided design (CAD) application for creating
+plans and designs.")
+    (license license:gpl2)))
-- 
2.1.0

Re: [PATCH] Add LibreCAD.

[Ricardo Wurmus]

I just noticed that the file does not import the pkg-config module.
I did not see this before and thus added the BOOST_LIB variable to the
qmake invocation.  This likely won't be necessary when pkg-config is
actually used.

I'll fix this in an updated patch.

~~ Ricardo

Re: [PATCH] Add LibreCAD.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> From 874285b37143f049c1714f783ef246f33eb072c1 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Wed, 4 Mar 2015 09:16:57 +0100
> Subject: [PATCH 1/2] gnu: Add muparser.
>
> * gnu/packages/maths.scm (muparser): New variable.

LGTM.

> From 9868dc327a649bcf712f9115b902426de286ced9 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Wed, 4 Mar 2015 09:46:04 +0100
> Subject: [PATCH 2/2] gnu: Add LibreCAD.
>
> * gnu/packages/engineering.scm: New file.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.

LGTM.

> +    (license license:gpl2)))

GPLv2-only?

Thanks!

Ludo'.

Re: [PATCH] Add LibreCAD.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> I just noticed that the file does not import the pkg-config module.
> I did not see this before and thus added the BOOST_LIB variable to the
> qmake invocation.  This likely won't be necessary when pkg-config is
> actually used.
>
> I'll fix this in an updated patch.

Oh, OK.

Ludo’.

Re: [PATCH] Add LibreCAD.

[Ricardo Wurmus]

Ludovic Courtès writes:

> Ricardo Wurmus <rekado@elephly.net> skribis:
>
>> I just noticed that the file does not import the pkg-config module.
>> I did not see this before and thus added the BOOST_LIB variable to the
>> qmake invocation.  This likely won't be necessary when pkg-config is
>> actually used.
>>
>> I'll fix this in an updated patch.

Actually, setting BOOST_LIB is necessary after all.  I pushed this after
also adding the optional freetype to the list of inputs.

The license of the whole work is GPLv2 only.

~~ Ricardo