commit: 9f11e1352805adeb3ef07c60c8b1f667c67b0d9d Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Wed Nov 20 16:55:00 2024 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Fri Nov 22 18:55:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f11e135
dev-ml/extlib: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> .../files/0001-Add-support-for-OCaml-4.12.patch | 25 -------------- ...niv_param-was-removed-for-OCaml-pre-4.00-.patch | 38 ---------------------- dev-ml/extlib/files/extlib-1.7.7-no-git.patch | 9 ----- 3 files changed, 72 deletions(-) diff --git a/dev-ml/extlib/files/0001-Add-support-for-OCaml-4.12.patch b/dev-ml/extlib/files/0001-Add-support-for-OCaml-4.12.patch deleted file mode 100644 index 8a2d076f8224..000000000000 --- a/dev-ml/extlib/files/0001-Add-support-for-OCaml-4.12.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3b2073701aed50cd768e0a4cd3c776c7a3a54d7e Mon Sep 17 00:00:00 2001 -From: Kate <[email protected]> -Date: Thu, 5 Nov 2020 22:17:24 +0000 -Subject: [PATCH 1/2] Add support for OCaml 4.12 - ---- - src/extList.ml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/extList.ml b/src/extList.ml -index 4f0057f..a1435ee 100644 ---- a/src/extList.ml -+++ b/src/extList.ml -@@ -380,7 +380,7 @@ let combine l1 l2 = - loop dummy l1 l2; - dummy.tl - --let sort ?(cmp=compare) = List.sort cmp -+let sort ?(cmp=Pervasives.compare) = List.sort cmp - - #if OCAML < 406 - let rec init size f = --- -2.30.0 - diff --git a/dev-ml/extlib/files/0002-caml_hash_univ_param-was-removed-for-OCaml-pre-4.00-.patch b/dev-ml/extlib/files/0002-caml_hash_univ_param-was-removed-for-OCaml-pre-4.00-.patch deleted file mode 100644 index 59a6843f3a15..000000000000 --- a/dev-ml/extlib/files/0002-caml_hash_univ_param-was-removed-for-OCaml-pre-4.00-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 574e8eae2d358b6db62c2d062b194a7aa06ac02c Mon Sep 17 00:00:00 2001 -From: Kate <[email protected]> -Date: Fri, 6 Nov 2020 14:10:26 +0000 -Subject: [PATCH 2/2] caml_hash_univ_param was removed for OCaml (pre-4.00 - function) - ---- - src/extHashtbl.ml | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/extHashtbl.ml b/src/extHashtbl.ml -index 140e9c2..3c69df4 100644 ---- a/src/extHashtbl.ml -+++ b/src/extHashtbl.ml -@@ -22,7 +22,7 @@ - module Hashtbl = - struct - --#if OCAML >= 400 -+#if OCAML >= 400 && OCAML < 412 - external old_hash_param : - int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc" - #endif -@@ -114,7 +114,11 @@ module Hashtbl = - (* compatibility with old hash tables *) - if Obj.size (Obj.repr h) >= 3 - then (seeded_hash_param 10 100 (h_conv h).seed key) land (Array.length (h_conv h).data - 1) -+ #if OCAML >= 412 -+ else failwith "Old hash function not supported anymore" -+ #else - else (old_hash_param 10 100 key) mod (Array.length (h_conv h).data) -+ #endif - #else - let key_index h key = (hash key) mod (Array.length (h_conv h).data) - #endif --- -2.30.0 - diff --git a/dev-ml/extlib/files/extlib-1.7.7-no-git.patch b/dev-ml/extlib/files/extlib-1.7.7-no-git.patch deleted file mode 100644 index 058543455bce..000000000000 --- a/dev-ml/extlib/files/extlib-1.7.7-no-git.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- ocaml-extlib-1.7.7-orig/Makefile 2020-04-25 07:55:13.000000000 +1000 -+++ ocaml-extlib-1.7.7/Makefile 2020-09-26 07:17:42.141178856 +1000 -@@ -1,5 +1,5 @@ - --VERSION:=$(shell git --git-dir=.git describe --always --long) -+VERSION:=1.7.7-0-gbd9f453 - RELEASE:=1.7.7 - - ifndef VERSION
