Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/pxp/files/, dev-ml/pxp/
Date: Tue, 03 May 2016 09:14:48
Message-Id: 1462266832.4a549b86ac3a26dcc959c6d78534c7e5c50aa7f8.aballier@gentoo
1 commit: 4a549b86ac3a26dcc959c6d78534c7e5c50aa7f8
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 1 18:50:00 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue May 3 09:13:52 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a549b86
7
8 dev-ml/pxp: fix build with ocaml 4.03
9
10 Package-Manager: portage-2.2.28
11 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
12
13 dev-ml/pxp/files/oc43.patch | 13 +++++++++++++
14 dev-ml/pxp/pxp-1.2.8.ebuild | 4 ++++
15 2 files changed, 17 insertions(+)
16
17 diff --git a/dev-ml/pxp/files/oc43.patch b/dev-ml/pxp/files/oc43.patch
18 new file mode 100644
19 index 0000000..0168c70
20 --- /dev/null
21 +++ b/dev-ml/pxp/files/oc43.patch
22 @@ -0,0 +1,13 @@
23 +Index: pxp-1.2.8/src/pxp-engine/pxp_document.ml
24 +===================================================================
25 +--- pxp-1.2.8.orig/src/pxp-engine/pxp_document.ml
26 ++++ pxp-1.2.8/src/pxp-engine/pxp_document.ml
27 +@@ -3398,8 +3398,6 @@ let find_all_elements ?deeply eltype bas
28 + ;;
29 +
30 +
31 +-exception Skip;;
32 +-
33 + let map_tree ~pre ?(post=(fun x -> x)) base =
34 + let rec map_rec n =
35 + let n' = pre n in
36
37 diff --git a/dev-ml/pxp/pxp-1.2.8.ebuild b/dev-ml/pxp/pxp-1.2.8.ebuild
38 index 0e272ed..77edb00 100644
39 --- a/dev-ml/pxp/pxp-1.2.8.ebuild
40 +++ b/dev-ml/pxp/pxp-1.2.8.ebuild
41 @@ -27,6 +27,10 @@ IUSE="examples +ocamlopt"
42
43 S=${WORKDIR}/${MY_P}
44
45 +src_prepare() {
46 + epatch "${FILESDIR}/oc43.patch"
47 +}
48 +
49 src_configure() {
50 #the included configure does not support many standard switches and is quite picky
51 ./configure || die "configure failed"