[packages/ocaml-ounit] - up to 2.2.7

[baggins]

commit 48de16a7170ba758981c31cf5aabd53b730aa145
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Apr 26 16:42:46 2026 +0200

    - up to 2.2.7

 ocaml-ounit-remove-Thread-kill.patch  | 13 -------------
 ocaml-ounit-remove-stdlib-shims.patch | 16 ++++++++--------
 ocaml-ounit.spec                      | 15 +++++++--------
 3 files changed, 15 insertions(+), 29 deletions(-)
---
diff --git a/ocaml-ounit.spec b/ocaml-ounit.spec
index 5666d08..b76b988 100644
--- a/ocaml-ounit.spec
+++ b/ocaml-ounit.spec
@@ -9,26 +9,26 @@
 Summary:	OUnit: unit tests for OCaml
 Summary(pl.UTF-8):	OUnit - testy jednostkowe dla OCamla
 Name:		ocaml-ounit
-Version:	2.2.4
+Version:	2.2.7
 Release:	1
 License:	MIT
 Group:		Development/Libraries
 #Source0Download: https://github.com/gildor478/ounit/releases
-Source0:	https://github.com/gildor478/ounit/releases/download/v%{version}/ounit-v%{version}.tbz
-# Source0-md5:	7cc70da6eb7a69bc18936ade68dfae61
+Source0:	https://github.com/gildor478/ounit/releases/download/v%{version}/ounit-%{version}.tbz
+# Source0-md5:	4dacf6a97a79fa725fcb26bcdf61e23b
 Patch0:		%{name}-remove-stdlib-shims.patch
-Patch1:		%{name}-remove-Thread-kill.patch
 URL:		https://github.com/gildor478/ounit
 BuildRequires:	ocaml >= 1:4.04.0
 BuildRequires:	ocaml-dune >= 1.11.0
 BuildRequires:	ocaml-findlib
 BuildRequires:	ocaml-lwt-devel
+BuildRequires:	ocaml-result-devel
+BuildRequires:	ocaml-mmap-devel
+BuildRequires:	ocaml-ocplib-endian-devel
 %requires_eq	ocaml
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%if %{without ocaml_opt}
 %define		_enable_debug_packages	0
-%endif
 
 %description
 OUnit is a unit testing framework for OCaml, inspired by the JUnit
@@ -54,9 +54,8 @@ Biblioteka zawierająca funkcje pomocnicze do tworzenia testów Lwt przy
 użyciu biblioteki OUnit.
 
 %prep
-%setup -q -n ounit-v%{version}
+%setup -q -n ounit-%{version}
 %patch -P0 -p1
-%patch -P1 -p1
 
 %build
 dune build @all --verbose
diff --git a/ocaml-ounit-remove-Thread-kill.patch b/ocaml-ounit-remove-Thread-kill.patch
deleted file mode 100644
index 1180fe4..0000000
--- a/ocaml-ounit-remove-Thread-kill.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ounit-v2.2.4.old/src/lib/ounit2/threads/oUnitRunnerThreads.ml	2021-03-01 21:14:43.656815139 +0000
-+++ ounit-v2.2.4/src/lib/ounit2/threads/oUnitRunnerThreads.ml	2020-12-19 23:59:04.000000000 +0000
-@@ -143,8 +143,8 @@
-         Mutex.lock worker_finished_mutex
-       done;
-       if not !worker_finished then begin
--        (* This will fail... because probably not implemented. *)
--        Thread.kill thread;
-+        (* This will fail... because probably not implemented.
-+         Thread.kill thread; *)
-         worker_finished := true;
-         Condition.broadcast worker_finished_cond
-       end;
diff --git a/ocaml-ounit-remove-stdlib-shims.patch b/ocaml-ounit-remove-stdlib-shims.patch
index 9426ef5..4218bbc 100644
--- a/ocaml-ounit-remove-stdlib-shims.patch
+++ b/ocaml-ounit-remove-stdlib-shims.patch
@@ -17,23 +17,23 @@ index d07d8ca..2ae6fe9 100644
 --- a/ounit2.opam
 +++ b/ounit2.opam
 @@ -10,7 +10,6 @@ depends: [
-   "dune" {>= "1.11.0"}
-   "base-bytes"
+   "ocaml" {>= "4.04.0"}
    "base-unix"
+   "seq"
 -  "stdlib-shims"
+   "odoc" {with-doc}
  ]
  build: [
-   ["dune" "build" "-p" name "-j" jobs]
 diff --git a/src/lib/ounit2/advanced/dune b/src/lib/ounit2/advanced/dune
 index df87fe1..529a7e4 100644
 --- a/src/lib/ounit2/advanced/dune
 +++ b/src/lib/ounit2/advanced/dune
 @@ -7,4 +7,4 @@
-   (name oUnitAdvanced)
-   (public_name ounit2.advanced)
-   (wrapped false)
--  (libraries unix bytes stdlib-shims))
-+  (libraries unix bytes))
+  (name oUnitAdvanced)
+  (public_name ounit2.advanced)
+  (wrapped false)
+- (libraries unix seq stdlib-shims))
++ (libraries unix seq))
 -- 
 2.29.2
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-ounit.git/commitdiff/48de16a7170ba758981c31cf5aabd53b730aa145