rpms/cduce/devel cduce-0.5.2.1-ocaml-3.11.0.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 cduce.spec, 1.7, 1.8 sources, 1.4, 1.5
Richard W.M. Jones
rjones at fedoraproject.org
Fri Dec 5 14:45:14 UTC 2008
Author: rjones
Update of /cvs/pkgs/rpms/cduce/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27250
Modified Files:
.cvsignore cduce.spec sources
Added Files:
cduce-0.5.2.1-ocaml-3.11.0.patch
Log Message:
* Fri Dec 5 2008 Richard W.M. Jones <rjones at redhat.com> - 0.5.2.1-11
- Attempt to rebuild against OCaml 3.11.0.
cduce-0.5.2.1-ocaml-3.11.0.patch:
--- NEW FILE cduce-0.5.2.1-ocaml-3.11.0.patch ---
diff -ur cduce-0.5.2.orig/ocamliface/location.ml cduce-0.5.2.newcaml/ocamliface/location.ml
--- cduce-0.5.2.orig/ocamliface/location.ml 2008-02-25 10:10:27.000000000 +0000
+++ cduce-0.5.2.newcaml/ocamliface/location.ml 2008-12-05 14:20:56.000000000 +0000
@@ -15,6 +15,8 @@
let input_name = ref ""
let input_lexbuf = ref None
let get_pos_info = dummy
+let print_error_cur_file = dummy
+let print_error = dummy
let print = dummy
let print_warning = dummy
let prerr_warning = dummy
diff -ur cduce-0.5.2.orig/ocamliface/Makefile cduce-0.5.2.newcaml/ocamliface/Makefile
--- cduce-0.5.2.orig/ocamliface/Makefile 2008-12-05 14:36:18.000000000 +0000
+++ cduce-0.5.2.newcaml/ocamliface/Makefile 2008-12-05 14:38:27.000000000 +0000
@@ -41,6 +41,7 @@
rm -Rf ocaml_files *~ *.cm*
COPY_FILES=\
+ typing/annot.mli \
utils/misc.ml utils/tbl.ml \
utils/consistbl.ml utils/warnings.ml utils/terminfo.ml utils/clflags.ml \
parsing/asttypes.mli parsing/location.mli \
@@ -57,7 +58,7 @@
asttypes.mli outcometree.mli asttypes.ml \
config.ml misc.ml tbl.ml \
clflags.ml consistbl.ml warnings.ml terminfo.ml \
- location.mli location.ml longident.ml \
+ location.mli location.ml annot.mli longident.ml \
ident.ml path.ml \
primitive.ml types.ml \
btype.ml oprint.ml \
diff -ur cduce-0.5.2.orig/ocamliface/mltypes.ml cduce-0.5.2.newcaml/ocamliface/mltypes.ml
--- cduce-0.5.2.orig/ocamliface/mltypes.ml 2008-02-25 10:10:42.000000000 +0000
+++ cduce-0.5.2.newcaml/ocamliface/mltypes.ml 2008-12-05 14:26:27.000000000 +0000
@@ -169,14 +169,14 @@
slot.def <-
(match decl.type_kind, decl.type_manifest with
- | Type_variant (cstrs,pub), _ ->
+ | Type_variant (cstrs), _ ->
let cstrs =
List.map
(fun (cst,f) -> (cst,List.map (unfold env) f)) cstrs in
- Variant (prefix, cstrs, pub = Caml_cduce.Asttypes.Public)
- | Type_record (f,_,pub), _ ->
+ Variant (prefix, cstrs, true)
+ | Type_record (f,_), _ ->
let f = List.map (fun (l,_,t) -> (l,unfold env t)) f in
- Record (prefix, f, pub = Caml_cduce.Asttypes.Public)
+ Record (prefix, f, true)
| Type_abstract, Some t ->
Link (unfold env t)
| Type_abstract, None ->
diff -ur cduce-0.5.2.orig/parser/cduce_curl.ml cduce-0.5.2.newcaml/parser/cduce_curl.ml
--- cduce-0.5.2.orig/parser/cduce_curl.ml 2008-02-25 10:10:42.000000000 +0000
+++ cduce-0.5.2.newcaml/parser/cduce_curl.ml 2008-12-05 14:34:07.000000000 +0000
@@ -9,7 +9,12 @@
let buff = Buffer.create 4096 in
let conn = Curl.init () in
Curl.set_url conn s;
- Curl.set_writefunction conn (Buffer.add_string buff);
+ Curl.set_writefunction conn (
+ fun str ->
+ Buffer.add_string buff str;
+ (* Not clear what Curl is expecting -- the string length? (RWMJ) *)
+ String.length str
+ );
Curl.perform conn;
Buffer.contents buff
with Curl.CurlException (code, n, msg) ->
diff -ur cduce-0.5.2.orig/runtime/print_xml.ml cduce-0.5.2.newcaml/runtime/print_xml.ml
--- cduce-0.5.2.orig/runtime/print_xml.ml 2008-02-25 10:10:40.000000000 +0000
+++ cduce-0.5.2.newcaml/runtime/print_xml.ml 2008-12-05 14:11:05.000000000 +0000
@@ -108,7 +108,6 @@
let wms = write_markup_string ~to_enc buffer
and wds s = write_data_string ~to_enc buffer (U.get_str s)
and wcs s = buffer (U.get_str s) in
- in
let write_att (n,v) =
wms (" " ^ (Ns.Printer.attr printer (Label.value n)) ^ "=\""); wds v; wms "\"" in
let write_xmlns (pr,ns) =
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 24 Apr 2008 09:02:49 -0000 1.4
+++ .cvsignore 5 Dec 2008 14:44:43 -0000 1.5
@@ -1,2 +1,3 @@
cduce-0.5.2.1.tar.gz
ocaml-3.10.2.tar.bz2
+ocaml-3.11.0.tar.bz2
Index: cduce.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/cduce.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cduce.spec 22 Nov 2008 16:08:51 -0000 1.7
+++ cduce.spec 5 Dec 2008 14:44:43 -0000 1.8
@@ -1,11 +1,11 @@
%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%define debug_package %{nil}
-%define ocaml_major 3.10
-%define ocaml_minor 2
+%define ocaml_major 3.11
+%define ocaml_minor 0
Name: cduce
Version: 0.5.2.1
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: modern XML-oriented functional language
Group: Development/Libraries
@@ -16,6 +16,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: ppc64
+Patch0: cduce-0.5.2.1-ocaml-3.11.0.patch
+
BuildRequires: ocaml = %{ocaml_major}.%{ocaml_minor}
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-camlp4-devel
@@ -55,6 +57,9 @@
%prep
%setup -q -n cduce-0.5.2
+
+%patch0 -p1
+
# Unpack the OCaml sources in the build directory.
bzcat %{SOURCE1} | tar xf -
./configure --prefix=%{_prefix} \
@@ -107,6 +112,9 @@
%changelog
+* Fri Dec 5 2008 Richard W.M. Jones <rjones at redhat.com> - 0.5.2.1-11
+- Attempt to rebuild against OCaml 3.11.0.
+
* Sat Nov 22 2008 Richard W.M. Jones <rjones at redhat.com> - 0.5.2.1-10
- Don't include the name in the summary line.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 24 Apr 2008 09:02:49 -0000 1.4
+++ sources 5 Dec 2008 14:44:43 -0000 1.5
@@ -1,2 +1,2 @@
d2d52bf536c1a8f4397b4c64794d9322 cduce-0.5.2.1.tar.gz
-d86f8f8aa4574fa60dd6f89044580307 ocaml-3.10.2.tar.bz2
+6ed1c3ed660a15408362242fa8fa4668 ocaml-3.11.0.tar.bz2
More information about the fedora-extras-commits
mailing list