summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--OMakefile2
-rw-r--r--debian/changelog8
-rw-r--r--debian/control4
-rw-r--r--debian/patches/0008-Fix-compilation-with-OCaml-4.08.0.patch82
-rw-r--r--debian/patches/series1
-rw-r--r--src/base/types.ml2
-rw-r--r--src/base/types.mli16
7 files changed, 103 insertions, 12 deletions
diff --git a/OMakefile b/OMakefile
index 4d15909..74c1f83 100644
--- a/OMakefile
+++ b/OMakefile
@@ -1,7 +1,7 @@
include config.omake
-OCAMLFLAGS += -dtypes -w +a-3-4-27-50-52-60-k
+OCAMLFLAGS += -dtypes -w +a-3-4-27-44-50-52-60-k
.SUBDIRS: src doc
diff --git a/debian/changelog b/debian/changelog
index c307361..e620970 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ocaml-reins (0.1a-8) unstable; urgency=medium
+
+ * Team upload
+ * Update Vcs-*
+ * Fix compilation with OCaml 4.08.0
+
+ -- Stéphane Glondu <glondu@debian.org> Sat, 07 Sep 2019 20:04:19 +0200
+
ocaml-reins (0.1a-7) unstable; urgency=medium
* Team upload
diff --git a/debian/control b/debian/control
index 86a8e1e..fee8de8 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends:
ocaml-findlib (>= 1.2.5),
dh-ocaml (>= 0.9)
Standards-Version: 3.8.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git
+Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml-reins.git
+Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml-reins
Homepage: http://ocaml-reins.sourceforge.net/
Package: libreins-ocaml-dev
diff --git a/debian/patches/0008-Fix-compilation-with-OCaml-4.08.0.patch b/debian/patches/0008-Fix-compilation-with-OCaml-4.08.0.patch
new file mode 100644
index 0000000..38aad3e
--- /dev/null
+++ b/debian/patches/0008-Fix-compilation-with-OCaml-4.08.0.patch
@@ -0,0 +1,82 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Sat, 7 Sep 2019 20:00:09 +0200
+Subject: Fix compilation with OCaml 4.08.0
+
+---
+ OMakefile | 2 +-
+ src/base/types.ml | 2 +-
+ src/base/types.mli | 16 ++++++++--------
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/OMakefile b/OMakefile
+index 4d15909..74c1f83 100644
+--- a/OMakefile
++++ b/OMakefile
+@@ -1,7 +1,7 @@
+
+ include config.omake
+
+-OCAMLFLAGS += -dtypes -w +a-3-4-27-50-52-60-k
++OCAMLFLAGS += -dtypes -w +a-3-4-27-44-50-52-60-k
+
+ .SUBDIRS: src doc
+
+diff --git a/src/base/types.ml b/src/base/types.ml
+index 0fea396..c080c97 100644
+--- a/src/base/types.ml
++++ b/src/base/types.ml
+@@ -380,7 +380,7 @@ module String = struct
+ for i = 0 to (len-1) do
+ s.[i] <- Char.gen ~size:size rs
+ done;
+- s
++ Bytes.to_string s
+ let to_string x = x
+ end
+
+diff --git a/src/base/types.mli b/src/base/types.mli
+index f5e661c..b20a0d2 100644
+--- a/src/base/types.mli
++++ b/src/base/types.mli
+@@ -360,7 +360,7 @@ sig
+ val big_int_of_nat : Nat.nat -> big_int
+ val base_power_big_int : int -> int -> big_int -> big_int
+ val sys_big_int_of_string : string -> int -> int -> big_int
+- val round_futur_last_digit : string -> int -> int -> bool
++ val round_futur_last_digit : bytes -> int -> int -> bool
+ val approx_big_int : int -> big_int -> string
+ type t = big_int
+ val equal : big_int -> big_int -> bool
+@@ -485,13 +485,13 @@ module String :
+ sig
+ external length : string -> int = "%string_length"
+ external get : string -> int -> char = "%string_safe_get"
+- external set : string -> int -> char -> unit = "%string_safe_set"
+- external create : int -> string = "caml_create_string"
++ external set : bytes -> int -> char -> unit = "%string_safe_set"
++ external create : int -> bytes = "caml_create_string"
+ val make : int -> char -> string
+ val copy : string -> string
+ val sub : string -> int -> int -> string
+- val fill : string -> int -> int -> char -> unit
+- val blit : string -> int -> string -> int -> int -> unit
++ val fill : bytes -> int -> int -> char -> unit
++ val blit : string -> int -> bytes -> int -> int -> unit
+ val concat : string -> string list -> string
+ val iter : (char -> unit) -> string -> unit
+ val escaped : string -> string
+@@ -509,11 +509,11 @@ sig
+ type t = string
+ val compare : t -> t -> int
+ external unsafe_get : string -> int -> char = "%string_unsafe_get"
+- external unsafe_set : string -> int -> char -> unit
++ external unsafe_set : bytes -> int -> char -> unit
+ = "%string_unsafe_set"
+- external unsafe_blit : string -> int -> string -> int -> int -> unit
++ external unsafe_blit : string -> int -> bytes -> int -> int -> unit
+ = "caml_blit_string" "noalloc"
+- external unsafe_fill : string -> int -> int -> char -> unit
++ external unsafe_fill : bytes -> int -> int -> char -> unit
+ = "caml_fill_string" "noalloc"
+ val equal : t -> t -> bool
+ val hash : 'a -> int
diff --git a/debian/patches/series b/debian/patches/series
index b963721..f9d558d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
0005-Fix-FTBFS-with-OCaml-4.02.3.patch
0006-Disable-blocking-warnings-new-in-OCaml-4.05.0.patch
0007-Use-include-module-type-of-to-avoid-FTBFS-with-OCaml.patch
+0008-Fix-compilation-with-OCaml-4.08.0.patch
diff --git a/src/base/types.ml b/src/base/types.ml
index 0fea396..c080c97 100644
--- a/src/base/types.ml
+++ b/src/base/types.ml
@@ -380,7 +380,7 @@ module String = struct
for i = 0 to (len-1) do
s.[i] <- Char.gen ~size:size rs
done;
- s
+ Bytes.to_string s
let to_string x = x
end
diff --git a/src/base/types.mli b/src/base/types.mli
index f5e661c..b20a0d2 100644
--- a/src/base/types.mli
+++ b/src/base/types.mli
@@ -360,7 +360,7 @@ sig
val big_int_of_nat : Nat.nat -> big_int
val base_power_big_int : int -> int -> big_int -> big_int
val sys_big_int_of_string : string -> int -> int -> big_int
- val round_futur_last_digit : string -> int -> int -> bool
+ val round_futur_last_digit : bytes -> int -> int -> bool
val approx_big_int : int -> big_int -> string
type t = big_int
val equal : big_int -> big_int -> bool
@@ -485,13 +485,13 @@ module String :
sig
external length : string -> int = "%string_length"
external get : string -> int -> char = "%string_safe_get"
- external set : string -> int -> char -> unit = "%string_safe_set"
- external create : int -> string = "caml_create_string"
+ external set : bytes -> int -> char -> unit = "%string_safe_set"
+ external create : int -> bytes = "caml_create_string"
val make : int -> char -> string
val copy : string -> string
val sub : string -> int -> int -> string
- val fill : string -> int -> int -> char -> unit
- val blit : string -> int -> string -> int -> int -> unit
+ val fill : bytes -> int -> int -> char -> unit
+ val blit : string -> int -> bytes -> int -> int -> unit
val concat : string -> string list -> string
val iter : (char -> unit) -> string -> unit
val escaped : string -> string
@@ -509,11 +509,11 @@ sig
type t = string
val compare : t -> t -> int
external unsafe_get : string -> int -> char = "%string_unsafe_get"
- external unsafe_set : string -> int -> char -> unit
+ external unsafe_set : bytes -> int -> char -> unit
= "%string_unsafe_set"
- external unsafe_blit : string -> int -> string -> int -> int -> unit
+ external unsafe_blit : string -> int -> bytes -> int -> int -> unit
= "caml_blit_string" "noalloc"
- external unsafe_fill : string -> int -> int -> char -> unit
+ external unsafe_fill : bytes -> int -> int -> char -> unit
= "caml_fill_string" "noalloc"
val equal : t -> t -> bool
val hash : 'a -> int
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 23:09:26 +0000