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.3.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/9ae98eb6e820
branches: trunk
changeset: 378687:9ae98eb6e820
user: jaapb <jaapb%pkgsrc.org@localhost>
date: Fri Apr 13 13:17:34 2018 +0000
description:
Updated www/eliom to version 6.3.0.
This version adds compatibility with OCaml 4.06, Lwt 3 (and 4) and
js_of_ocaml 3.
It also has various small bugfixes and improvements.
diffstat:
www/eliom/Makefile | 15 +-
www/eliom/distinfo | 19 +-
www/eliom/patches/patch-pkg_META | 48 ----
www/eliom/patches/patch-src__tags | 43 +--
www/eliom/patches/patch-src_lib_eliom__client.client.ml | 16 +
www/eliom/patches/patch-src_lib_eliom_content_.client.ml | 15 -
www/eliom/patches/patch-src_lib_eliom_request.client.ml | 146 -------------
www/eliom/patches/patch-src_lib_eliom_request.client.mli | 13 -
www/eliom/patches/patch-src_ocamlbuild_ocamlbuild_eliom.ml | 26 --
www/eliom/patches/patch-src_tools_utils.ml | 26 --
10 files changed, 50 insertions(+), 317 deletions(-)
diffs (truncated from 453 to 300 lines):
diff -r 6539d2c5c978 -r 9ae98eb6e820 www/eliom/Makefile
--- a/www/eliom/Makefile Fri Apr 13 13:15:11 2018 +0000
+++ b/www/eliom/Makefile Fri Apr 13 13:17:34 2018 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2018/01/10 16:53:14 jaapb Exp $
+# $NetBSD: Makefile,v 1.20 2018/04/13 13:17:34 jaapb Exp $
#
GITHUB_PROJECT= eliom
-DISTNAME= ${GITHUB_PROJECT}-6.2.0
-PKGREVISION= 3
+DISTNAME= ${GITHUB_PROJECT}-6.3.0
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
@@ -16,9 +15,8 @@
USE_LANGUAGES= c
OCAML_USE_FINDLIB= yes
-DEPENDS+= ocsigen>=2.8:../../www/ocsigen
-DEPENDS+= ocaml-deriving-ocsigen>=0.7.1:../../devel/ocaml-deriving-ocsigen
-
+DEPENDS+= ocsigen>=2.9:../../www/ocsigen
+DEPENDS+= ocaml-deriving-ocsigen>=0.8.1:../../devel/ocaml-deriving-ocsigen
.include "../../mk/ocaml.mk"
@@ -32,10 +30,11 @@
cd ${WRKSRC} && opam-installer --install --prefix ${DESTDIR}${PREFIX} --libdir ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR} --docdir ${DESTDIR}${PREFIX}/share/doc eliom.install
.include "../../devel/js_of_ocaml/buildlink3.mk"
+.include "../../devel/ocaml-lwt_log/buildlink3.mk"
+.include "../../devel/ocaml-lwt_ppx/buildlink3.mk"
+.include "../../devel/ocaml-ppx_tools/buildlink3.mk"
.include "../../devel/ocaml-react/buildlink3.mk"
.include "../../devel/ocaml-reactiveData/buildlink3.mk"
-.include "../../devel/ocaml-optcomp/buildlink3.mk"
-.include "../../devel/ocaml-ppx_tools/buildlink3.mk"
.include "../../devel/ocamlbuild/buildlink3.mk"
.include "../../misc/ocaml-opam/buildlink3.mk"
BUILDLINK_DEPMETHOD.ocaml-opam?= build
diff -r 6539d2c5c978 -r 9ae98eb6e820 www/eliom/distinfo
--- a/www/eliom/distinfo Fri Apr 13 13:15:11 2018 +0000
+++ b/www/eliom/distinfo Fri Apr 13 13:17:34 2018 +0000
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.8 2017/09/08 17:14:34 jaapb Exp $
+$NetBSD: distinfo,v 1.9 2018/04/13 13:17:34 jaapb Exp $
-SHA1 (eliom-6.2.0.tar.gz) = 652dacef947524975efc63253fb806be45a750c3
-RMD160 (eliom-6.2.0.tar.gz) = 1a1b21495cac93c2ad7f207fdd6ad4df819c6600
-SHA512 (eliom-6.2.0.tar.gz) = 02ea52c78470f222297dd9f82218e82427ea2d2d0c9f261d1a9c2decbe7644c0bf583b77b8cef2577d5662d363efd276755f400e7a4c29c89a2265e49ca850db
-Size (eliom-6.2.0.tar.gz) = 724359 bytes
-SHA1 (patch-pkg_META) = 2953bf2e069f171d9b70dec3b985c2f864e29361
+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_build.ml) = 8597e17fc869b7a8e93ee30f551a92c694617dbc
-SHA1 (patch-src__tags) = 5058021a43761fff5ce91f26c8fd854014e1e051
-SHA1 (patch-src_lib_eliom_content_.client.ml) = fc7896b38b4719518c6c928949b8713da50026a9
-SHA1 (patch-src_lib_eliom_request.client.ml) = 1d9dbe87011bb05267bce4c2a8993e89484aba8a
-SHA1 (patch-src_lib_eliom_request.client.mli) = 72e9a6c2b59ee2944e0647202782dce38c661c31
-SHA1 (patch-src_ocamlbuild_ocamlbuild_eliom.ml) = c774f7d2a091f7f00e4f1793ee52fd4860f440ea
-SHA1 (patch-src_tools_utils.ml) = fb59916f46fa1d2f99284f0ea24e138a3f116eb0
+SHA1 (patch-src__tags) = 5aff5c25080159e71847ca4caffb53641c5e2811
+SHA1 (patch-src_lib_eliom__client.client.ml) = e66600dcf8011d3833756ea25f7e1884fd090815
diff -r 6539d2c5c978 -r 9ae98eb6e820 www/eliom/patches/patch-pkg_META
--- a/www/eliom/patches/patch-pkg_META Fri Apr 13 13:15:11 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-$NetBSD: patch-pkg_META,v 1.1 2017/09/08 17:14:34 jaapb Exp $
-
-Use correct packages for ocaml-lwt 3 and js_of_ocaml 3
---- pkg/META.orig 2017-02-07 15:42:18.000000000 +0000
-+++ pkg/META
-@@ -13,7 +13,7 @@ package "server" (
- react,
- reactiveData,
- tyxml,
-- lwt.react,
-+ lwt_react,
- cryptokit,
- reactiveData"
- archive(byte) = "server.cma"
-@@ -46,17 +46,18 @@ package "client" (
- ppx_deriving.runtime,
- js_of_ocaml,
- js_of_ocaml.deriving,
-- js_of_ocaml.tyxml,
-- js_of_ocaml.log,
-+ js_of_ocaml-tyxml,
-+ js_of_ocaml-lwt,
-+ js_of_ocaml-lwt.logger,
- js_of_ocaml.weak,
-- lwt.react,
-+ lwt_react,
- react,
- reactiveData,
- tyxml.functor"
- archive(byte) = "client.cma eliom_client_main.cmo"
-
- linkopts(javascript) = "+eliom.client/eliom_client.js"
-- linkopts(javascript) += "+js_of_ocaml/classlist.js"
-+ linkopts(javascript) += "+js_of_ocaml-compiler/classlist.js"
- )
-
- package "syntax" (
-@@ -98,8 +99,8 @@ package "syntax" (
- description = "Syntax extension: predefined commonly use syntaxes"
- version = "[distributed with Eliom]"
-
-- requires(syntax, preprocessor) = "js_of_ocaml.syntax,js_of_ocaml.deriving.syntax,lwt.syntax,tyxml.syntax"
-- requires(syntax, toploop) = "js_of_ocaml.syntax,js_of_ocaml.deriving.syntax,lwt.syntax,tyxml.syntax"
-+ 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"
- archive(syntax, preprocessor) = "-ignore dummy"
- )
-
diff -r 6539d2c5c978 -r 9ae98eb6e820 www/eliom/patches/patch-src__tags
--- a/www/eliom/patches/patch-src__tags Fri Apr 13 13:15:11 2018 +0000
+++ b/www/eliom/patches/patch-src__tags Fri Apr 13 13:17:34 2018 +0000
@@ -1,45 +1,42 @@
-$NetBSD: patch-src__tags,v 1.1 2017/09/08 17:14:34 jaapb Exp $
+$NetBSD: patch-src__tags,v 1.2 2018/04/13 13:17:34 jaapb Exp $
-Use correct packages for ocaml-lwt 3 and js_of_ocaml 3
---- src/_tags.orig 2017-02-07 15:42:18.000000000 +0000
+lwt_ppx is now its own package and has been renamed
+--- src/_tags.orig 2018-02-08 14:30:46.000000000 +0000
+++ src/_tags
-@@ -2,32 +2,32 @@
+@@ -2,23 +2,23 @@
true:keep_locs
<lib/type_dir/*.ml{,i}>:eliom_ppx,thread
--<lib/type_dir/*.ml>:package(js_of_ocaml.deriving.ppx,lwt.ppx)
-+<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.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.deriving.ppx,lwt.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.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,js_of_ocaml)
-+<lib/server/*.ml{,i}>:package(react,lwt_react,js_of_ocaml)
+-<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.deriving.ppx)
-+<lib/server/*.ml{,i}>:package(js_of_ocaml-ppx.deriving)
+ <lib/server/*.ml{,i}>:package(js_of_ocaml-ppx.deriving)
<lib/*.eliom{,i}>:eliom_ppx
<lib/*.ml{,i}>:eliom_ppx
--<lib/client/*.ml>:package(js_of_ocaml.deriving.ppx,lwt.ppx,js_of_ocaml.log)
-+<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.deriving,lwt_ppx,js_of_ocaml-lwt.logger)
<lib/client/*.ml>:package(js_of_ocaml.ppx)
<lib/client/*.ml{,i}>: eliom_ppx
- <lib/client/*.ml{,i}>:package(ocsigenserver.cookies,ocsigenserver.polytables,ocsigenserver.baselib.base)
- <lib/client/*.ml{,i}>:package(deriving.runtime,js_of_ocaml.deriving)
--<lib/client/*.ml{,i}>:package(lwt.react,tyxml.functor,js_of_ocaml.tyxml)
-+<lib/client/*.ml{,i}>:package(lwt_react,tyxml.functor,js_of_ocaml.tyxml,js_of_ocaml-lwt,js_of_ocaml-lwt.logger)
- <lib/client/*.ml{,i}>:package(react,js_of_ocaml,reactiveData)
+@@ -29,7 +29,7 @@ true:keep_locs
+
+ <lib/client/*.ml{,i}>:package(js_of_ocaml-ppx.deriving)
--<lib/client/*.ml{,i}>:package(js_of_ocaml.deriving.ppx)
-+<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>: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 6539d2c5c978 -r 9ae98eb6e820 www/eliom/patches/patch-src_lib_eliom__client.client.ml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/eliom/patches/patch-src_lib_eliom__client.client.ml Fri Apr 13 13:17:34 2018 +0000
@@ -0,0 +1,16 @@
+$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 6539d2c5c978 -r 9ae98eb6e820 www/eliom/patches/patch-src_lib_eliom_content_.client.ml
--- a/www/eliom/patches/patch-src_lib_eliom_content_.client.ml Fri Apr 13 13:15:11 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_lib_eliom_content_.client.ml,v 1.1 2017/09/08 17:14:34 jaapb Exp $
-
-Keycode does not exist any longer
---- src/lib/eliom_content_.client.ml.orig 2017-02-07 15:42:18.000000000 +0000
-+++ src/lib/eliom_content_.client.ml
-@@ -573,8 +573,7 @@ module Html = struct
- elt##.onscroll := (bool_cb f)
- let onreturn elt f =
- let f ev =
-- let key = ev##.keyCode in
-- if key = Keycode.return then f ev;
-+ if Dom_html.Keyboard_code.(of_event ev = Enter) then f ev;
- true in
- onkeydown elt f
- let onchange elt f =
diff -r 6539d2c5c978 -r 9ae98eb6e820 www/eliom/patches/patch-src_lib_eliom_request.client.ml
--- a/www/eliom/patches/patch-src_lib_eliom_request.client.ml Fri Apr 13 13:15:11 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-$NetBSD: patch-src_lib_eliom_request.client.ml,v 1.1 2017/09/08 17:14:34 jaapb Exp $
-
-XmlHttpRequest changed
---- src/lib/eliom_request.client.ml.orig 2017-02-07 15:42:18.000000000 +0000
-+++ src/lib/eliom_request.client.ml
-@@ -24,6 +24,8 @@ exception Failed_request of int
- exception Program_terminated
- exception Non_xml_content
-
-+module XmlHttpRequest = Js_of_ocaml_lwt.XmlHttpRequest
-+
- let section = Lwt_log.Section.make "eliom:request"
- (* == ... *)
-
-@@ -97,9 +99,6 @@ let redirect_post url params =
- (* firefox accepts submit only on forms in the document *)
- f##submit
-
--let redirect_post_form_elt ?(post_args=[]) ?(form_arg=[]) url =
-- redirect_post url (form_arg@post_args)
--
- (* Forms cannot use PUT http method: do not redirect *)
- let redirect_put _url _params =
- Lwt_log.raise_error ~section "redirect_put not implemented"
-@@ -129,10 +128,10 @@ let nl_template_string = "__nl_n_eliom-t
- let send
- ?with_credentials
- ?(expecting_process_page = false) ?cookies_info
-- ?get_args ?post_args ?form_arg
-+ ?get_args ?post_args
- ?progress ?upload_progress ?override_mime_type
- url result =
-- let rec aux i ?cookies_info ?(get_args=[]) ?post_args ?form_arg url =
-+ let rec aux i ?cookies_info ?(get_args=[]) ?post_args url =
- let (https, path) = match cookies_info with
- | Some c -> c
- (* CCC Is it really necessary to allow to specify cookie_info here?
-@@ -205,14 +204,6 @@ let send
- then (Eliom_common.nl_get_appl_parameter, "true")::get_args
- else get_args
- in
-- let form_contents =
-- match form_arg with
-- | None -> None
-- | Some form_arg ->
-- let contents = Form.empty_form_contents () in
-- List.iter (Form.append contents) form_arg;
-- Some contents
-- in
- let check_headers code headers =
- if expecting_process_page
- then
-@@ -224,10 +215,18 @@ let send
- else true
- in
- try%lwt
-- let%lwt r = XmlHttpRequest.perform_raw_url
-+ let%lwt r =
-+ let contents =
-+ match post_args with
-+ | Some post_args ->
-+ Some (`POST_form post_args)
-+ | None ->
-+ None
-+ in
-+ XmlHttpRequest.perform_raw_url
- ?with_credentials
- ?headers:(Some headers) ?content_type:None
-- ?post_args ~get_args ?form_arg:form_contents ~check_headers
-+ ?contents ~get_args ~check_headers
Home |
Main Index |
Thread Index |
Old Index