01/06: gnu: hop: Update to 2.5.1.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit eccd1d24c9d5988557f03b058a7bc7e482a119f7
Author: Efraim Flashner <address@hidden>
Date:   Sun Oct 23 10:17:10 2016 +0300

    gnu: hop: Update to 2.5.1.
    
    * gnu/packages/scheme.scm (hop): Update to 2.5.1.
    [source]: Remove patch.
    * gnu/packages/patches/hop-bigloo-4.0b.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                               |    1 -
 gnu/packages/patches/hop-bigloo-4.0b.patch |  122 ----------------------------
 gnu/packages/scheme.scm                    |    7 +-
 3 files changed, 3 insertions(+), 127 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index cfd4480..eb8322e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -594,7 +594,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/hdf-eos5-fix-szip.patch                 \
   %D%/packages/patches/hdf-eos5-fortrantests.patch             \
   %D%/packages/patches/higan-remove-march-native-flag.patch    \
-  %D%/packages/patches/hop-bigloo-4.0b.patch                   \
   %D%/packages/patches/hop-linker-flags.patch                  \
   %D%/packages/patches/hydra-disable-darcs-test.patch          \
   %D%/packages/patches/hypre-doc-tables.patch                  \
diff --git a/gnu/packages/patches/hop-bigloo-4.0b.patch 
b/gnu/packages/patches/hop-bigloo-4.0b.patch
deleted file mode 100644
index 312bfdd..0000000
--- a/gnu/packages/patches/hop-bigloo-4.0b.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Bigloo 4.0b removes `xml-attribute-encode', which leads to a build failure
-in Hop.
-
-This patch allows Hop to be compiled with Bigloo 4.0b.
-
-
-changeset:   3327:3515f7f1aef2
-branch:      2.4.x
-user:        Manuel Serrano <address@hidden>
-date:        Wed Jul 31 12:41:10 2013 +0200
-summary:     Fix serialization bug
-
-diff -r 7244c4d30ad4 -r 3515f7f1aef2 runtime/js_comp.scm
---- a/runtime/js_comp.scm      Fri Jul 19 08:28:13 2013 +0200
-+++ b/runtime/js_comp.scm      Wed Jul 31 12:41:10 2013 +0200
-@@ -143,10 +143,17 @@
-       (display "{ " op)
-       (display-seq fields op
-        (lambda (f op)
-+          (let ((iv (class-field-info f)))
-           (display "'" op)
-           (display (class-field-name f) op)
-           (display "': " op)
--          (compile ((class-field-accessor f) obj) op)))
-+             (cond
-+                ((and (pair? iv) (memq :client iv))
-+                 =>
-+                 (lambda (x)
-+                    (compile (when (pair? (cdr x)) (cadr x)) op)))
-+                (else 
-+                 (compile ((class-field-accessor f) obj) op))))))
-       (display "}" op))
-    
-    (let ((klass (object-class obj)))
-diff -r 7244c4d30ad4 -r 3515f7f1aef2 runtime/xml.scm
---- a/runtime/xml.scm  Fri Jul 19 08:28:13 2013 +0200
-+++ b/runtime/xml.scm  Wed Jul 31 12:41:10 2013 +0200
-@@ -55,6 +55,7 @@
-           (generic xml-write-attribute ::obj ::obj ::output-port 
::xml-backend)
-           (generic xml-write-expression ::obj ::output-port)
-           (xml-write-attributes ::pair-nil ::output-port ::xml-backend)
-+          (xml-attribute-encode obj)
- 
-           (xml->string ::obj ::xml-backend)
-           
-@@ -613,6 +614,52 @@
-        (display ">" p))))
- 
- ;*---------------------------------------------------------------------*/
-+;*    xml-attribute-encode ...                                         */
-+;*---------------------------------------------------------------------*/
-+(define (xml-attribute-encode obj)
-+   (if (not (string? obj))
-+       obj
-+       (let ((ol (string-length obj)))
-+        (define (count str ol)
-+           (let loop ((i 0)
-+                      (j 0))
-+              (if (=fx i ol)
-+                  j
-+                  (let ((c (string-ref str i)))
-+                     ;; attribute values should escape &#...
-+                     (if (or (char=? c #\') (char=? c #\&))
-+                         (loop (+fx i 1) (+fx j 5))
-+                         (loop (+fx i 1) (+fx j 1)))))))
-+        (define (encode str ol nl)
-+           (if (=fx nl ol)
-+               obj
-+               (let ((nstr (make-string nl)))
-+                  (let loop ((i 0)
-+                             (j 0))
-+                     (if (=fx j nl)
-+                         nstr
-+                         (let ((c (string-ref str i)))
-+                            (case c
-+                               ((#\')
-+                                (string-set! nstr j #\&)
-+                                (string-set! nstr (+fx j 1) #\#)
-+                                (string-set! nstr (+fx j 2) #\3)
-+                                (string-set! nstr (+fx j 3) #\9)
-+                                (string-set! nstr (+fx j 4) #\;)
-+                                (loop (+fx i 1) (+fx j 5)))
-+                               ((#\&)
-+                                (string-set! nstr j #\&)
-+                                (string-set! nstr (+fx j 1) #\#)
-+                                (string-set! nstr (+fx j 2) #\3)
-+                                (string-set! nstr (+fx j 3) #\8)
-+                                (string-set! nstr (+fx j 4) #\;)
-+                                (loop (+fx i 1) (+fx j 5)))
-+                               (else
-+                                (string-set! nstr j c)
-+                                (loop (+fx i 1) (+fx j 1))))))))))
-+        (encode obj ol (count obj ol)))))
-+
-+;*---------------------------------------------------------------------*/
- ;*    xml-write-attributes ...                                         */
- ;*---------------------------------------------------------------------*/
- (define (xml-write-attributes attr p backend)
-diff -r 7244c4d30ad4 -r 3515f7f1aef2 share/hop-serialize.js
---- a/share/hop-serialize.js   Fri Jul 19 08:28:13 2013 +0200
-+++ b/share/hop-serialize.js   Wed Jul 31 12:41:10 2013 +0200
-@@ -942,7 +942,7 @@
-        case 0x2e /* . */: return null;
-        case 0x3c /* < */: return read_cnst();
-          case 0x22 /* " */: return read_string( s );
--         case 0x25 /* " */: return decodeURIComponent( read_string( s ) );
-+         case 0x25 /* % */: return decodeURIComponent( read_string( s ) );
-          case 0x55 /* U */: return read_string( s );
-        case 0x5b /* [ */: return read_vector( read_size( s ) );
-        case 0x28 /* ( */: return read_list( read_size( s ) );
-diff -r 7244c4d30ad4 -r 3515f7f1aef2 src/main.scm
---- a/src/main.scm     Fri Jul 19 08:28:13 2013 +0200
-+++ b/src/main.scm     Wed Jul 31 12:41:10 2013 +0200
-@@ -59,8 +59,6 @@
-    (for-each register-srfi! (cons 'hop-server (hop-srfis)))
-    ;; set the library load path
-    (bigloo-library-path-set! (hop-library-path))
--   ;; define the Hop macros
--   (hop-install-expanders!)
-    ;; setup the hop readers
-    (bigloo-load-reader-set! hop-read)
-    (bigloo-load-module-set!
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 41a7bf5..c8e747d 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -283,16 +283,15 @@ Scheme and C programs and between Scheme and Java 
programs.")
 (define-public hop
   (package
     (name "hop")
-    (version "2.4.0")
+    (version "2.5.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "ftp://ftp-sop.inria.fr/indes/fp/Hop/hop-";
                                  version ".tar.gz"))
              (sha256
               (base32
-               "1v2r4ga58kk1sx0frn8qa8ccmjpic9csqzpk499wc95y9c4b1wy3"))
-             (patches (search-patches "hop-bigloo-4.0b.patch"
-                                      "hop-linker-flags.patch"))))
+               "1bvp7pc71bln5yvfj87s8750c6l53wjl6f8m12v62q9926adhwys"))
+             (patches (search-patches "hop-linker-flags.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases