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

glondu pushed a commit to branch master
in repository camlidl.

commit 35da152f744feb8485d979e65c955cfc2c1849e9
Author: Stephane Glondu <st...@glondu.net>
Date:   Sun Jul 16 11:24:03 2017 +0200

    Refresh patches
---
 debian/patches/0001-Makefiles-fixes.patch          |  11 +-
 .../0002-Fix-implicit-pointer-conversion.patch     |   7 +-
 .../b58227902eb69a5c38819f587fcb02c92d5627d4.patch | 176 ++++++++++++---------
 3 files changed, 107 insertions(+), 87 deletions(-)

diff --git a/debian/patches/0001-Makefiles-fixes.patch 
b/debian/patches/0001-Makefiles-fixes.patch
index 541c4a8..42e796d 100644
--- a/debian/patches/0001-Makefiles-fixes.patch
+++ b/debian/patches/0001-Makefiles-fixes.patch
@@ -1,6 +1,6 @@
 From: Stefano Zacchiroli <z...@debian.org>
 Date: Sat, 3 Jul 2010 18:35:28 +0200
-Subject: [PATCH] Makefiles fixes
+Subject: Makefiles fixes
 
 Patch upstream Makefiles in order to:
  - install stuff properly in debian/ subdirs
@@ -9,10 +9,10 @@ Patch upstream Makefiles in order to:
 
 Author: Stefano Zacchiroli <z...@debian.org>
 ---
- Makefile              |    3 +++
- config/Makefile.unix  |   22 ++++++++++++----------
- lib/Makefile          |   17 +++++++++++++----
- runtime/Makefile.unix |    2 +-
+ Makefile              |  3 +++
+ config/Makefile.unix  | 22 ++++++++++++----------
+ lib/Makefile          | 17 +++++++++++++----
+ runtime/Makefile.unix |  2 +-
  4 files changed, 29 insertions(+), 15 deletions(-)
 
 diff --git a/Makefile b/Makefile
@@ -133,4 +133,3 @@ index 5617349..737b048 100644
        cp libcamlidl.a $(OCAMLLIB)/libcamlidl.a
        cd $(OCAMLLIB); $(RANLIB) libcamlidl.a
  
--- 
diff --git a/debian/patches/0002-Fix-implicit-pointer-conversion.patch 
b/debian/patches/0002-Fix-implicit-pointer-conversion.patch
index b60dbfe..8167406 100644
--- a/debian/patches/0002-Fix-implicit-pointer-conversion.patch
+++ b/debian/patches/0002-Fix-implicit-pointer-conversion.patch
@@ -1,6 +1,6 @@
 From: Sylvain Le Gall <gil...@debian.org>
 Date: Sat, 3 Jul 2010 18:36:39 +0200
-Subject: [PATCH] Fix implicit pointer conversion
+Subject: Fix implicit pointer conversion
 
 Avoid segfault on archs where size of pointer is greater than
 the size of an integer (patch provided by Dann Frazier).
@@ -9,8 +9,8 @@ Author: dann frazier <da...@hp.com>
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=323221
 Signed-off-by: Sylvain Le Gall <gil...@debian.org>
 ---
- runtime/comerror.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ runtime/comerror.c | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/runtime/comerror.c b/runtime/comerror.c
 index 1e68542..a137b29 100644
@@ -24,4 +24,3 @@ index 1e68542..a137b29 100644
  #include "camlidlruntime.h"
  #include "comstuff.h"
  
--- 
diff --git a/debian/patches/b58227902eb69a5c38819f587fcb02c92d5627d4.patch 
b/debian/patches/b58227902eb69a5c38819f587fcb02c92d5627d4.patch
index b71f34d..1f9cce7 100644
--- a/debian/patches/b58227902eb69a5c38819f587fcb02c92d5627d4.patch
+++ b/debian/patches/b58227902eb69a5c38819f587fcb02c92d5627d4.patch
@@ -1,21 +1,25 @@
-From b58227902eb69a5c38819f587fcb02c92d5627d4 Mon Sep 17 00:00:00 2001
 From: Xavier Leroy <xavierle...@users.noreply.github.com>
 Date: Wed, 29 Jun 2016 12:07:20 +0000
