[rpms/ocaml-stdcompat] rawhide: OCaml 5.5.0 rebuild

public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed

* [rpms/ocaml-stdcompat] rawhide: OCaml 5.5.0 rebuild
@ 2026-07-09 17:40 Jerry James
  0 siblings, 0 replies; only message in thread
From: Jerry James @ 2026-07-09 17:40 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/ocaml-stdcompat
            Branch : rawhide
            Commit : e128a811e9b364781684783136925824c4656bf2
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-07-09T11:39:55-06:00
            Stats  : +247/-138 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/ocaml-stdcompat/c/e128a811e9b364781684783136925824c4656bf2?branch=rawhide

            Log:
            OCaml 5.5.0 rebuild

- Use the dune declarative buildsystem
- Update the OCaml 5.4.0 patch for 5.5.0

---
diff --git a/ocaml-stdcompat-ocaml5.4.patch b/ocaml-stdcompat-ocaml5.4.patch
deleted file mode 100644
index 5818e29..0000000
--- a/ocaml-stdcompat-ocaml5.4.patch
+++ /dev/null
@@ -1,128 +0,0 @@
---- stdcompat-21.1/configure.ac.orig	2025-08-20 02:18:12.000000000 -0600
-+++ stdcompat-21.1/configure.ac	2025-10-16 09:41:47.202271264 -0600
-@@ -185,6 +185,8 @@ AC_WITH_OCAML_VERSION([5_0_0], [5.0.0])
- AC_WITH_OCAML_VERSION([5_1_0], [5.1.0])
- AC_WITH_OCAML_VERSION([5_2_0], [5.2.0])
- AC_WITH_OCAML_VERSION([5_3_0], [5.3.0])
-+AC_WITH_OCAML_VERSION([5_4_0], [5.4.0])
-+AC_WITH_OCAML_VERSION([5_4_1], [5.4.1])
- 
- AS_IF([test "x$target_os_type" = "xWin32"],
-   [AC_WITH_BLOCK([WIN32])],
---- stdcompat-21.1/Makefile.in.orig	2025-08-20 02:18:12.000000000 -0600
-+++ stdcompat-21.1/Makefile.in	2025-10-16 09:44:27.639556951 -0600
-@@ -450,6 +450,8 @@ BEGIN_BEFORE_5_0_0 = @BEGIN_BEFORE_5_0_0
- BEGIN_BEFORE_5_1_0 = @BEGIN_BEFORE_5_1_0@
- BEGIN_BEFORE_5_2_0 = @BEGIN_BEFORE_5_2_0@
- BEGIN_BEFORE_5_3_0 = @BEGIN_BEFORE_5_3_0@
-+BEGIN_BEFORE_5_4_0 = @BEGIN_BEFORE_5_4_0@
-+BEGIN_BEFORE_5_4_1 = @BEGIN_BEFORE_5_4_1@
- BEGIN_FROM_3_07_0 = @BEGIN_FROM_3_07_0@
- BEGIN_FROM_3_08_0 = @BEGIN_FROM_3_08_0@
- BEGIN_FROM_3_09_0 = @BEGIN_FROM_3_09_0@
-@@ -476,6 +477,8 @@ BEGIN_FROM_5_0_0 = @BEGIN_FROM_5_0_0@
- BEGIN_FROM_5_1_0 = @BEGIN_FROM_5_1_0@
- BEGIN_FROM_5_2_0 = @BEGIN_FROM_5_2_0@
- BEGIN_FROM_5_3_0 = @BEGIN_FROM_5_3_0@
-+BEGIN_FROM_5_4_0 = @BEGIN_FROM_5_4_0@
-+BEGIN_FROM_5_4_1 = @BEGIN_FROM_5_4_1@
- BEGIN_WITHOUT_CYGWIN = @BEGIN_WITHOUT_CYGWIN@
- BEGIN_WITHOUT_FLAMBDA2 = @BEGIN_WITHOUT_FLAMBDA2@
- BEGIN_WITHOUT_MAGIC = @BEGIN_WITHOUT_MAGIC@
-@@ -516,6 +518,8 @@ C_BEGIN_BEFORE_5_0_0 = @C_BEGIN_BEFORE_5
- C_BEGIN_BEFORE_5_1_0 = @C_BEGIN_BEFORE_5_1_0@
- C_BEGIN_BEFORE_5_2_0 = @C_BEGIN_BEFORE_5_2_0@
- C_BEGIN_BEFORE_5_3_0 = @C_BEGIN_BEFORE_5_3_0@
-+C_BEGIN_BEFORE_5_4_0 = @C_BEGIN_BEFORE_5_4_0@
-+C_BEGIN_BEFORE_5_4_1 = @C_BEGIN_BEFORE_5_4_1@
- C_BEGIN_FROM_3_07_0 = @C_BEGIN_FROM_3_07_0@
- C_BEGIN_FROM_3_08_0 = @C_BEGIN_FROM_3_08_0@
- C_BEGIN_FROM_3_09_0 = @C_BEGIN_FROM_3_09_0@
-@@ -542,6 +545,8 @@ C_BEGIN_FROM_5_0_0 = @C_BEGIN_FROM_5_0_0
- C_BEGIN_FROM_5_1_0 = @C_BEGIN_FROM_5_1_0@
- C_BEGIN_FROM_5_2_0 = @C_BEGIN_FROM_5_2_0@
- C_BEGIN_FROM_5_3_0 = @C_BEGIN_FROM_5_3_0@
-+C_BEGIN_FROM_5_4_0 = @C_BEGIN_FROM_5_4_0@
-+C_BEGIN_FROM_5_4_1 = @C_BEGIN_FROM_5_4_1@
- C_BEGIN_WITHOUT_CYGWIN = @C_BEGIN_WITHOUT_CYGWIN@
- C_BEGIN_WITHOUT_FLAMBDA2 = @C_BEGIN_WITHOUT_FLAMBDA2@
- C_BEGIN_WITHOUT_MAGIC = @C_BEGIN_WITHOUT_MAGIC@
-@@ -578,6 +582,8 @@ C_END_BEFORE_5_0_0 = @C_END_BEFORE_5_0_0
- C_END_BEFORE_5_1_0 = @C_END_BEFORE_5_1_0@
- C_END_BEFORE_5_2_0 = @C_END_BEFORE_5_2_0@
- C_END_BEFORE_5_3_0 = @C_END_BEFORE_5_3_0@
-+C_END_BEFORE_5_4_0 = @C_END_BEFORE_5_4_0@
-+C_END_BEFORE_5_4_1 = @C_END_BEFORE_5_4_1@
- C_END_FROM_3_07_0 = @C_END_FROM_3_07_0@
- C_END_FROM_3_08_0 = @C_END_FROM_3_08_0@
- C_END_FROM_3_09_0 = @C_END_FROM_3_09_0@
-@@ -604,6 +609,8 @@ C_END_FROM_5_0_0 = @C_END_FROM_5_0_0@
- C_END_FROM_5_1_0 = @C_END_FROM_5_1_0@
- C_END_FROM_5_2_0 = @C_END_FROM_5_2_0@
- C_END_FROM_5_3_0 = @C_END_FROM_5_3_0@
-+C_END_FROM_5_4_0 = @C_END_FROM_5_4_0@
-+C_END_FROM_5_4_1 = @C_END_FROM_5_4_1@
- C_END_WITHOUT_CYGWIN = @C_END_WITHOUT_CYGWIN@
- C_END_WITHOUT_FLAMBDA2 = @C_END_WITHOUT_FLAMBDA2@
- C_END_WITHOUT_MAGIC = @C_END_WITHOUT_MAGIC@
-@@ -644,6 +650,8 @@ END_BEFORE_5_0_0 = @END_BEFORE_5_0_0@
- END_BEFORE_5_1_0 = @END_BEFORE_5_1_0@
- END_BEFORE_5_2_0 = @END_BEFORE_5_2_0@
- END_BEFORE_5_3_0 = @END_BEFORE_5_3_0@
-+END_BEFORE_5_4_0 = @END_BEFORE_5_4_0@
-+END_BEFORE_5_4_1 = @END_BEFORE_5_4_1@
- END_FROM_3_07_0 = @END_FROM_3_07_0@
- END_FROM_3_08_0 = @END_FROM_3_08_0@
- END_FROM_3_09_0 = @END_FROM_3_09_0@
-@@ -670,6 +677,8 @@ END_FROM_5_0_0 = @END_FROM_5_0_0@
- END_FROM_5_1_0 = @END_FROM_5_1_0@
- END_FROM_5_2_0 = @END_FROM_5_2_0@
- END_FROM_5_3_0 = @END_FROM_5_3_0@
-+END_FROM_5_4_0 = @END_FROM_5_4_0@
-+END_FROM_5_4_1 = @END_FROM_5_4_1@
- END_WITHOUT_CYGWIN = @END_WITHOUT_CYGWIN@
- END_WITHOUT_FLAMBDA2 = @END_WITHOUT_FLAMBDA2@
- END_WITHOUT_MAGIC = @END_WITHOUT_MAGIC@
---- stdcompat-21.1/stdcompat__format_s.mli.in.orig	2025-08-20 02:18:12.000000000 -0600
-+++ stdcompat-21.1/stdcompat__format_s.mli.in	2025-10-16 09:52:19.515175969 -0600
-@@ -44,6 +44,9 @@ type tag = string
- type formatter_out_functions = Format.formatter_out_functions =
-   {
-   out_string: string -> int -> int -> unit ;
-+@BEGIN_FROM_5_4_0@
-+  out_width: string -> pos:int -> len:int -> int;
-+@END_FROM_5_4_0@
-   out_flush: unit -> unit ;
-   out_newline: unit -> unit ;
-   out_spaces: int -> unit ;
---- stdcompat-21.1/tools/compiler_version.ml.orig	2025-08-20 02:18:12.000000000 -0600
-+++ stdcompat-21.1/tools/compiler_version.ml	2025-10-16 09:42:41.457779284 -0600
-@@ -87,6 +87,8 @@ let v5_1_1 = mk 5 1 1
- let v5_2_0 = mk 5 2 0
- let v5_2_1 = mk 5 2 1
- let v5_3_0 = mk 5 3 0
-+let v5_4_0 = mk 5 4 0
-+let v5_4_1 = mk 5 4 1
- 
- let known_versions =
- [
-@@ -133,6 +134,8 @@ let known_versions =
-   v5_2_0;
-   v5_2_1;
-   v5_3_0;
-+  v5_4_0;
-+  v5_4_1;
- ]
- 
- let is_known v = List.mem v known_versions
---- stdcompat-21.1/tools/compiler_version.mli.orig	2025-08-20 02:18:12.000000000 -0600
-+++ stdcompat-21.1/tools/compiler_version.mli	2025-10-16 09:45:11.703821688 -0600
-@@ -51,6 +51,8 @@ val v5_1_1 : t
- val v5_2_0 : t
- val v5_2_1 : t
- val v5_3_0 : t
-+val v5_4_0 : t
-+val v5_4_1 : t
- 
- val known_versions : t list
- 

diff --git a/ocaml-stdcompat-ocaml5.5.patch b/ocaml-stdcompat-ocaml5.5.patch
new file mode 100644
index 0000000..f8c1371
--- /dev/null
+++ b/ocaml-stdcompat-ocaml5.5.patch
@@ -0,0 +1,242 @@
+--- stdcompat-21.1/configure.ac.orig	2025-08-20 02:18:12.000000000 -0600
++++ stdcompat-21.1/configure.ac	2026-07-05 13:38:24.818904976 -0600
+@@ -185,6 +185,9 @@ AC_WITH_OCAML_VERSION([5_0_0], [5.0.0])
+ AC_WITH_OCAML_VERSION([5_1_0], [5.1.0])
+ AC_WITH_OCAML_VERSION([5_2_0], [5.2.0])
+ AC_WITH_OCAML_VERSION([5_3_0], [5.3.0])
++AC_WITH_OCAML_VERSION([5_4_0], [5.4.0])
++AC_WITH_OCAML_VERSION([5_4_1], [5.4.1])
++AC_WITH_OCAML_VERSION([5_5_0], [5.5.0])
+ 
+ AS_IF([test "x$target_os_type" = "xWin32"],
+   [AC_WITH_BLOCK([WIN32])],
+--- stdcompat-21.1/Makefile.in.orig	2025-08-20 02:18:12.000000000 -0600
++++ stdcompat-21.1/Makefile.in	2026-07-05 14:09:27.590499177 -0600
+@@ -450,6 +450,9 @@ BEGIN_BEFORE_5_0_0 = @BEGIN_BEFORE_5_0_0
+ BEGIN_BEFORE_5_1_0 = @BEGIN_BEFORE_5_1_0@
+ BEGIN_BEFORE_5_2_0 = @BEGIN_BEFORE_5_2_0@
+ BEGIN_BEFORE_5_3_0 = @BEGIN_BEFORE_5_3_0@
++BEGIN_BEFORE_5_4_0 = @BEGIN_BEFORE_5_4_0@
++BEGIN_BEFORE_5_4_1 = @BEGIN_BEFORE_5_4_1@
++BEGIN_BEFORE_5_5_0 = @BEGIN_BEFORE_5_5_0@
+ BEGIN_FROM_3_07_0 = @BEGIN_FROM_3_07_0@
+ BEGIN_FROM_3_08_0 = @BEGIN_FROM_3_08_0@
+ BEGIN_FROM_3_09_0 = @BEGIN_FROM_3_09_0@
+@@ -476,6 +479,9 @@ BEGIN_FROM_5_0_0 = @BEGIN_FROM_5_0_0@
+ BEGIN_FROM_5_1_0 = @BEGIN_FROM_5_1_0@
+ BEGIN_FROM_5_2_0 = @BEGIN_FROM_5_2_0@
+ BEGIN_FROM_5_3_0 = @BEGIN_FROM_5_3_0@
++BEGIN_FROM_5_4_0 = @BEGIN_FROM_5_4_0@
++BEGIN_FROM_5_4_1 = @BEGIN_FROM_5_4_1@
++BEGIN_FROM_5_5_0 = @BEGIN_FROM_5_5_0@
+ BEGIN_WITHOUT_CYGWIN = @BEGIN_WITHOUT_CYGWIN@
+ BEGIN_WITHOUT_FLAMBDA2 = @BEGIN_WITHOUT_FLAMBDA2@
+ BEGIN_WITHOUT_MAGIC = @BEGIN_WITHOUT_MAGIC@
+@@ -516,6 +522,9 @@ C_BEGIN_BEFORE_5_0_0 = @C_BEGIN_BEFORE_5
+ C_BEGIN_BEFORE_5_1_0 = @C_BEGIN_BEFORE_5_1_0@
+ C_BEGIN_BEFORE_5_2_0 = @C_BEGIN_BEFORE_5_2_0@
+ C_BEGIN_BEFORE_5_3_0 = @C_BEGIN_BEFORE_5_3_0@
++C_BEGIN_BEFORE_5_4_0 = @C_BEGIN_BEFORE_5_4_0@
++C_BEGIN_BEFORE_5_4_1 = @C_BEGIN_BEFORE_5_4_1@
++C_BEGIN_BEFORE_5_5_0 = @C_BEGIN_BEFORE_5_5_0@
+ C_BEGIN_FROM_3_07_0 = @C_BEGIN_FROM_3_07_0@
+ C_BEGIN_FROM_3_08_0 = @C_BEGIN_FROM_3_08_0@
+ C_BEGIN_FROM_3_09_0 = @C_BEGIN_FROM_3_09_0@
+@@ -542,6 +551,9 @@ C_BEGIN_FROM_5_0_0 = @C_BEGIN_FROM_5_0_0
+ C_BEGIN_FROM_5_1_0 = @C_BEGIN_FROM_5_1_0@
+ C_BEGIN_FROM_5_2_0 = @C_BEGIN_FROM_5_2_0@
+ C_BEGIN_FROM_5_3_0 = @C_BEGIN_FROM_5_3_0@
++C_BEGIN_FROM_5_4_0 = @C_BEGIN_FROM_5_4_0@
++C_BEGIN_FROM_5_4_1 = @C_BEGIN_FROM_5_4_1@
++C_BEGIN_FROM_5_5_0 = @C_BEGIN_FROM_5_5_0@
+ C_BEGIN_WITHOUT_CYGWIN = @C_BEGIN_WITHOUT_CYGWIN@
+ C_BEGIN_WITHOUT_FLAMBDA2 = @C_BEGIN_WITHOUT_FLAMBDA2@
+ C_BEGIN_WITHOUT_MAGIC = @C_BEGIN_WITHOUT_MAGIC@
+@@ -578,6 +590,9 @@ C_END_BEFORE_5_0_0 = @C_END_BEFORE_5_0_0
+ C_END_BEFORE_5_1_0 = @C_END_BEFORE_5_1_0@
+ C_END_BEFORE_5_2_0 = @C_END_BEFORE_5_2_0@
+ C_END_BEFORE_5_3_0 = @C_END_BEFORE_5_3_0@
++C_END_BEFORE_5_4_0 = @C_END_BEFORE_5_4_0@
++C_END_BEFORE_5_4_1 = @C_END_BEFORE_5_4_1@
++C_END_BEFORE_5_5_0 = @C_END_BEFORE_5_5_0@
+ C_END_FROM_3_07_0 = @C_END_FROM_3_07_0@
+ C_END_FROM_3_08_0 = @C_END_FROM_3_08_0@
+ C_END_FROM_3_09_0 = @C_END_FROM_3_09_0@
+@@ -604,6 +619,9 @@ C_END_FROM_5_0_0 = @C_END_FROM_5_0_0@
+ C_END_FROM_5_1_0 = @C_END_FROM_5_1_0@
+ C_END_FROM_5_2_0 = @C_END_FROM_5_2_0@
+ C_END_FROM_5_3_0 = @C_END_FROM_5_3_0@
++C_END_FROM_5_4_0 = @C_END_FROM_5_4_0@
++C_END_FROM_5_4_1 = @C_END_FROM_5_4_1@
++C_END_FROM_5_5_0 = @C_END_FROM_5_5_0@
+ C_END_WITHOUT_CYGWIN = @C_END_WITHOUT_CYGWIN@
+ C_END_WITHOUT_FLAMBDA2 = @C_END_WITHOUT_FLAMBDA2@
+ C_END_WITHOUT_MAGIC = @C_END_WITHOUT_MAGIC@
+@@ -644,6 +662,9 @@ END_BEFORE_5_0_0 = @END_BEFORE_5_0_0@
+ END_BEFORE_5_1_0 = @END_BEFORE_5_1_0@
+ END_BEFORE_5_2_0 = @END_BEFORE_5_2_0@
+ END_BEFORE_5_3_0 = @END_BEFORE_5_3_0@
++END_BEFORE_5_4_0 = @END_BEFORE_5_4_0@
++END_BEFORE_5_4_1 = @END_BEFORE_5_4_1@
++END_BEFORE_5_5_0 = @END_BEFORE_5_5_0@
+ END_FROM_3_07_0 = @END_FROM_3_07_0@
+ END_FROM_3_08_0 = @END_FROM_3_08_0@
+ END_FROM_3_09_0 = @END_FROM_3_09_0@
+@@ -670,6 +691,9 @@ END_FROM_5_0_0 = @END_FROM_5_0_0@
+ END_FROM_5_1_0 = @END_FROM_5_1_0@
+ END_FROM_5_2_0 = @END_FROM_5_2_0@
+ END_FROM_5_3_0 = @END_FROM_5_3_0@
++END_FROM_5_4_0 = @END_FROM_5_4_0@
++END_FROM_5_4_1 = @END_FROM_5_4_1@
++END_FROM_5_5_0 = @END_FROM_5_5_0@
+ END_WITHOUT_CYGWIN = @END_WITHOUT_CYGWIN@
+ END_WITHOUT_FLAMBDA2 = @END_WITHOUT_FLAMBDA2@
+ END_WITHOUT_MAGIC = @END_WITHOUT_MAGIC@
+@@ -1068,7 +1092,7 @@ stdcompat__float_s.ml: $(top_builddir)/c
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ stdcompat__format_s.ml: $(top_builddir)/config.status $(srcdir)/stdcompat__format_s.mli.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+-stdcompat__fun_s.ml: $(top_builddir)/config.status $(srcdir)/stdcompat__fun_s.mli.in
++stdcompat__fun_s.ml: $(top_builddir)/config.status $(srcdir)/stdcompat__fun_s.ml.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ stdcompat__hashtbl_s.ml: $(top_builddir)/config.status $(srcdir)/stdcompat__hashtbl_s.mli.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+--- stdcompat-21.1/stdcompat__arrayLabels_s.mli.in.orig	2025-08-20 02:18:12.000000000 -0600
++++ stdcompat-21.1/stdcompat__arrayLabels_s.mli.in	2026-07-05 13:37:53.075066622 -0600
+@@ -267,4 +267,8 @@ external unsafe_get : 'a array -> int ->
+ external unsafe_set : 'a array -> int -> 'a -> unit = "%array_unsafe_set"
+ (** Alias for {!ArrayLabels.unsafe_set} *)
+ 
++(* OCaml 5.4 *)
++val equal : eq:('a -> 'a -> bool) -> 'a array -> 'a array -> bool
++val compare : cmp:('a -> 'a -> int) -> 'a array -> 'a array -> int
++
+ end
+--- stdcompat-21.1/stdcompat__array.ml.in.orig	2025-08-20 02:18:12.000000000 -0600
++++ stdcompat-21.1/stdcompat__array.ml.in	2026-07-05 13:36:16.324298308 -0600
+@@ -229,3 +229,21 @@ let rec find_mapi_from index f array =
+ let find_mapi f array =
+   find_mapi_from 0 f array
+ @END_BEFORE_5_1_0@
++
++@BEGIN_BEFORE_5_4_0@
++(* copied from OCaml 5.4 stdlib/array.ml *)
++let equal eq a b =
++  if length a <> length b then false else
++  let i = ref 0 in
++  let len = length a in
++  while !i < len && eq (unsafe_get a !i) (unsafe_get b !i) do incr i done;
++  !i = len
++let compare cmp a b =
++  let len_a = length a and len_b = length b in
++  let diff = len_a - len_b in
++  if diff <> 0 then (if diff < 0 then -1 else 1) else
++  let i = ref 0 and c = ref 0 in
++  while !i < len_a && !c = 0
++  do c := cmp (unsafe_get a !i) (unsafe_get b !i); incr i done;
++  !c
++@END_BEFORE_5_4_0@
+--- stdcompat-21.1/stdcompat__array_s.mli.in.orig	2025-08-20 02:18:12.000000000 -0600
++++ stdcompat-21.1/stdcompat__array_s.mli.in	2026-07-05 13:37:11.347611845 -0600
+@@ -258,4 +258,8 @@ external unsafe_get : 'a array -> int ->
+ external unsafe_set : 'a array -> int -> 'a -> unit = "%array_unsafe_set"
+ (** Alias for {!Array.unsafe_set} *)
+ 
++(* OCaml 5.4 *)
++val equal : ('a -> 'a -> bool) -> 'a array -> 'a array -> bool
++val compare : ('a -> 'a -> int) -> 'a array -> 'a array -> int
++
+ end
+--- stdcompat-21.1/stdcompat__format_s.mli.in.orig	2025-08-20 02:18:12.000000000 -0600
++++ stdcompat-21.1/stdcompat__format_s.mli.in	2025-10-16 09:52:19.515175969 -0600
+@@ -44,6 +44,9 @@ type tag = string
+ type formatter_out_functions = Format.formatter_out_functions =
+   {
+   out_string: string -> int -> int -> unit ;
++@BEGIN_FROM_5_4_0@
++  out_width: string -> pos:int -> len:int -> int;
++@END_FROM_5_4_0@
+   out_flush: unit -> unit ;
+   out_newline: unit -> unit ;
+   out_spaces: int -> unit ;
+--- stdcompat-21.1/stdcompat__fun_s.mli.in.orig	2025-08-20 02:18:12.000000000 -0600
++++ stdcompat-21.1/stdcompat__fun_s.mli.in	2026-07-05 13:56:44.390816194 -0600
+@@ -5,8 +5,13 @@ exception Finally_raised of exn
+ val compose : ('b -> 'c) -> ('a -> 'b) -> 'a -> 'c
+ (** @since 5.2.0: val compose : ('b -> 'c) -> ('a -> 'b) -> 'a -> 'c *)
+ 
++@BEGIN_BEFORE_5_5_0@
+ external id : 'a -> 'a = "%identity"
+ (** @since 4.08.0: external id : 'a -> 'a = "%identity" *)
++@END_BEFORE_5_5_0@
++@BEGIN_FROM_5_5_0@
++val id: 'a -> 'a
++@END_FROM_5_5_0@
+ 
+ val const : 'a -> 'b -> 'a
+ (** @since 4.08.0: val const : 'a -> 'b -> 'a *)
+--- stdcompat-21.1/stdcompat__fun_s.ml.in.orig	1970-01-01 06:00:00.000000000 -0600
++++ stdcompat-21.1/stdcompat__fun_s.ml.in	2026-07-05 14:09:15.870304717 -0600
+@@ -0,0 +1,28 @@
++module type S = sig
++exception Finally_raised of exn 
++(** Alias for {!Fun.Finally_raised} *)
++
++val compose : ('b -> 'c) -> ('a -> 'b) -> 'a -> 'c
++(** @since 5.2.0: val compose : ('b -> 'c) -> ('a -> 'b) -> 'a -> 'c *)
++
++@BEGIN_BEFORE_5_5_0@
++external id : 'a -> 'a = "%identity"
++(** @since 4.08.0: external id : 'a -> 'a = "%identity" *)
++@END_BEFORE_5_5_0@
++@BEGIN_FROM_5_5_0@
++let id x = x
++@END_FROM_5_5_0@
++
++val const : 'a -> 'b -> 'a
++(** @since 4.08.0: val const : 'a -> 'b -> 'a *)
++
++val flip : ('a -> 'b -> 'c) -> 'b -> 'a -> 'c
++(** @since 4.08.0: val flip : ('a -> 'b -> 'c) -> 'b -> 'a -> 'c *)
++
++val negate : ('a -> bool) -> 'a -> bool
++(** @since 4.08.0: val negate : ('a -> bool) -> 'a -> bool *)
++
++val protect : finally:(unit -> unit) -> (unit -> 'a) -> 'a
++(** @since 4.08.0: val protect : finally:(unit -> unit) -> (unit -> 'a) -> 'a *)
++
++end
+--- stdcompat-21.1/tools/compiler_version.ml.orig	2025-08-20 02:18:12.000000000 -0600
++++ stdcompat-21.1/tools/compiler_version.ml	2026-07-05 13:34:33.477698996 -0600
+@@ -87,6 +87,9 @@ let v5_1_1 = mk 5 1 1
+ let v5_2_0 = mk 5 2 0
+ let v5_2_1 = mk 5 2 1
+ let v5_3_0 = mk 5 3 0
++let v5_4_0 = mk 5 4 0
++let v5_4_1 = mk 5 4 1
++let v5_5_0 = mk 5 5 0
+ 
+ let known_versions =
+ [
+@@ -133,6 +136,9 @@ let known_versions =
+   v5_2_0;
+   v5_2_1;
+   v5_3_0;
++  v5_4_0;
++  v5_4_1;
++  v5_5_0;
+ ]
+ 
+ let is_known v = List.mem v known_versions
+--- stdcompat-21.1/tools/compiler_version.mli.orig	2025-08-20 02:18:12.000000000 -0600
++++ stdcompat-21.1/tools/compiler_version.mli	2026-07-05 13:34:49.365211251 -0600
+@@ -51,6 +51,9 @@ val v5_1_1 : t
+ val v5_2_0 : t
+ val v5_2_1 : t
+ val v5_3_0 : t
++val v5_4_0 : t
++val v5_4_1 : t
++val v5_5_0 : t
+ 
+ val known_versions : t list
+ 

diff --git a/ocaml-stdcompat.spec b/ocaml-stdcompat.spec
index 10bf1ca..5cf0c2e 100644
--- a/ocaml-stdcompat.spec
+++ b/ocaml-stdcompat.spec
@@ -7,12 +7,13 @@ License:        LGPL-2.1-or-later
 URL:            https://github.com/ocamllibs/stdcompat
 VCS:            git:%{url}.git
 Source:         %{url}/archive/%{version}/stdcompat-%{version}.tar.gz
-# Temporary patch to support OCaml 5.4
-Patch:          %{name}-ocaml5.4.patch
+# Temporary patch to support OCaml 5.5
+Patch:          %{name}-ocaml5.5.patch
 
 # OCaml packages not built on i686 since OCaml 5 / Fedora 39.
 ExcludeArch:    %{ix86}
 
+BuildSystem:    dune
 BuildRequires:  ocaml >= 4.11
 BuildRequires:  ocaml-dune >= 2.0
 
@@ -43,15 +44,9 @@ developing applications that use %{name}.
 %prep
 %autosetup -n stdcompat-%{version} -p1
 
-%build
-%dune_build
-
-%install
-%dune_install
-
-%ifarch %{ocaml_native_compiler}
-# The tests assume that ocamlopt is available
 %check
+# The tests assume that ocamlopt is available
+%ifarch %{ocaml_native_compiler}
 %dune_check
 %endif
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-09 17:40 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-09 17:40 [rpms/ocaml-stdcompat] rawhide: OCaml 5.5.0 rebuild Jerry James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox