[pkgsrc/trunk]: pkgsrc/devel/js_of_ocaml Updated package devel/js_of_ocaml to...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/js_of_ocaml Updated package devel/js_of_ocaml to...
From: jaapb <jaapb%pkgsrc.org@localhost>
Date: Thu, 29 Nov 2018 13:07:31 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/03579d93a05c
branches:  trunk
changeset: 315743:03579d93a05c
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Thu Nov 29 11:59:21 2018 +0000

description:
Updated package devel/js_of_ocaml to use dune and new ocaml-tyxml

diffstat:

 devel/js_of_ocaml/Makefile                             |   8 +-
 devel/js_of_ocaml/PLIST                                |   6 +-
 devel/js_of_ocaml/buildlink3.mk                        |   4 +-
 devel/js_of_ocaml/distinfo                             |   3 +-
 devel/js_of_ocaml/options.mk                           |   6 +-
 devel/js_of_ocaml/patches/patch-lib_tyxml_tyxml__js.ml |  60 ++++++++++++++++++
 6 files changed, 74 insertions(+), 13 deletions(-)

diffs (178 lines):

diff -r cf202f7c12e8 -r 03579d93a05c devel/js_of_ocaml/Makefile
--- a/devel/js_of_ocaml/Makefile        Thu Nov 29 11:58:00 2018 +0000
+++ b/devel/js_of_ocaml/Makefile        Thu Nov 29 11:59:21 2018 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2018/11/12 16:10:18 jaapb Exp $
+# $NetBSD: Makefile,v 1.30 2018/11/29 11:59:21 jaapb Exp $
 #
 
 GITHUB_PROJECT=        js_of_ocaml
 DISTNAME=      ${GITHUB_PROJECT}-3.2.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocsigen/}
 
@@ -15,12 +15,12 @@
 USE_TOOLS=     bash
 
 OCAML_USE_FINDLIB=     yes
-OCAML_USE_JBUILDER=    yes
+OCAML_USE_DUNE=        yes
 
 OPAM_INSTALL_FILES=    js_of_ocaml js_of_ocaml-ocamlbuild \
        js_of_ocaml-ppx js_of_ocaml-ppx_deriving_json \
        js_of_ocaml-lwt js_of_ocaml-compiler
-JBUILDER_BUILD_PACKAGES=       js_of_ocaml-compiler js_of_ocaml js_of_ocaml-ocamlbuild \
+DUNE_BUILD_PACKAGES=   js_of_ocaml-compiler js_of_ocaml js_of_ocaml-ocamlbuild \
        js_of_ocaml-ppx js_of_ocaml-ppx_deriving_json \
        js_of_ocaml-lwt
 
diff -r cf202f7c12e8 -r 03579d93a05c devel/js_of_ocaml/PLIST
--- a/devel/js_of_ocaml/PLIST   Thu Nov 29 11:58:00 2018 +0000
+++ b/devel/js_of_ocaml/PLIST   Thu Nov 29 11:59:21 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2018/08/03 09:19:56 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.20 2018/11/29 11:59:21 jaapb Exp $
 bin/js_of_ocaml
 bin/jsoo_link
 bin/jsoo_minify
@@ -90,7 +90,7 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-compiler/js_of_ocaml_compiler.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-compiler/js_of_ocaml_compiler.cmxs
 ${OCAML_SITELIB}/js_of_ocaml-compiler/js_of_ocaml-compiler.dune
-${OCAML_SITELIB}/js_of_ocaml-compiler/js_of_ocaml_compiler.ml-gen
+${OCAML_SITELIB}/js_of_ocaml-compiler/js_of_ocaml_compiler.ml
 ${OCAML_SITELIB}/js_of_ocaml-compiler/js_of_ocaml_compiler__Annot_lexer.cmi
 ${OCAML_SITELIB}/js_of_ocaml-compiler/js_of_ocaml_compiler__Annot_lexer.cmt
 ${OCAML_SITELIB}/js_of_ocaml-compiler/js_of_ocaml_compiler__Annot_lexer.cmti
