[Pkg-ocaml-maint-commits] [cameleon] 03/03: Fix compilation with latest lablgtk-extras (Closes: #731822)

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cameleon.

commit ec4f6e53bb3d17549bf4fa4075d6473c9d7474ca
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Feb 17 10:39:32 2014 +0100

    Fix compilation with latest lablgtk-extras (Closes: #731822)
---
 .../0002-Fix-detection-of-lablgtk-extras.patch     | 33 ++++++++++++++--------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/debian/patches/0002-Fix-detection-of-lablgtk-extras.patch b/debian/patches/0002-Fix-detection-of-lablgtk-extras.patch
index 7a04cb4..e784544 100644
--- a/debian/patches/0002-Fix-detection-of-lablgtk-extras.patch
+++ b/debian/patches/0002-Fix-detection-of-lablgtk-extras.patch
@@ -1,27 +1,38 @@
 From: Stephane Glondu <steph at glondu.net>
-Date: Sun, 11 Sep 2011 16:34:37 +0200
+Date: Mon, 17 Feb 2014 10:31:45 +0100
 Subject: Fix detection of lablgtk-extras
 
-Forwarded: no
-Signed-off-by: Stephane Glondu <steph at glondu.net>
+ * its dependencies are managed by ocamlfind
+ * the latest version depends on xmlm instead of xml-light
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731822
 ---
- utils/checkocaml.ml |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
+ utils/checkocaml.ml | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/utils/checkocaml.ml b/utils/checkocaml.ml
-index 42b6542..3a07ddf 100644
+index 42b6542..6979b50 100644
 --- a/utils/checkocaml.ml
 +++ b/utils/checkocaml.ml
-@@ -873,7 +873,10 @@ let detect_xml_light ?(modes=[`Byte;`Opt]) conf =
+@@ -871,9 +871,10 @@ let detect_xml_light ?(modes=[`Byte;`Opt]) conf =
+ (*/c==v=[OCaml_conf.detect_xml_light]=0.3====*)
+ 
  let detect_lablgtkextras ?(modes=[`Byte;`Opt]) lablgtk_incs conf =
++  let ( ++ ) incs s = Filename.concat (ocaml_libdir conf) s :: incs in
    let includes =
      ["default install",
 -      (Filename.concat (ocaml_libdir conf) "lablgtk-extras") :: lablgtk_incs
-+     (Filename.concat (ocaml_libdir conf) "lablgtk-extras")
-+     :: (Filename.concat (ocaml_libdir conf) "xml-light")
-+     :: (Filename.concat (ocaml_libdir conf) "config-file")
-+     :: lablgtk_incs
++      lablgtk_incs ++ "config-file" ++ "xmlm" ++ "lablgtk2-extras"
      ]
    in
    let includes =
+@@ -889,7 +890,7 @@ let detect_lablgtkextras ?(modes=[`Byte;`Opt]) lablgtk_incs conf =
+       "lablgtk.cma" ;
+       "lablgtksourceview2.cma";
+       "config_file.cmo";
+-      "xml-light.cma";
++      "xmlm.cma";
+       "lablgtkextras.cma"]
+   in
+   let f (mes, includes) mode =
 -- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cameleon.git