Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-misc/flashdot/, sci-misc/flashdot/files/
Date: Wed, 28 Apr 2021 18:52:23
Message-Id: 1619635912.7430920ad46eca2df4b62431b3309540ac349168.tupone@gentoo
1 commit: 7430920ad46eca2df4b62431b3309540ac349168
2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 28 18:51:52 2021 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 28 18:51:52 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7430920a
7
8 sci-misc/flashdot: fix new ocaml - but still does not build
9
10 Closes: https://bugs.gentoo.org/770799
11 Package-Manager: Portage-3.0.18, Repoman-3.0.2
12 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
13
14 sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch | 11 +++++++++++
15 sci-misc/flashdot/flashdot-1.1.4-r1.ebuild | 3 ++-
16 2 files changed, 13 insertions(+), 1 deletion(-)
17
18 diff --git a/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch b/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch
19 new file mode 100644
20 index 00000000000..8b00b86d52b
21 --- /dev/null
22 +++ b/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch
23 @@ -0,0 +1,11 @@
24 +--- a/fls/fls.ml 2021-04-26 16:24:25.363442099 +0200
25 ++++ b/fls/fls.ml 2021-04-26 20:10:54.965405870 +0200
26 +@@ -750,7 +750,7 @@
27 + match input inp s 0 1024 with
28 + 0 -> Buffer.contents res
29 + | n ->
30 +- Buffer.add_substring res s 0 n;
31 ++ Buffer.add_subbytes res s 0 n;
32 + fill_buff ()
33 + in
34 + let s = fill_buff () in
35
36 diff --git a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
37 index 97b4fd7fac5..8d31eba9024 100644
38 --- a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
39 +++ b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
40 @@ -1,4 +1,4 @@
41 -# Copyright 1999-2016 Gentoo Foundation
42 +# Copyright 1999-2021 Gentoo Authors
43 # Distributed under the terms of the GNU General Public License v2
44
45 EAPI=6
46 @@ -22,6 +22,7 @@ DEPEND="
47 RDEPEND="${DEPEND}"
48 PATCHES=(
49 "${FILESDIR}/${P}-gsl-ocaml.patch"
50 + "${FILESDIR}"/${P}-ocaml-4.09.patch
51 )
52
53 src_prepare() {