summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorjaapb <jaapb@pkgsrc.org>2018-08-15 13:51:50 +0000
committerjaapb <jaapb@pkgsrc.org>2018-08-15 13:51:50 +0000
commit6c5fb2f4259bd11f201e5a5e21c8be63150760fd (patch)
tree32c141c88e428e3888315bfaf7a41ef71cb4945d /www
parent47fc0773840434f3c064d704c8ce97524eb06896 (diff)
downloadpkgsrc-6c5fb2f4259bd11f201e5a5e21c8be63150760fd.tar.gz
Added patch to www/eliom, and revbump.
This is a patch from an upstream pull request (#577) without which compiled JavaScript does not run.
Diffstat (limited to 'www')
-rw-r--r--www/eliom/Makefile4
-rw-r--r--www/eliom/distinfo3
-rw-r--r--www/eliom/patches/patch-src_lib_client_eliom__client.js17
3 files changed, 21 insertions, 3 deletions
diff --git a/www/eliom/Makefile b/www/eliom/Makefile
index 200c6e38e01..a961757f8be 100644
--- a/www/eliom/Makefile
+++ b/www/eliom/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2018/07/19 15:15:30 jaapb Exp $
+# $NetBSD: Makefile,v 1.23 2018/08/15 13:51:50 jaapb Exp $
#
GITHUB_PROJECT= eliom
DISTNAME= ${GITHUB_PROJECT}-6.3.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
diff --git a/www/eliom/distinfo b/www/eliom/distinfo
index 88437a1333d..8c1ebac5c92 100644
--- a/www/eliom/distinfo
+++ b/www/eliom/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2018/06/06 08:34:35 jaapb Exp $
+$NetBSD: distinfo,v 1.11 2018/08/15 13:51:50 jaapb Exp $
SHA1 (eliom-6.3.0.tar.gz) = dcb78ec42965d626f6891c5f01249a2afa29a820
RMD160 (eliom-6.3.0.tar.gz) = 98e8c64beb41a130d2e38959986285a074a04f79
@@ -7,4 +7,5 @@ Size (eliom-6.3.0.tar.gz) = 728342 bytes
SHA1 (patch-pkg_META) = 979a5332ac6aafb909e6664d01c3bd6c3c551dc7
SHA1 (patch-pkg_build.ml) = 8597e17fc869b7a8e93ee30f551a92c694617dbc
SHA1 (patch-src__tags) = 5aff5c25080159e71847ca4caffb53641c5e2811
+SHA1 (patch-src_lib_client_eliom__client.js) = 9b12dcd6dae9f554c6c81cefc4e548fbbd163978
SHA1 (patch-src_lib_eliom__client.client.ml) = e66600dcf8011d3833756ea25f7e1884fd090815
diff --git a/www/eliom/patches/patch-src_lib_client_eliom__client.js b/www/eliom/patches/patch-src_lib_client_eliom__client.js
new file mode 100644
index 00000000000..af353d40048
--- /dev/null
+++ b/www/eliom/patches/patch-src_lib_client_eliom__client.js
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_lib_client_eliom__client.js,v 1.1 2018/08/15 13:51:50 jaapb Exp $
+
+Use caml_jsbytes (from upstream pull request #577)
+--- src/lib/client/eliom_client.js.orig 2018-02-08 14:30:46.000000000 +0000
++++ src/lib/client/eliom_client.js
+@@ -3,9 +3,9 @@
+ //Provides: caml_unwrap_value_from_string mutable
+ //Requires: caml_failwith, caml_marshal_constants
+ //Requires: caml_int64_float_of_bits, caml_int64_of_bytes, caml_new_string
+-//Requires: caml_bytes_of_string
++//Requires: caml_jsbytes_of_string
+ var caml_unwrap_value_from_string = function (){
+- function StringReader (s, i) { this.s = caml_bytes_of_string(s); this.i = i; }
++ function StringReader (s, i) { this.s = caml_jsbytes_of_string(s); this.i = i; }
+ StringReader.prototype = {
+ read8u:function () { return this.s.charCodeAt(this.i++); },
+ read8s:function () { return this.s.charCodeAt(this.i++) << 24 >> 24; },