From e3eb85c1c7af76cab65e858f7fbcd8b2c688a535 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Mon, 4 Mar 2019 11:08:21 +0100
Subject: [PATCH] [opam] update dependencies wrt lablgtk3
---
opam/opam | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/opam/opam b/opam/opam
index 1a4556250e9..3b5bfd175e4 100644
--- a/opam/opam
+++ b/opam/opam
@@ -66,7 +66,8 @@ build: [
["autoconf"] {pinned}
["./configure" "--prefix" prefix
"--disable-gui" { !conf-gtksourceview:installed |
- !conf-gnomecanvas:installed }
+ ( !conf-gnomecanvas:installed &
+ !lablgtk3:installed) }
"--mandir=%{man}%"
]
[make "-j%{jobs}%"]
@@ -88,9 +89,9 @@ depends: [
"ocamlfind" # needed beyond build stage, used by -load-module
"zarith"
"conf-autoconf" { build }
- "lablgtk" { >= "2.18.2" } #for ocaml >= 4.02.1
+ ( ( "lablgtk" { >= "2.18.2" } & "conf-gnomecanvas" )
+ | ( "lablgtk3" { >= "3.0.beta4" } & "lablgtk3-sourceview3"))
"conf-gtksourceview"
- "conf-gnomecanvas"
"alt-ergo"
"conf-graphviz" { post }
]
--
GitLab