-Subject: [PATCH] OCaml 4.03 compatibility: rename array.ml -> idlarray.ml
+Subject: OCaml 4.03 compatibility: rename array.ml -> idlarray.ml
 
 Also add missing include in runtime/comerror.c
 ---
- compiler/.depend                     | 237 ++++++++++++++++++-----------------
- compiler/Makefile                    |   2 +-
- compiler/cvtval.ml                   |  20 +--
- compiler/{array.ml => idlarray.ml}   |   0
- compiler/{array.mli => idlarray.mli} |   0
- lib/.depend                          |   5 +-
- runtime/comerror.c                   |   4 +-
- 7 files changed, 140 insertions(+), 128 deletions(-)
- rename compiler/{array.ml => idlarray.ml} (100%)
- rename compiler/{array.mli => idlarray.mli} (100%)
+ compiler/.depend      | 237 +++++++++++++++++++++++----------------------
+ compiler/Makefile     |   2 +-
+ compiler/array.ml     | 260 --------------------------------------------------
+ compiler/array.mli    |  38 --------
+ compiler/cvtval.ml    |  20 ++--
+ compiler/idlarray.ml  | 260 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ compiler/idlarray.mli |  38 ++++++++
+ lib/.depend           |   5 +-
+ 8 files changed, 435 insertions(+), 425 deletions(-)
+ delete mode 100644 compiler/array.ml
+ delete mode 100644 compiler/array.mli
+ create mode 100644 compiler/idlarray.ml
+ create mode 100644 compiler/idlarray.mli
 
+diff --git a/compiler/.depend b/compiler/.depend
+index d014910..cb26661 100644
 --- a/compiler/.depend
 +++ b/compiler/.depend
 @@ -1,114 +1,123 @@
@@ -256,9 +260,11 @@ Also add missing include in runtime/comerror.c
 +utils.cmx : utils.cmi
 +variables.cmo : utils.cmi idltypes.cmi cvttyp.cmi variables.cmi
 +variables.cmx : utils.cmx idltypes.cmi cvttyp.cmx variables.cmi
+diff --git a/compiler/Makefile b/compiler/Makefile
+index 688d14a..8942b4b 100644
 --- a/compiler/Makefile
 +++ b/compiler/Makefile
-@@ -16,7 +16,7 @@
+@@ -16,7 +16,7 @@ include ../config/Makefile
  
  OBJS=config.cmo utils.cmo clflags.cmo \
    prefix.cmo lexpr.cmo cvttyp.cmo variables.cmo \
@@ -267,70 +273,9 @@ Also add missing include in runtime/comerror.c
    structdecl.cmo enumdecl.cmo uniondecl.cmo \
    typedef.cmo funct.cmo constdecl.cmo intf.cmo \
    file.cmo predef.cmo \
