[patch] Patch to change camomile API from 0.6.5 to 0.7.1 for galax

galax-0.7.2-camomile-0.7.1.patch (text/plain), 2.55 KB, created by Guy Cirino on 2007-06-06 01:35:08 UTC

diff -urN galax-0.7.2/base/galax_camomile.ml galax-0.7.2-patched/base/galax_camomile.ml
--- galax-0.7.2/base/galax_camomile.ml	2007-02-01 17:08:45.000000000 -0500
+++ galax-0.7.2-patched/base/galax_camomile.ml	2007-06-05 20:45:55.000000000 -0400
@@ -15,7 +15,8 @@
      This module is a wrapper over Camomile operations.
 *)
 
-module TextUTF8 = Camomile.UNF.Make(Camomile.UTF8)
+module TextUTF8 = CamomileLibrary.Default.Camomile.UNF.Make(
+				CamomileLibrary.Default.Camomile.UTF8)
 
 let nfc x = TextUTF8.nfc x
 let nfd x = TextUTF8.nfd x
@@ -35,5 +36,5 @@
   Buffer.contents b
 
 let utf8_codepoint_compare s1 s2 =
-  Camomile.UTF8.compare s1 s2
+  CamomileLibrary.Default.Camomile.UTF8.compare s1 s2
 
diff -urN galax-0.7.2/code_selection/code/code_fn.ml galax-0.7.2-patched/code_selection/code/code_fn.ml
--- galax-0.7.2/code_selection/code/code_fn.ml	2007-02-01 17:08:45.000000000 -0500
+++ galax-0.7.2-patched/code_selection/code/code_fn.ml	2007-06-05 20:45:55.000000000 -0400
@@ -1058,10 +1058,10 @@
       begin
 	try
 	  let codept_list = ref [] in
-	  Camomile.UTF8.iter (fun uc -> let ic = Camomile.UChar.code uc in codept_list := (!codept_list) @ [ic]) s';
+	  CamomileLibrary.Default.Camomile.UTF8.iter (fun uc -> let ic = CamomileLibrary.Default.Camomile.UChar.code uc in codept_list := (!codept_list) @ [ic]) s';
 	  Cursor.cursor_of_list (List.map (fun i -> _integer (Decimal._integer_of_int i)) (!codept_list))
 	with 
-	| Camomile.UChar.Out_of_range -> raise(Query(Unicode_Error("Unicode character cannot be represented by positive integer.")))
+	| CamomileLibrary.Default.Camomile.UChar.Out_of_range -> raise(Query(Unicode_Error("Unicode character cannot be represented by positive integer.")))
       end
 (* F&O Section 7.5.1 fn:contains *)
 
diff -urN galax-0.7.2/configure galax-0.7.2-patched/configure
--- galax-0.7.2/configure	2007-02-05 15:05:46.000000000 -0500
+++ galax-0.7.2-patched/configure	2007-06-05 20:46:22.000000000 -0400
@@ -762,7 +762,7 @@
 printf "%s" "Checking for Camomile..."
 if [ -z "$ocaml_camomile" ]
 then
-	if [ -n "$ocaml_pkglib" -a -d "$ocaml_pkglib/camomile" -a -f "$ocaml_pkglib/camomile/camomile.cmi" ]
+	if [ -n "$ocaml_pkglib" -a -d "$ocaml_pkglib/camomile" -a -f "$ocaml_pkglib/camomile/camomileLibrary.cmi" ]
 	then
 		ocaml_camomile="$ocaml_pkglib/camomile"
 	elif [ -n "$tool_ocamlfind" ]
@@ -770,7 +770,7 @@
 		ocaml_camomile=`$tool_ocamlfind query camomile 2>/dev/null`
 	fi
 fi
-if [ -n "$ocaml_camomile" -a -f "$ocaml_camomile/camomile.cmi" ]
+if [ -n "$ocaml_camomile" -a -f "$ocaml_camomile/camomileLibrary.cmi" ]
 then
 	echo "found"
 else