diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch deleted file mode 100644 index d82b9d1fb..000000000 --- a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/toplevel/lib/jsooTop.ml -+++ b/toplevel/lib/jsooTop.ml -@@ -65,6 +65,7 @@ - p := !p + len''; - len'' - -+[%%if ocaml_version < (4, 14, 0)] - let use ffp content = - let fname, oc = - Filename.open_temp_file ~mode:[ Open_binary ] "jsoo_toplevel" "fake_stdin" -@@ -78,10 +79,11 @@ - with e -> - Sys.remove fname; - raise e --[@@if ocaml_version < (4, 14, 0)] -+[%%endif] - -+[%%if ocaml_version >= (4, 14, 0)] - let use ffp content = Toploop.use_silently ffp (String content) --[@@if ocaml_version >= (4, 14, 0)] -+[%%endif] - - let execute printval ?pp_code ?highlight_location pp_answer s = - let lb = Lexing.from_function (refill_lexbuf s (ref 0) pp_code) in diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/opam b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/opam index 470c23e4f..263aa3ea7 100644 --- a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/opam +++ b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/opam @@ -52,7 +52,6 @@ patches: [ "js_of_ocaml-add-unboxed-and-float-block.patch" "js_of_ocaml-ident-is_global.patch" "js_of_ocaml-remove-float-externals.patch" - "js_of_ocaml-ocaml_version-ppx.patch" "js_of_ocaml-test-diffs-caused-by-build-differences.patch" "js_of_ocaml-fix-build_fs.patch" "js_of_ocaml-iarray-primitives.patch" @@ -121,10 +120,6 @@ extra-files: [ "js_of_ocaml-remove-float-externals.patch" "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" ] - [ - "js_of_ocaml-ocaml_version-ppx.patch" - "sha256=df6bcb6da8aa3dfd6bd0a178679987d41c400ec1803f4a66659cfc822d1b280f" - ] [ "js_of_ocaml-test-diffs-caused-by-build-differences.patch" "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" diff --git a/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch b/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch deleted file mode 100644 index d82b9d1fb..000000000 --- a/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/toplevel/lib/jsooTop.ml -+++ b/toplevel/lib/jsooTop.ml -@@ -65,6 +65,7 @@ - p := !p + len''; - len'' - -+[%%if ocaml_version < (4, 14, 0)] - let use ffp content = - let fname, oc = - Filename.open_temp_file ~mode:[ Open_binary ] "jsoo_toplevel" "fake_stdin" -@@ -78,10 +79,11 @@ - with e -> - Sys.remove fname; - raise e --[@@if ocaml_version < (4, 14, 0)] -+[%%endif] - -+[%%if ocaml_version >= (4, 14, 0)] - let use ffp content = Toploop.use_silently ffp (String content) --[@@if ocaml_version >= (4, 14, 0)] -+[%%endif] - - let execute printval ?pp_code ?highlight_location pp_answer s = - let lb = Lexing.from_function (refill_lexbuf s (ref 0) pp_code) in diff --git a/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/opam b/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/opam index 8321966d4..fa7fd320a 100644 --- a/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/opam +++ b/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/opam @@ -42,7 +42,6 @@ patches: [ "js_of_ocaml-add-unboxed-and-float-block.patch" "js_of_ocaml-ident-is_global.patch" "js_of_ocaml-remove-float-externals.patch" - "js_of_ocaml-ocaml_version-ppx.patch" "js_of_ocaml-test-diffs-caused-by-build-differences.patch" "js_of_ocaml-fix-build_fs.patch" "js_of_ocaml-iarray-primitives.patch" @@ -111,10 +110,6 @@ extra-files: [ "js_of_ocaml-remove-float-externals.patch" "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" ] - [ - "js_of_ocaml-ocaml_version-ppx.patch" - "sha256=df6bcb6da8aa3dfd6bd0a178679987d41c400ec1803f4a66659cfc822d1b280f" - ] [ "js_of_ocaml-test-diffs-caused-by-build-differences.patch" "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" diff --git a/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch b/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch deleted file mode 100644 index d82b9d1fb..000000000 --- a/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/toplevel/lib/jsooTop.ml -+++ b/toplevel/lib/jsooTop.ml -@@ -65,6 +65,7 @@ - p := !p + len''; - len'' - -+[%%if ocaml_version < (4, 14, 0)] - let use ffp content = - let fname, oc = - Filename.open_temp_file ~mode:[ Open_binary ] "jsoo_toplevel" "fake_stdin" -@@ -78,10 +79,11 @@ - with e -> - Sys.remove fname; - raise e --[@@if ocaml_version < (4, 14, 0)] -+[%%endif] - -+[%%if ocaml_version >= (4, 14, 0)] - let use ffp content = Toploop.use_silently ffp (String content) --[@@if ocaml_version >= (4, 14, 0)] -+[%%endif] - - let execute printval ?pp_code ?highlight_location pp_answer s = - let lb = Lexing.from_function (refill_lexbuf s (ref 0) pp_code) in diff --git a/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/opam b/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/opam index 2c9f83e60..4d4395e15 100644 --- a/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/opam +++ b/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/opam @@ -45,7 +45,6 @@ patches: [ "js_of_ocaml-add-unboxed-and-float-block.patch" "js_of_ocaml-ident-is_global.patch" "js_of_ocaml-remove-float-externals.patch" - "js_of_ocaml-ocaml_version-ppx.patch" "js_of_ocaml-test-diffs-caused-by-build-differences.patch" "js_of_ocaml-fix-build_fs.patch" "js_of_ocaml-iarray-primitives.patch" @@ -114,10 +113,6 @@ extra-files: [ "js_of_ocaml-remove-float-externals.patch" "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" ] - [ - "js_of_ocaml-ocaml_version-ppx.patch" - "sha256=df6bcb6da8aa3dfd6bd0a178679987d41c400ec1803f4a66659cfc822d1b280f" - ] [ "js_of_ocaml-test-diffs-caused-by-build-differences.patch" "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" diff --git a/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch b/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch deleted file mode 100644 index d82b9d1fb..000000000 --- a/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/toplevel/lib/jsooTop.ml -+++ b/toplevel/lib/jsooTop.ml -@@ -65,6 +65,7 @@ - p := !p + len''; - len'' - -+[%%if ocaml_version < (4, 14, 0)] - let use ffp content = - let fname, oc = - Filename.open_temp_file ~mode:[ Open_binary ] "jsoo_toplevel" "fake_stdin" -@@ -78,10 +79,11 @@ - with e -> - Sys.remove fname; - raise e --[@@if ocaml_version < (4, 14, 0)] -+[%%endif] - -+[%%if ocaml_version >= (4, 14, 0)] - let use ffp content = Toploop.use_silently ffp (String content) --[@@if ocaml_version >= (4, 14, 0)] -+[%%endif] - - let execute printval ?pp_code ?highlight_location pp_answer s = - let lb = Lexing.from_function (refill_lexbuf s (ref 0) pp_code) in diff --git a/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/opam b/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/opam index f3b8c5fa8..358aaa24b 100644 --- a/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/opam +++ b/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/opam @@ -42,7 +42,6 @@ patches: [ "js_of_ocaml-add-unboxed-and-float-block.patch" "js_of_ocaml-ident-is_global.patch" "js_of_ocaml-remove-float-externals.patch" - "js_of_ocaml-ocaml_version-ppx.patch" "js_of_ocaml-test-diffs-caused-by-build-differences.patch" "js_of_ocaml-fix-build_fs.patch" "js_of_ocaml-iarray-primitives.patch" @@ -111,10 +110,6 @@ extra-files: [ "js_of_ocaml-remove-float-externals.patch" "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" ] - [ - "js_of_ocaml-ocaml_version-ppx.patch" - "sha256=df6bcb6da8aa3dfd6bd0a178679987d41c400ec1803f4a66659cfc822d1b280f" - ] [ "js_of_ocaml-test-diffs-caused-by-build-differences.patch" "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" diff --git a/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch b/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch deleted file mode 100644 index d82b9d1fb..000000000 --- a/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/toplevel/lib/jsooTop.ml -+++ b/toplevel/lib/jsooTop.ml -@@ -65,6 +65,7 @@ - p := !p + len''; - len'' - -+[%%if ocaml_version < (4, 14, 0)] - let use ffp content = - let fname, oc = - Filename.open_temp_file ~mode:[ Open_binary ] "jsoo_toplevel" "fake_stdin" -@@ -78,10 +79,11 @@ - with e -> - Sys.remove fname; - raise e --[@@if ocaml_version < (4, 14, 0)] -+[%%endif] - -+[%%if ocaml_version >= (4, 14, 0)] - let use ffp content = Toploop.use_silently ffp (String content) --[@@if ocaml_version >= (4, 14, 0)] -+[%%endif] - - let execute printval ?pp_code ?highlight_location pp_answer s = - let lb = Lexing.from_function (refill_lexbuf s (ref 0) pp_code) in diff --git a/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/opam b/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/opam index de927e739..8dd27ae1c 100644 --- a/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/opam +++ b/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/opam @@ -55,7 +55,6 @@ patches: [ "js_of_ocaml-add-unboxed-and-float-block.patch" "js_of_ocaml-ident-is_global.patch" "js_of_ocaml-remove-float-externals.patch" - "js_of_ocaml-ocaml_version-ppx.patch" "js_of_ocaml-test-diffs-caused-by-build-differences.patch" "js_of_ocaml-fix-build_fs.patch" "js_of_ocaml-iarray-primitives.patch" @@ -124,10 +123,6 @@ extra-files: [ "js_of_ocaml-remove-float-externals.patch" "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" ] - [ - "js_of_ocaml-ocaml_version-ppx.patch" - "sha256=df6bcb6da8aa3dfd6bd0a178679987d41c400ec1803f4a66659cfc822d1b280f" - ] [ "js_of_ocaml-test-diffs-caused-by-build-differences.patch" "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"