---- a/compiler/cvtval.ml
-+++ b/compiler/cvtval.ml
-@@ -135,17 +135,17 @@
-   | Type_pointer(Ignore, ty_elt) ->
-       iprintf oc "%s = NULL;\n" c
-   | Type_array({maybe_null=false} as attr, ty_elt) ->
--      Array.array_ml_to_c ml_to_c oc onstack pref attr ty_elt v c
-+      Idlarray.array_ml_to_c ml_to_c oc onstack pref attr ty_elt v c
-   | Type_array({maybe_null=true} as attr, ty_elt) ->
-       option_ml_to_c oc v c
-         (fun v' ->
--          Array.array_ml_to_c ml_to_c oc onstack pref attr ty_elt v' c)
-+          Idlarray.array_ml_to_c ml_to_c oc onstack pref attr ty_elt v' c)
-   | Type_bigarray({bigarray_maybe_null=false} as attr, ty_elt) ->
--      Array.bigarray_ml_to_c oc pref attr ty_elt v c
-+      Idlarray.bigarray_ml_to_c oc pref attr ty_elt v c
-   | Type_bigarray({bigarray_maybe_null=true} as attr, ty_elt) ->
-       option_ml_to_c oc v c
-         (fun v' ->
--          Array.bigarray_ml_to_c oc pref attr ty_elt v' c)
-+          Idlarray.bigarray_ml_to_c oc pref attr ty_elt v' c)
-   | Type_interface(modl, name) ->
-       error (sprintf "Reference to interface %s that is not a pointer" name)
-   | Type_const ty' ->
-@@ -212,15 +212,15 @@
-   | Type_pointer(Ignore, ty_elt) ->
-       ()
-   | Type_array({maybe_null=false} as attr, ty_elt) ->
--      Array.array_c_to_ml c_to_ml oc pref attr ty_elt c v
-+      Idlarray.array_c_to_ml c_to_ml oc pref attr ty_elt c v
-   | Type_array({maybe_null=true} as attr, ty_elt) ->
-       option_c_to_ml oc c v
--        (Array.array_c_to_ml c_to_ml oc pref attr ty_elt c)
-+        (Idlarray.array_c_to_ml c_to_ml oc pref attr ty_elt c)
-   | Type_bigarray({bigarray_maybe_null=false} as attr, ty_elt) ->
--      Array.bigarray_c_to_ml oc pref attr ty_elt c v
-+      Idlarray.bigarray_c_to_ml oc pref attr ty_elt c v
-   | Type_bigarray({bigarray_maybe_null=true} as attr, ty_elt) ->
-       option_c_to_ml oc c v
--        (Array.bigarray_c_to_ml oc pref attr ty_elt c)
-+        (Idlarray.bigarray_c_to_ml oc pref attr ty_elt c)
-   | Type_interface(modl, name) ->
-       error (sprintf "Reference to interface %s that is not a pointer" name)
-   | Type_const ty' ->
-@@ -234,9 +234,9 @@
-       let c' = new_c_variable ty_arg in
-       iprintf oc "%s = &%s;\n" c c'
-   | Type_array(attr, ty_arg) ->
--      Array.array_allocate_output_space oc pref attr ty_arg c
-+      Idlarray.array_allocate_output_space oc pref attr ty_arg c
-   | Type_bigarray(attr, ty_arg) ->
--      Array.bigarray_allocate_output_space oc pref attr ty_arg c
-+      Idlarray.bigarray_allocate_output_space oc pref attr ty_arg c
-   | Type_const ty' -> (* does this make sense? *)
-       allocate_output_space oc pref c ty'
-   | _ -> ()
---- a/lib/.depend
-+++ b/lib/.depend
-@@ -1,2 +1,3 @@
--com.cmo: com.cmi 
--com.cmx: com.cmi 
-+com.cmi :
-+com.cmo : com.cmi
-+com.cmx : com.cmi
+diff --git a/compiler/array.ml b/compiler/array.ml
+deleted file mode 100644
+index 2ed2c86..0000000
 --- a/compiler/array.ml
 +++ /dev/null
 @@ -1,260 +0,0 @@
@@ -594,6 +539,9 @@ Also add missing include in runtime/comerror.c
 -    attr.dims;
 -  fprintf oc "sizeof(%a));\n" out_c_type ty_elt;
 -  attr.malloced <- true
+diff --git a/compiler/array.mli b/compiler/array.mli
+deleted file mode 100644
+index b35c01a..0000000
 --- a/compiler/array.mli
 +++ /dev/null
 @@ -1,38 +0,0 @@
@@ -635,6 +583,67 @@ Also add missing include in runtime/comerror.c
 -val bigarray_allocate_output_space :
 -  out_channel -> Prefix.t -> bigarray_attributes -> idltype -> string -> unit
 -
+diff --git a/compiler/cvtval.ml b/compiler/cvtval.ml
+index c71e622..6926905 100644
+--- a/compiler/cvtval.ml
++++ b/compiler/cvtval.ml
+@@ -135,17 +135,17 @@ let rec ml_to_c oc onstack pref ty v c =
+   | Type_pointer(Ignore, ty_elt) ->
+       iprintf oc "%s = NULL;\n" c
+   | Type_array({maybe_null=false} as attr, ty_elt) ->
+-      Array.array_ml_to_c ml_to_c oc onstack pref attr ty_elt v c
++      Idlarray.array_ml_to_c ml_to_c oc onstack pref attr ty_elt v c
+   | Type_array({maybe_null=true} as attr, ty_elt) ->
+       option_ml_to_c oc v c
+         (fun v' ->
+-          Array.array_ml_to_c ml_to_c oc onstack pref attr ty_elt v' c)
++          Idlarray.array_ml_to_c ml_to_c oc onstack pref attr ty_elt v' c)
+   | Type_bigarray({bigarray_maybe_null=false} as attr, ty_elt) ->
+-      Array.bigarray_ml_to_c oc pref attr ty_elt v c
++      Idlarray.bigarray_ml_to_c oc pref attr ty_elt v c
+   | Type_bigarray({bigarray_maybe_null=true} as attr, ty_elt) ->
+       option_ml_to_c oc v c
+         (fun v' ->
+-          Array.bigarray_ml_to_c oc pref attr ty_elt v' c)
++          Idlarray.bigarray_ml_to_c oc pref attr ty_elt v' c)
+   | Type_interface(modl, name) ->
+       error (sprintf "Reference to interface %s that is not a pointer" name)
+   | Type_const ty' ->
+@@ -212,15 +212,15 @@ let rec c_to_ml oc pref ty c v =
+   | Type_pointer(Ignore, ty_elt) ->
+       ()
+   | Type_array({maybe_null=false} as attr, ty_elt) ->
+-      Array.array_c_to_ml c_to_ml oc pref attr ty_elt c v
++      Idlarray.array_c_to_ml c_to_ml oc pref attr ty_elt c v
+   | Type_array({maybe_null=true} as attr, ty_elt) ->
+       option_c_to_ml oc c v
+-        (Array.array_c_to_ml c_to_ml oc pref attr ty_elt c)
++        (Idlarray.array_c_to_ml c_to_ml oc pref attr ty_elt c)
+   | Type_bigarray({bigarray_maybe_null=false} as attr, ty_elt) ->
+-      Array.bigarray_c_to_ml oc pref attr ty_elt c v
++      Idlarray.bigarray_c_to_ml oc pref attr ty_elt c v
+   | Type_bigarray({bigarray_maybe_null=true} as attr, ty_elt) ->
+       option_c_to_ml oc c v
+-        (Array.bigarray_c_to_ml oc pref attr ty_elt c)
++        (Idlarray.bigarray_c_to_ml oc pref attr ty_elt c)
+   | Type_interface(modl, name) ->
+       error (sprintf "Reference to interface %s that is not a pointer" name)
+   | Type_const ty' ->
+@@ -234,9 +234,9 @@ let rec allocate_output_space oc pref c ty =
+       let c' = new_c_variable ty_arg in
+       iprintf oc "%s = &%s;\n" c c'
+   | Type_array(attr, ty_arg) ->
+-      Array.array_allocate_output_space oc pref attr ty_arg c
++      Idlarray.array_allocate_output_space oc pref attr ty_arg c
+   | Type_bigarray(attr, ty_arg) ->
+-      Array.bigarray_allocate_output_space oc pref attr ty_arg c
++      Idlarray.bigarray_allocate_output_space oc pref attr ty_arg c
+   | Type_const ty' -> (* does this make sense? *)
+       allocate_output_space oc pref c ty'
+   | _ -> ()
+diff --git a/compiler/idlarray.ml b/compiler/idlarray.ml
+new file mode 100644
+index 0000000..2ed2c86
 --- /dev/null
 +++ b/compiler/idlarray.ml
 @@ -0,0 +1,260 @@
@@ -898,6 +907,9 @@ Also add missing include in runtime/comerror.c
 +    attr.dims;
 +  fprintf oc "sizeof(%a));\n" out_c_type ty_elt;
 +  attr.malloced <- true
+diff --git a/compiler/idlarray.mli b/compiler/idlarray.mli
+new file mode 100644
+index 0000000..b35c01a
 --- /dev/null
 +++ b/compiler/idlarray.mli
 @@ -0,0 +1,38 @@
@@ -939,3 +951,13 @@ Also add missing include in runtime/comerror.c
 +val bigarray_allocate_output_space :
 +  out_channel -> Prefix.t -> bigarray_attributes -> idltype -> string -> unit
 +
+diff --git a/lib/.depend b/lib/.depend
+index 404b8d1..1ab2c5e 100644
+--- a/lib/.depend
++++ b/lib/.depend
+@@ -1,2 +1,3 @@
+-com.cmo: com.cmi 
+-com.cmx: com.cmi 
++com.cmi :
++com.cmo : com.cmi
++com.cmx : com.cmi

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

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to