Merge pull request ocaml#26935 from hhugo/prepare-jsoo.5.9

mseri · web-flow · commit 386c46ea0129 · 2024-11-23T12:16:17.000+01:00
Add some constraints preparing the release of jsoo-5.9
diff --git a/packages/ezjs_crypto/ezjs_crypto.0.1/opam b/packages/ezjs_crypto/ezjs_crypto.0.1/opam
@@ -10,6 +10,7 @@ depends: [
   "ocaml" {>= "4.05"}
   "dune" {>= "2.0"}
   "ezjs_min" {>= "0.2"}
+  "js_of_ocaml-compiler" {>= "3.3.0" & < "5.9.0"}
 ]
 build: [
   ["dune" "subst"] {dev}
@@ -32,4 +33,4 @@ url {
     "md5=aff005185a07842dc89989faf7dba12c"
     "sha512=9d85adbe0a0f519dc333c19fe2ffe558938ed3bfbd33e2d05e80b85b12823ab197a734bac5542432753116f0c23f0f553b7b4719662aad587b0d38977231c97a"
   ]
-}
+}
diff --git a/packages/js_of_ocaml/js_of_ocaml.3.3.0/opam b/packages/js_of_ocaml/js_of_ocaml.3.3.0/opam
@@ -17,7 +17,7 @@ depends: [
   "js_of_ocaml-compiler" {= version}
 ]
 conflicts: [
-  "ppx_tools_versioned"     {<= "5.0beta0"}
+  "ppx_tools_versioned"     {< "5.0"}
 ]
 
 synopsis: "Compiler from OCaml bytecode to Javascript"

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ depends: [`
`10`	`10`	`"ocaml" {>= "4.05"}`
`11`	`11`	`"dune" {>= "2.0"}`
`12`	`12`	`"ezjs_min" {>= "0.2"}`
	`13`	`+ "js_of_ocaml-compiler" {>= "3.3.0" & < "5.9.0"}`
`13`	`14`	`]`
`14`	`15`	`build: [`
`15`	`16`	`["dune" "subst"] {dev}`
`@@ -32,4 +33,4 @@ url {`
`32`	`33`	`"md5=aff005185a07842dc89989faf7dba12c"`
`33`	`34`	`"sha512=9d85adbe0a0f519dc333c19fe2ffe558938ed3bfbd33e2d05e80b85b12823ab197a734bac5542432753116f0c23f0f553b7b4719662aad587b0d38977231c97a"`
`34`	`35`	`]`
`35`		`-}`
	`36`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ depends: [`
`17`	`17`	`"js_of_ocaml-compiler" {= version}`
`18`	`18`	`]`
`19`	`19`	`conflicts: [`
`20`		`- "ppx_tools_versioned" {<= "5.0beta0"}`
	`20`	`+ "ppx_tools_versioned" {< "5.0"}`
`21`	`21`	`]`
`22`	`22`
`23`	`23`	`synopsis: "Compiler from OCaml bytecode to Javascript"`