pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/eliom Updated www/eliom to version 6.6.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/c6fbbcd3b136
branches: trunk
changeset: 318765:c6fbbcd3b136
user: jaapb <jaapb%pkgsrc.org@localhost>
date: Tue Jan 29 13:33:00 2019 +0000
description:
Updated www/eliom to version 6.6.0.
Changes include:
- support for tyxml 4.3.x and js_of_ocaml 3.3.x (rendering obsolete a lot
of patches);
- compatibility with lwt 4.x (same);
and several other bugfixes and minor improvements.
diffstat:
www/eliom/Makefile | 5 +-
www/eliom/distinfo | 24 +-
www/eliom/patches/patch-pkg_META | 14 +-
www/eliom/patches/patch-src__tags | 44 -
www/eliom/patches/patch-src_lib_client_eliom__client.js | 17 -
www/eliom/patches/patch-src_lib_eliom__client.client.ml | 16 -
www/eliom/patches/patch-src_lib_eliom__config.server.mli | 21 -
www/eliom/patches/patch-src_lib_eliom__content__core.client.mk | 39 -
www/eliom/patches/patch-src_lib_eliom__content__core.client.mli | 30 -
www/eliom/patches/patch-src_lib_eliom__content__core.server.ml | 22 -
www/eliom/patches/patch-src_lib_eliom__content__core.server.mli | 14 -
www/eliom/patches/patch-src_lib_eliom__runtime.shared.ml | 14 -
www/eliom/patches/patch-src_lib_eliom__runtime.shared.mli | 14 -
www/eliom/patches/patch-src_lib_eliom__shared__content.eliom | 25 -
www/eliom/patches/patch-src_lib_server_eliommod.ml | 250 ----------
15 files changed, 15 insertions(+), 534 deletions(-)
diffs (truncated from 626 to 300 lines):
diff -r a268f37b53a5 -r c6fbbcd3b136 www/eliom/Makefile
--- a/www/eliom/Makefile Tue Jan 29 13:08:06 2019 +0000
+++ b/www/eliom/Makefile Tue Jan 29 13:33:00 2019 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2018/11/29 12:04:23 jaapb Exp $
+# $NetBSD: Makefile,v 1.26 2019/01/29 13:33:00 jaapb Exp $
#
GITHUB_PROJECT= eliom
-DISTNAME= ${GITHUB_PROJECT}-6.3.0
-PKGREVISION= 5
+DISTNAME= ${GITHUB_PROJECT}-6.6.0
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
diff -r a268f37b53a5 -r c6fbbcd3b136 www/eliom/distinfo
--- a/www/eliom/distinfo Tue Jan 29 13:08:06 2019 +0000
+++ b/www/eliom/distinfo Tue Jan 29 13:33:00 2019 +0000
@@ -1,20 +1,8 @@
-$NetBSD: distinfo,v 1.12 2018/11/29 12:04:23 jaapb Exp $
+$NetBSD: distinfo,v 1.13 2019/01/29 13:33:00 jaapb Exp $
-SHA1 (eliom-6.3.0.tar.gz) = dcb78ec42965d626f6891c5f01249a2afa29a820
-RMD160 (eliom-6.3.0.tar.gz) = 98e8c64beb41a130d2e38959986285a074a04f79
-SHA512 (eliom-6.3.0.tar.gz) = d597e7c432dbafb8c4b8f36bf3c8ad43867cfdb4b6d9138358e3aff2e67bdf7c50dc4676cdf03b42da5f66749db3b2e3a9357bc4df9a0754c775480785e96f41
-Size (eliom-6.3.0.tar.gz) = 728342 bytes
-SHA1 (patch-pkg_META) = 3bc8da3cf9039e7d9aae9c4f6747002a8e7ec002
+SHA1 (eliom-6.6.0.tar.gz) = abd19c15f98ee9a7773132822440000e191757bf
+RMD160 (eliom-6.6.0.tar.gz) = 768a016251425b02b7995fb223b7714cb1a1c434
+SHA512 (eliom-6.6.0.tar.gz) = fef515c36c0663e553d83e14f0a38e2af84c7bc5707a39d23a107d69287dfdebc63145f6c97e5a3d86ea2d762af98c501725b71d4e28bff8ae4af83b928c59e6
+Size (eliom-6.6.0.tar.gz) = 653174 bytes
+SHA1 (patch-pkg_META) = 8fea0fe537cdc68d7a2e1a9cabc017ab2383d470
SHA1 (patch-pkg_build.ml) = 8597e17fc869b7a8e93ee30f551a92c694617dbc
-SHA1 (patch-src__tags) = 30b01766674fbb8361792983f3b92fdd081c909a
-SHA1 (patch-src_lib_client_eliom__client.js) = 9b12dcd6dae9f554c6c81cefc4e548fbbd163978
-SHA1 (patch-src_lib_eliom__client.client.ml) = e66600dcf8011d3833756ea25f7e1884fd090815
-SHA1 (patch-src_lib_eliom__config.server.mli) = 1279df3d3514a64d2aa4a9276a672fe5aeeee14b
-SHA1 (patch-src_lib_eliom__content__core.client.mk) = 4177935bfb544c4365cff84b982933779d1ed857
-SHA1 (patch-src_lib_eliom__content__core.client.mli) = 2d265a4aac7bbd1fa0a5723fc5aa07b0d799d6ad
-SHA1 (patch-src_lib_eliom__content__core.server.ml) = ffb3b1f8dcffeb906d903d66592bbf8bc935da05
-SHA1 (patch-src_lib_eliom__content__core.server.mli) = 4298ca16ef2cc02273da3b0c696a469c4d8aee8b
-SHA1 (patch-src_lib_eliom__runtime.shared.ml) = e56788b4ff5ccdecd3a4925a83deea636c14275b
-SHA1 (patch-src_lib_eliom__runtime.shared.mli) = 07f43bad1362d9e6252ccc2bb76c656cfb3f42ec
-SHA1 (patch-src_lib_eliom__shared__content.eliom) = d6627d04b28000571b81c46f3eb6525131612a4f
-SHA1 (patch-src_lib_server_eliommod.ml) = 28f66e505b12e18ff63e45db80dd6e02bb92ec28
diff -r a268f37b53a5 -r c6fbbcd3b136 www/eliom/patches/patch-pkg_META
--- a/www/eliom/patches/patch-pkg_META Tue Jan 29 13:08:06 2019 +0000
+++ b/www/eliom/patches/patch-pkg_META Tue Jan 29 13:33:00 2019 +0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-pkg_META,v 1.4 2018/11/29 12:04:23 jaapb Exp $
+$NetBSD: patch-pkg_META,v 1.5 2019/01/29 13:33:00 jaapb Exp $
-Remove deprecated tyxml.syntax (patch from upstream)
---- pkg/META.orig 2018-02-08 14:30:46.000000000 +0000
+Remove camlp4 support (no longer in js_of_ocaml)
+--- pkg/META.orig 2018-12-19 14:15:17.000000000 +0000
+++ pkg/META
@@ -98,8 +98,8 @@ package "syntax" (
description = "Syntax extension: predefined commonly use syntaxes"
version = "[distributed with Eliom]"
-- requires(syntax, preprocessor) = "js_of_ocaml.syntax,js_of_ocaml-camlp4.deriving,lwt.syntax,tyxml.syntax"
-- requires(syntax, toploop) = "js_of_ocaml.syntax,js_of_ocaml-camlp4.deriving,lwt.syntax,tyxml.syntax"
-+ requires(syntax, preprocessor) = "js_of_ocaml.syntax,js_of_ocaml-camlp4.deriving,lwt_camlp4"
-+ requires(syntax, toploop) = "js_of_ocaml.syntax,js_of_ocaml-camlp4.deriving,lwt_camlp4"
+- requires(syntax, preprocessor) = "js_of_ocaml-camlp4,js_of_ocaml-camlp4.deriving,lwt_camlp4"
+- requires(syntax, toploop) = "js_of_ocaml-camlp4,js_of_ocaml-camlp4.deriving,lwt_camlp4"
++ requires(syntax, preprocessor) = "lwt_camlp4"
++ requires(syntax, toploop) = "lwt_camlp4"
archive(syntax, preprocessor) = "-ignore dummy"
)
diff -r a268f37b53a5 -r c6fbbcd3b136 www/eliom/patches/patch-src__tags
--- a/www/eliom/patches/patch-src__tags Tue Jan 29 13:08:06 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$NetBSD: patch-src__tags,v 1.3 2018/11/29 12:04:23 jaapb Exp $
-
-lwt_ppx is now its own package and has been renamed
-Use xml-light (patch from upstream)
---- src/_tags.orig 2018-02-08 14:30:46.000000000 +0000
-+++ src/_tags
-@@ -2,23 +2,23 @@
- true:keep_locs
-
- <lib/type_dir/*.ml{,i}>:eliom_ppx,thread
--<lib/type_dir/*.ml>:package(js_of_ocaml-ppx.deriving,lwt.ppx)
-+<lib/type_dir/*.ml>:package(js_of_ocaml-ppx.deriving,lwt_ppx)
- <lib/type_dir/*.ml>:package(js_of_ocaml.ppx)
-
- <lib/server/*.ml{,i}>:eliom_ppx
--<lib/server/*.ml>:package(js_of_ocaml-ppx.deriving,lwt.ppx)
-+<lib/server/*.ml>:package(js_of_ocaml-ppx.deriving,lwt_ppx)
- <lib/server/*.ml>:package(js_of_ocaml.ppx)
-
- <lib/server/*.ml{,i}>:thread
- <lib/server/*.ml{,i}>:package(lwt,ocsigenserver,ocsigenserver.ext,tyxml.functor)
--<lib/server/*.ml{,i}>:package(react,lwt_react,js_of_ocaml)
--
-+<lib/server/*.ml{,i}>:package(react,lwt_react,js_of_ocaml,lwt_log)
- <lib/server/*.ml{,i}>:package(js_of_ocaml-ppx.deriving)
-+<lib/server/*.ml{,i}>:package(xml-light)
-
- <lib/*.eliom{,i}>:eliom_ppx
-
- <lib/*.ml{,i}>:eliom_ppx
--<lib/client/*.ml>:package(js_of_ocaml-ppx.deriving,lwt.ppx,js_of_ocaml-lwt.logger)
-+<lib/client/*.ml>:package(js_of_ocaml-ppx.deriving,lwt_ppx,js_of_ocaml-lwt.logger)
- <lib/client/*.ml>:package(js_of_ocaml.ppx)
-
- <lib/client/*.ml{,i}>: eliom_ppx
-@@ -29,7 +29,7 @@ true:keep_locs
-
- <lib/client/*.ml{,i}>:package(js_of_ocaml-ppx.deriving)
-
--<lib/server/monitor/*.ml>:package(lwt.ppx)
-+<lib/server/monitor/*.ml>:package(lwt_ppx)
- <lib/server/monitor/*.ml{,i}>:thread
- <lib/server/monitor/*.ml{,i}>:package(lwt,ocsigenserver,ocsigenserver.ext,tyxml)
- <lib/server/monitor/*.ml{,i}>:I(src/lib/server)
diff -r a268f37b53a5 -r c6fbbcd3b136 www/eliom/patches/patch-src_lib_client_eliom__client.js
--- a/www/eliom/patches/patch-src_lib_client_eliom__client.js Tue Jan 29 13:08:06 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$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; },
diff -r a268f37b53a5 -r c6fbbcd3b136 www/eliom/patches/patch-src_lib_eliom__client.client.ml
--- a/www/eliom/patches/patch-src_lib_eliom__client.client.ml Tue Jan 29 13:08:06 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_lib_eliom__client.client.ml,v 1.1 2018/04/13 13:17:34 jaapb Exp $
-
-The >> syntax has been removed in Lwt 4.0.0.
---- src/lib/eliom_client.client.ml.orig 2018-02-08 14:30:46.000000000 +0000
-+++ src/lib/eliom_client.client.ml
-@@ -1305,8 +1305,8 @@ let () =
- uri [(Eliom_request.nl_template_string, t)]
- Eliom_request.string_result
- in
-- set_template_content ~replace:true ~uri content >>
-- (scroll_to_fragment ~offset:state.position fragment;
-+ set_template_content ~replace:true ~uri content >>=
-+ fun () -> (scroll_to_fragment ~offset:state.position fragment;
- Lwt.return_unit)
- | _ ->
- with_new_page
diff -r a268f37b53a5 -r c6fbbcd3b136 www/eliom/patches/patch-src_lib_eliom__config.server.mli
--- a/www/eliom/patches/patch-src_lib_eliom__config.server.mli Tue Jan 29 13:08:06 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_lib_eliom__config.server.mli,v 1.1 2018/11/29 12:04:23 jaapb Exp $
-
-Use xml-light (patch from upstream)
---- src/lib/eliom_config.server.mli.orig 2018-02-08 14:30:46.000000000 +0000
-+++ src/lib/eliom_config.server.mli
-@@ -89,13 +89,13 @@ val get_default_links_xhr : unit -> bool
- function inside the initialisation function given to
- {!Eliom_service.register_eliom_module}.}
- *)
--val get_config : unit -> Simplexmlparser.xml list
-+val get_config : unit -> Xml.xml list
-
- (** Process the configuration
- (same as the one returned by
- {% <<a_api module="Eliom_config" | val get_config>> %})
- by a given specification (cf. {% <<a_api project="ocsigenserver" | type Ocsigen_extensions.Configuration.element >> %}) *)
--val parse_config : ?pcdata:(string -> unit) -> ?other_elements:(string -> (string * string) list -> Simplexmlparser.xml list -> unit) -> Ocsigen_extensions.Configuration.element list -> unit
-+val parse_config : ?pcdata:(string -> unit) -> ?other_elements:(string -> (string * string) list -> Xml.xml list -> unit) -> Ocsigen_extensions.Configuration.element list -> unit
-
- (** The function [get_config_info ()] returns the information
- concerning the current request from the configuration files
diff -r a268f37b53a5 -r c6fbbcd3b136 www/eliom/patches/patch-src_lib_eliom__content__core.client.mk
--- a/www/eliom/patches/patch-src_lib_eliom__content__core.client.mk Tue Jan 29 13:08:06 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-src_lib_eliom__content__core.client.mk,v 1.1 2018/11/29 12:04:23 jaapb Exp $
-
-Compile with tyxml 4.3.0
---- src/lib/eliom_content_core.client.ml.orig 2018-02-08 14:30:46.000000000 +0000
-+++ src/lib/eliom_content_core.client.ml
-@@ -90,6 +90,7 @@ module Xml = struct
- type event_handler = Dom_html.event Js.t -> unit
- type mouse_event_handler = Dom_html.mouseEvent Js.t -> unit
- type keyboard_event_handler = Dom_html.keyboardEvent Js.t -> unit
-+ type touch_event_handler = Dom_html.touchEvent Js.t -> unit
-
- let event_handler_attrib name (value : event_handler) =
- internal_event_handler_attrib name
-@@ -100,6 +101,9 @@ module Xml = struct
- let keyboard_event_handler_attrib name (value : keyboard_event_handler) =
- internal_event_handler_attrib name
- (Caml (CE_client_closure_keyboard value))
-+ let touch_event_handler_attrib name (value : touch_event_handler) =
-+ internal_event_handler_attrib name
-+ (Caml (CE_client_closure_touch value))
-
- let node_react_children ?(a = []) name children =
- {elt = Lazy.from_val (ReactChildren (Node (name,a,[]),children)); node_id=NoId}
-@@ -183,6 +187,7 @@ struct
- type event_handler = Xml.event_handler
- type mouse_event_handler = Xml.mouse_event_handler
- type keyboard_event_handler = Xml.keyboard_event_handler
-+ type touch_event_handler = Xml.touch_event_handler
- type attrib = Xml.attrib
-
- let float_attrib name s : attrib =
-@@ -198,6 +203,7 @@ struct
- let event_handler_attrib = Xml.event_handler_attrib
- let mouse_event_handler_attrib = Xml.mouse_event_handler_attrib
- let keyboard_event_handler_attrib = Xml.keyboard_event_handler_attrib
-+ let touch_event_handler_attrib = Xml.touch_event_handler_attrib
- let uri_attrib name value =
- name, Xml.RAReact (React.S.map
- (fun f -> Some (Xml.AStr (Eliom_lazy.force f))) value)
diff -r a268f37b53a5 -r c6fbbcd3b136 www/eliom/patches/patch-src_lib_eliom__content__core.client.mli
--- a/www/eliom/patches/patch-src_lib_eliom__content__core.client.mli Tue Jan 29 13:08:06 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_lib_eliom__content__core.client.mli,v 1.1 2018/11/29 12:04:23 jaapb Exp $
-
-Compile with tyxml 4.3.0
---- src/lib/eliom_content_core.client.mli.orig 2018-02-08 14:30:46.000000000 +0000
-+++ src/lib/eliom_content_core.client.mli
-@@ -44,6 +44,8 @@ module Xml : sig
- (Dom_html.mouseEvent Js.t -> unit) (* Client side-only *)
- | CE_client_closure_keyboard of
- (Dom_html.keyboardEvent Js.t -> unit) (* Client side-only *)
-+ | CE_client_closure_touch of
-+ (Dom_html.touchEvent Js.t -> unit) (* Client side-only *)
- | CE_call_service of
- ( [ `A | `Form_get | `Form_post] *
- ((bool * string list) option) *
-@@ -55,6 +57,7 @@ module Xml : sig
- type event_handler = Dom_html.event Js.t -> unit
- type mouse_event_handler = Dom_html.mouseEvent Js.t -> unit
- type keyboard_event_handler = Dom_html.keyboardEvent Js.t -> unit
-+ type touch_event_handler = Dom_html.touchEvent Js.t -> unit
-
- type ename = string
- type elt
-@@ -109,6 +112,7 @@ module Xml : sig
- val event_handler_attrib : aname -> event_handler -> attrib
- val mouse_event_handler_attrib : aname -> mouse_event_handler -> attrib
- val keyboard_event_handler_attrib : aname -> keyboard_event_handler -> attrib
-+ val touch_event_handler_attrib : aname -> touch_event_handler -> attrib
- val uri_attrib : aname -> uri -> attrib
- val uris_attrib : aname -> uri list -> attrib
-
diff -r a268f37b53a5 -r c6fbbcd3b136 www/eliom/patches/patch-src_lib_eliom__content__core.server.ml
--- a/www/eliom/patches/patch-src_lib_eliom__content__core.server.ml Tue Jan 29 13:08:06 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_lib_eliom__content__core.server.ml,v 1.1 2018/11/29 12:04:23 jaapb Exp $
-
-Compile with tyxml 4.3.0
---- src/lib/eliom_content_core.server.ml.orig 2018-02-08 14:30:46.000000000 +0000
-+++ src/lib/eliom_content_core.server.ml
-@@ -118,6 +118,7 @@ module Xml = struct
- type event_handler = (Dom_html.event Js.t -> unit) Eliom_client_value.t
- type mouse_event_handler = (Dom_html.mouseEvent Js.t -> unit) Eliom_client_value.t
- type keyboard_event_handler = (Dom_html.keyboardEvent Js.t -> unit) Eliom_client_value.t
-+ type touch_event_handler = (Dom_html.touchEvent Js.t -> unit) Eliom_client_value.t
-
- let make_cryptographic_safe_string () =
- (* FIX: we should directly produce a string of the right length *)
-@@ -138,6 +139,8 @@ module Xml = struct
- biggest_event_handler_attrib name cf
- let keyboard_event_handler_attrib name (cf : keyboard_event_handler) =
- biggest_event_handler_attrib name cf
-+ let touch_event_handler_attrib name (cf : touch_event_handler) =
-+ biggest_event_handler_attrib name cf
-
- let client_attrib ?init (x : attrib Eliom_client_value.t) =
- let crypto = make_cryptographic_safe_string () in
diff -r a268f37b53a5 -r c6fbbcd3b136 www/eliom/patches/patch-src_lib_eliom__content__core.server.mli
--- a/www/eliom/patches/patch-src_lib_eliom__content__core.server.mli Tue Jan 29 13:08:06 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_lib_eliom__content__core.server.mli,v 1.1 2018/11/29 12:04:23 jaapb Exp $
-
-Compile with tyxml 4.3.0
---- src/lib/eliom_content_core.server.mli.orig 2018-02-08 14:30:46.000000000 +0000
-+++ src/lib/eliom_content_core.server.mli
-@@ -30,6 +30,8 @@ module Xml : sig
- (Dom_html.mouseEvent Js.t -> unit) Eliom_client_value.t
Home |
Main Index |
Thread Index |
Old Index