From 49c46da9e892985231cd69d17b49ac6b30dcaea9 Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Feb 25 2020 11:30:18 +0000 Subject: New upstream version 5.1.2. - Add trivial patch to fix OCaml 4.10 build. - +BR ocaml-bisect-ppx-devel. --- diff --git a/.gitignore b/.gitignore index c12b3f4..b98a954 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ lwt-2.0.0+rc1.tar.gz /lwt-4.3.0.tar.gz /lwt-4.3.1.tar.gz /lwt-4.4.0.tar.gz +/lwt-5.1.2.tar.gz diff --git a/lwt-5.1.2-bytes.patch b/lwt-5.1.2-bytes.patch new file mode 100644 index 0000000..61a8b9e --- /dev/null +++ b/lwt-5.1.2-bytes.patch @@ -0,0 +1,11 @@ +--- src/unix/lwt_unix_stubs.c.old 2020-02-25 11:21:55.690509741 +0000 ++++ src/unix/lwt_unix_stubs.c 2020-02-25 11:22:16.500678309 +0000 +@@ -124,7 +124,7 @@ + CAMLprim value lwt_unix_blit_to_bytes(value val_buf1, value val_ofs1, + value val_buf2, value val_ofs2, + value val_len) { +- memcpy(String_val(val_buf2) + Long_val(val_ofs2), ++ memcpy(Bytes_val(val_buf2) + Long_val(val_ofs2), + (char *)Caml_ba_data_val(val_buf1) + Long_val(val_ofs1), + Long_val(val_len)); + return Val_unit; diff --git a/ocaml-lwt.spec b/ocaml-lwt.spec index 6d582c7..03afd75 100644 --- a/ocaml-lwt.spec +++ b/ocaml-lwt.spec @@ -1,6 +1,6 @@ Name: ocaml-lwt -Version: 4.4.0 -Release: 7%{?dist} +Version: 5.1.2 +Release: 1%{?dist} Summary: OCaml lightweight thread library # The openssl linking exception is granted. @@ -8,6 +8,10 @@ License: LGPLv2+ with exceptions URL: http://ocsigen.org/lwt Source0: https://github.com/ocsigen/lwt/archive/%{version}/lwt-%{version}.tar.gz +# Fix for OCaml 4.10. +# Sent upstream on 2020-02-25. +Patch1: lwt-5.1.2-bytes.patch + BuildRequires: ocaml >= 4.02.0 BuildRequires: ocaml-ocamlbuild BuildRequires: ocaml-findlib-devel @@ -17,6 +21,7 @@ BuildRequires: ocaml-dune-devel BuildRequires: ocaml-cppo BuildRequires: ocaml-result-devel BuildRequires: ocaml-seq-devel +BuildRequires: ocaml-bisect-ppx-devel # lwt.unix dependencies BuildRequires: ocaml-mmap-devel @@ -85,6 +90,7 @@ developing applications that use %{name}-ppx. %prep %setup -q -n lwt-%{version} +%patch1 -p0 # Enable libev and pthread. sed 's/-use-libev false/-use-libev true -use-pthread true/g' -i Makefile @@ -182,6 +188,11 @@ dune runtest --profile=release %changelog +* Tue Feb 25 2020 Richard W.M. Jones - 5.1.2-1 +- New upstream version 5.1.2. +- Add trivial patch to fix OCaml 4.10 build. +- +BR ocaml-bisect-ppx-devel. + * Fri Jan 31 2020 Richard W.M. Jones - 4.4.0-7 - Bump release and rebuild. diff --git a/sources b/sources index 109a892..ce02243 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lwt-4.4.0.tar.gz) = a416c26a2725c24f8f55a5048394181ad8f6cc01b8c20fe756896dd1c68ad6a4f32e28aaec52cea44097916d703fa1c82b349b3c6a62856d2dd15c28042b042f +SHA512 (lwt-5.1.2.tar.gz) = 94b1459e8d914fb505d5b340b0a1886f06255333bdc2a94a66bba53842ac0ca6828b75d5072d01a9cf4aa1331314cff8aea5a746b9af04f728ecc7d942c4343a