Subject: bug#24026: librecad and dealii depend on relocated muparser source code repo

From: Leo Famulari <[email-masked]>
Date: Wed, 20 Jul 2016 12:39:45 -0400

On Wed, Jul 20, 2016 at 07:07:25AM -0400, Mark H Weaver wrote:
> Hmm.  It would be good to see the diff between the two "versions" of
> 2.2.5.  If there's anything substantive in there, then we might want to
> bump the version on our behalf.  Otherwise it probably doesn't matter.

The difference seem trivial to me. There are fixed typos in comments,
and code changes in 'example1.cpp'. I assume that 'example1.cpp' is
unimportant, but I don't know.

What do you think about the attached patch?
>From 3ba3928f107d365bcc68c37136f04d0402401c84 Mon Sep 17 00:00:00 2001
From: Leo Famulari <[email-masked]>
Date: Wed, 20 Jul 2016 02:17:30 -0400
Subject: [PATCH] gnu: muparser: Update source URL.

* gnu/packages/maths.scm (muparser)[source]: Update source URL to new location.
Use URL-FETCH instead of SVN-FETCH. Update hash and package revision.
---
 gnu/packages/maths.scm | 50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index b8ec213..22b7bdc 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2016 Roel Janssen <[email-masked]>
 ;;; Copyright © 2016 Kei Kebreau <[email-masked]>
 ;;; Copyright © 2016 Ludovic Courtès <[email-masked]>
+;;; Copyright © 2016 Leo Famulari <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -35,7 +36,6 @@
   #: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 utils)
   #:use-module (guix build-system cmake)
@@ -1791,29 +1791,31 @@ associated functions (eg. contiguous and non-contiguous submatrix views).")
                 "1cdpjxb0fz5f28y5qrqgpw53s7qi8s2v3al9lfdldqxngb21vpx8"))))))
 
 (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)))
+  (let ((upstream-version "2.2.5")
+        (revision "2"))
+    (package
+      (name "muparser")
+      (version (string-append upstream-version "-" revision))
+      (source
+       (origin
+         (method url-fetch)
+         (uri (string-append "https://github.com/beltoforion/muparser/archive/v"
+                             upstream-version ".tar.gz"))
+         (file-name (string-append name "-" version ".tar.gz"))
+         (sha256
+          (base32
+           "0277qsi5l23jsck1vhn383bmvc2n9l4a1dl5r9bf7hvjv9ayyrh6"))))
+      (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 openblas
   (package
-- 
2.9.1