public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ocaml-dune] rawhide: OCaml 5.5.0 rebuild
@ 2026-07-09 15:38 Jerry James
0 siblings, 0 replies; only message in thread
From: Jerry James @ 2026-07-09 15:38 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/ocaml-dune
Branch : rawhide
Commit : cc2abc1327a1b79f06f70ec93066a42cfd8a63e1
Author : Jerry James <loganjerry@gmail.com>
Date : 2026-07-09T09:38:33-06:00
Stats : +45/-28 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/ocaml-dune/c/cc2abc1327a1b79f06f70ec93066a42cfd8a63e1?branch=rawhide
Log:
OCaml 5.5.0 rebuild
- Version 3.24.0
---
diff --git a/ocaml-dune-debuginfo.patch b/ocaml-dune-debuginfo.patch
index 906cec4..8c49367 100644
--- a/ocaml-dune-debuginfo.patch
+++ b/ocaml-dune-debuginfo.patch
@@ -1,7 +1,7 @@
---- dune-3.20.0/src/dune_lang/dune_project.ml.orig 2025-08-19 00:28:44.000000000 -0600
-+++ dune-3.20.0/src/dune_lang/dune_project.ml 2025-08-21 20:42:51.793195598 -0600
-@@ -425,7 +425,7 @@ let interpret_lang_and_extensions ~(lang
- let filename = "dune-project"
+--- dune-3.24.0/src/dune_lang/dune_project.ml.orig 2026-06-21 14:57:05.000000000 -0600
++++ dune-3.24.0/src/dune_lang/dune_project.ml 2026-06-24 14:53:47.543763375 -0600
+@@ -484,7 +484,7 @@ let interpret_lang_and_extensions ~(lang
+ let filename = Filename.dune_project
let opam_file_location_default ~lang:_ = `Relative_to_project
let wrapped_executables_default ~(lang : Lang.Instance.t) = lang.version >= (2, 0)
-let map_workspace_root_default ~(lang : Lang.Instance.t) = lang.version >= (3, 0)
diff --git a/ocaml-dune-unbundle-libev.patch b/ocaml-dune-unbundle-libev.patch
index 86cb4a2..0ff5874 100644
--- a/ocaml-dune-unbundle-libev.patch
+++ b/ocaml-dune-unbundle-libev.patch
@@ -1,6 +1,6 @@
---- dune-3.23.0/boot/duneboot.ml.orig 2026-05-05 10:31:16.920123255 -0600
-+++ dune-3.23.0/boot/duneboot.ml 2026-05-05 10:33:01.333241655 -0600
-@@ -2085,7 +2085,7 @@ let build
+--- dune-3.24.0/boot/duneboot.ml.orig 2026-06-24 14:51:18.137646266 -0600
++++ dune-3.24.0/boot/duneboot.ml 2026-06-24 14:52:17.800527553 -0600
+@@ -2087,7 +2087,7 @@ let build
; allow_unstable_sources
; external_includes
; [ m ]
@@ -9,7 +9,7 @@
]
|> Process.run ~cwd:build_dir Config.compiler)
in
-@@ -2162,7 +2162,7 @@ let build
+@@ -2164,7 +2164,7 @@ let build
; link_flags
; (if static then ccopt "-static" else [])
; allow_unstable_sources
@@ -18,13 +18,27 @@
]
|> Process.run ~cwd:build_dir Config.compiler
;;
---- dune-3.23.0/src/lev/src/dune.orig 2026-05-04 16:32:10.000000000 -0600
-+++ dune-3.23.0/src/lev/src/dune 2026-05-05 10:24:53.818980765 -0600
-@@ -1,25 +1,8 @@
+--- dune-3.24.0/src/lev/src/dune.orig 2026-06-21 14:57:05.000000000 -0600
++++ dune-3.24.0/src/lev/src/dune 2026-06-24 14:53:16.502775794 -0600
+@@ -1,42 +1,8 @@
-(copy_files# ../vendor/*.c)
-
-(copy_files# ../vendor/{ev,ev_vars,ev_wrap}.h)
-
+-(rule
+- (enabled_if
+- (= %{ocaml-config:ccomp_type} "msvc"))
+- (target c_flags.sexp)
+- (action
+- (write-file %{target} "(\"/w\")")))
+-
+-(rule
+- (enabled_if
+- (<> %{ocaml-config:ccomp_type} "msvc"))
+- (target c_flags.sexp)
+- (action
+- (write-file %{target} "(-w)")))
+-
-(foreign_library
- (archive_name ev)
- (extra_deps
@@ -36,6 +50,9 @@
- ev_select.c
- ev_win32.c)
- (language c)
+- (flags
+- :standard
+- (:include c_flags.sexp))
- (names ev))
-
(library
diff --git a/ocaml-dune-unbundle-lmdb.patch b/ocaml-dune-unbundle-lmdb.patch
index e5f3506..fa57ee7 100644
--- a/ocaml-dune-unbundle-lmdb.patch
+++ b/ocaml-dune-unbundle-lmdb.patch
@@ -1,6 +1,6 @@
---- dune-3.21.0/boot/duneboot.ml.orig 2026-01-12 11:35:07.000000000 -0700
-+++ dune-3.21.0/boot/duneboot.ml 2026-01-30 10:39:26.440448068 -0700
-@@ -1655,8 +1655,6 @@ module Library = struct
+--- dune-3.24.0/boot/duneboot.ml.orig 2026-06-21 14:57:05.000000000 -0600
++++ dune-3.24.0/boot/duneboot.ml 2026-06-24 14:51:18.137646266 -0600
+@@ -1609,8 +1609,6 @@ module Library = struct
; "-DBLAKE3_NO_AVX2"
; "-DBLAKE3_NO_AVX512"
]
@@ -8,8 +8,8 @@
- | "lmdb_stubs.c", _, _, _ -> [ "-I ." ]
| "mdb.c", `Msvc, `Win32, _ -> [ "/wd4333"; "/wd4172" ]
| "mdb.c", `Other, `Win32, _ -> [ "-Wno-return-local-addr" ]
- | _, _, _, _ -> []
-@@ -2130,6 +2128,7 @@ let build
+ | "ev.c", `Msvc, _, _ -> [ "/w" ]
+@@ -2089,6 +2087,7 @@ let build
; allow_unstable_sources
; external_includes
; [ m ]
@@ -17,7 +17,7 @@
]
|> Process.run ~cwd:build_dir Config.compiler)
in
-@@ -2193,6 +2192,7 @@ let build
+@@ -2165,6 +2164,7 @@ let build
; link_flags
; (if static then ccopt "-static" else [])
; allow_unstable_sources
@@ -25,8 +25,8 @@
]
|> Process.run ~cwd:build_dir Config.compiler
;;
---- dune-3.21.0/vendor/ocaml-lmdb/dune.orig 2026-01-12 11:35:07.000000000 -0700
-+++ dune-3.21.0/vendor/ocaml-lmdb/dune 2026-01-30 10:41:04.503457493 -0700
+--- dune-3.24.0/vendor/ocaml-lmdb/dune.orig 2026-06-21 14:57:05.000000000 -0600
++++ dune-3.24.0/vendor/ocaml-lmdb/dune 2026-06-24 14:51:18.137974338 -0600
@@ -2,11 +2,10 @@
(name lmdb)
(synopsis "Bindings for LMDB, a fast in-file database with ACID transactions")
diff --git a/ocaml-dune.spec b/ocaml-dune.spec
index 330f200..db456ec 100644
--- a/ocaml-dune.spec
+++ b/ocaml-dune.spec
@@ -17,19 +17,20 @@
%global giturl https://github.com/ocaml/dune
Name: ocaml-dune
-Version: 3.23.1
+Version: 3.24.0
Release: 1%{?dist}
Summary: Composable build system for OCaml and Reason
# Dune itself is MIT. Some bundled libraries have a different license:
# BSD-2-Clause:
-# - vendor/ocaml-blake3-mini
+# - src/ocaml-blake3-mini
# BSD-3-Clause:
# - otherlibs/dune-rpc/dbus_address.mll
# - vendor/bigstringaf
# ISC:
# - vendor/cmdliner
# - vendor/notty
+# - vendor/patch
# - vendor/sha
# - vendor/uutf
# LGPL-2.1-only:
@@ -98,6 +99,7 @@ Provides: bundled(ocaml-lwd) = 0.3
Provides: bundled(ocaml-notty) = 0.2.3
Provides: bundled(ocaml-opam) = 2.2.0
Provides: bundled(ocaml-opam-file-format) = 2.1.6
+Provides: bundled(ocaml-patch) = 3.1.0
Provides: bundled(ocaml-pp) = 2.0.0
Provides: bundled(ocaml-re) = 1.13.2
Provides: bundled(ocaml-sha) = 1.15.4
@@ -112,12 +114,6 @@ Requires: ocaml-rpm-macros
# The dune rules module requires Toploop
Requires: ocaml-compiler-libs%{?_isa}
-# This can be removed when F42 reaches EOL
-Obsoletes: ocaml-fiber < 3.7.0
-Obsoletes: ocaml-fiber-devel < 3.7.0
-Provides: ocaml-fiber = %{version}-%{release}
-Provides: ocaml-fiber-devel = %{version}-%{release}
-
# This can be removed when F48 reaches EOL
Obsoletes: ocaml-chrome-trace < 3.21.0
Obsoletes: ocaml-chrome-trace-devel < 3.21.0
@@ -501,6 +497,10 @@ cd -
%files -n ocaml-top-closure-devel -f .ofiles-top-closure-devel
%changelog
+* Wed Jun 24 2026 Jerry James <loganjerry@gmail.com> - 3.24.0-1
+- OCaml 5.5.0 rebuild
+- Version 3.24.0
+
* Tue May 19 2026 Jerry James <loganjerry@gmail.com> - 3.23.1-1
- Version 3.23.1
diff --git a/sources b/sources
index dd41a1e..eea3a91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dune-3.23.1.tar.gz) = ffc3e0bc9e9b79dc58341fd9d7bbf4f7ad087708e469a36c6a4f773fd3b511293831524ca309f72a77ee17b33642d9ecc35d42dc8e76eff8fd0d43738911795b
+SHA512 (dune-3.24.0.tar.gz) = a85bc5e8e77474f9c45ca5ddfd6a1436fb75a4dd8e626f18b6e0339a2b7473ecb06da4d6b39698d38a922ff1125277db3328a8cd2dac509b5712ac9eb88f464e
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-09 15:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-09 15:38 [rpms/ocaml-dune] 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