@@ -425,7 +425,7 @@
 ${OCAML_SITELIB}/js_of_ocaml-ppx/ppx_js__.cmi
 ${OCAML_SITELIB}/js_of_ocaml-ppx/ppx_js__.cmt
 ${OCAML_SITELIB}/js_of_ocaml-ppx/ppx_js__.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-ppx/ppx_js__.ml-gen
+${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-ppx/ppx_js__.ml
 ${OCAML_SITELIB}/js_of_ocaml-ppx/ppx_js__Ppx_js_internal.cmi
 ${OCAML_SITELIB}/js_of_ocaml-ppx/ppx_js__Ppx_js_internal.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-ppx/ppx_js__Ppx_js_internal.cmx
diff -r cf202f7c12e8 -r 03579d93a05c devel/js_of_ocaml/buildlink3.mk
--- a/devel/js_of_ocaml/buildlink3.mk   Thu Nov 29 11:58:00 2018 +0000
+++ b/devel/js_of_ocaml/buildlink3.mk   Thu Nov 29 11:59:21 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2018/08/13 12:57:37 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/11/29 11:59:21 jaapb Exp $
 
 BUILDLINK_TREE+=       js_of_ocaml
 
@@ -6,7 +6,7 @@
 JS_OF_OCAML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.js_of_ocaml+=    js_of_ocaml>=3.0.0
-BUILDLINK_ABI_DEPENDS.js_of_ocaml+=    js_of_ocaml>=3.2.1
+BUILDLINK_ABI_DEPENDS.js_of_ocaml+=    js_of_ocaml>=3.2.1nb2
 BUILDLINK_PKGSRCDIR.js_of_ocaml?=      ../../devel/js_of_ocaml
 
 .endif # JS_OF_OCAML_BUILDLINK3_MK
diff -r cf202f7c12e8 -r 03579d93a05c devel/js_of_ocaml/distinfo
--- a/devel/js_of_ocaml/distinfo        Thu Nov 29 11:58:00 2018 +0000
+++ b/devel/js_of_ocaml/distinfo        Thu Nov 29 11:59:21 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.17 2018/08/13 12:57:37 jaapb Exp $
+$NetBSD: distinfo,v 1.18 2018/11/29 11:59:21 jaapb Exp $
 
 SHA1 (js_of_ocaml-3.2.1.tar.gz) = 168c3c50eca387fa5b7f0d079c3d00ad7d883526
 RMD160 (js_of_ocaml-3.2.1.tar.gz) = efd4c9de4f2971628da4a409139a89d0170d6878
 SHA512 (js_of_ocaml-3.2.1.tar.gz) = 55faf40f70f21a14b2ae6e9b6f920d649dfa101bb0e4ea3e24c3254ca6a2669b7e09b86c64b931d7d32beb280a61e7000e9508fb77c2512896fba36c5db33705
 Size (js_of_ocaml-3.2.1.tar.gz) = 1441397 bytes
+SHA1 (patch-lib_tyxml_tyxml__js.ml) = 4b44f20b26387f90ec0ec7ec1398754bfed683bd
diff -r cf202f7c12e8 -r 03579d93a05c devel/js_of_ocaml/options.mk
--- a/devel/js_of_ocaml/options.mk      Thu Nov 29 11:58:00 2018 +0000
+++ b/devel/js_of_ocaml/options.mk      Thu Nov 29 11:59:21 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2018/08/03 09:19:56 jaapb Exp $
+# $NetBSD: options.mk,v 1.6 2018/11/29 11:59:21 jaapb Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.js_of_ocaml
 PKG_SUPPORTED_OPTIONS= ocaml-tyxml camlp4
@@ -17,7 +17,7 @@
 .include "../../textproc/ocaml-tyxml/buildlink3.mk"
 .include "../../devel/ocaml-reactiveData/buildlink3.mk"
 PLIST.tyxml=   yes
-JBUILDER_BUILD_PACKAGES+=      js_of_ocaml-tyxml
+DUNE_BUILD_PACKAGES+=  js_of_ocaml-tyxml
 OPAM_INSTALL_FILES+=   js_of_ocaml-tyxml
 .else
 .endif
@@ -29,7 +29,7 @@
 .include "../../lang/camlp4/buildlink3.mk"
 DEPENDS+=      ocaml-deriving-ocsigen>=0.8.1:../../devel/ocaml-deriving-ocsigen
 PLIST.camlp4=  yes
-JBUILDER_BUILD_PACKAGES+=      js_of_ocaml-camlp4
+DUNE_BUILD_PACKAGES+=  js_of_ocaml-camlp4
 OPAM_INSTALL_FILES+=   js_of_ocaml-camlp4
 .else
 .endif
diff -r cf202f7c12e8 -r 03579d93a05c devel/js_of_ocaml/patches/patch-lib_tyxml_tyxml__js.ml
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/js_of_ocaml/patches/patch-lib_tyxml_tyxml__js.ml    Thu Nov 29 11:59:21 2018 +0000
@@ -0,0 +1,60 @@
+$NetBSD: patch-lib_tyxml_tyxml__js.ml,v 1.1 2018/11/29 11:59:21 jaapb Exp $
+
+Compile with tyxml 4.3.0 (patch from upstream)
+--- lib/tyxml/tyxml_js.ml.orig 2018-07-26 14:06:06.000000000 +0000
++++ lib/tyxml/tyxml_js.ml
+@@ -46,10 +46,12 @@ module Xml = struct
+   type event_handler = Dom_html.event Js.t -> bool
+   type mouse_event_handler = Dom_html.mouseEvent Js.t -> bool
+   type keyboard_event_handler = Dom_html.keyboardEvent Js.t -> bool
++  type touch_event_handler = Dom_html.touchEvent Js.t -> bool
+   type attrib_k =
+     | Event of event_handler
+     | MouseEvent of mouse_event_handler
+     | KeyboardEvent of keyboard_event_handler
++    | TouchEvent of touch_event_handler
+     | Attr of Js.js_string Js.t option React.S.t
+   type attrib = aname * attrib_k
+ 
+@@ -63,6 +65,7 @@ module Xml = struct
+   let event_handler_attrib name (value : event_handler) = name,Event value
+   let mouse_event_handler_attrib name (value : mouse_event_handler) = name,MouseEvent value
+   let keyboard_event_handler_attrib name (value : keyboard_event_handler) = name,KeyboardEvent value
++  let touch_event_handler_attrib name (value : touch_event_handler) = name,TouchEvent value
+   let uri_attrib name value = attr name (Js.string value)
+   let uris_attrib name values = attr name (Js.string (String.concat " " values))
+ 
+@@ -120,6 +123,7 @@ module Xml = struct
+         | Event h -> Js.Unsafe.set node n (fun ev -> Js.bool (h ev))
+         | MouseEvent h -> Js.Unsafe.set node n (fun ev -> Js.bool (h ev))
+         | KeyboardEvent h -> Js.Unsafe.set node n (fun ev -> Js.bool (h ev))
++        | TouchEvent h -> Js.Unsafe.set node n (fun ev -> Js.bool (h ev))
+       ) l
+ 
+   let leaf ?(a=[]) name =
+@@ -286,7 +290,8 @@ module R = struct
+     match a with
+     | Xml.Event _
+     | Xml.MouseEvent _
+-    | Xml.KeyboardEvent _ ->
++    | Xml.KeyboardEvent _
++    | Xml.TouchEvent _ -> 
+       raise (Invalid_argument "filter_attrib not implemented for event handler")
+     | Xml.Attr a ->
+       name,
+@@ -307,6 +312,7 @@ module R = 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 attr name f s =
+@@ -321,6 +327,7 @@ module R = struct
+     let event_handler_attrib name s = Xml.event_handler_attrib name s
+     let mouse_event_handler_attrib name s = Xml.mouse_event_handler_attrib name s
+     let keyboard_event_handler_attrib name s = Xml.keyboard_event_handler_attrib name s
++    let touch_event_handler_attrib name s = Xml.touch_event_handler_attrib name s
+     let uri_attrib name s = attr name (fun f -> Some (Js.string f)) s
+     let uris_attrib name s = attr name (fun f -> Some (Js.string (String.concat " " f))) s
+
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated textproc/ocaml-tyxml to 4.3.0
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/ocaml-tyxml Updated package textproc/ocaml-ty...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated textproc/ocaml-tyxml to 4.3.0
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/ocaml-tyxml Updated package textproc/ocaml-ty...
Indexes:
Home | Main Index | Thread Index | Old Index