[Pkg-ocaml-maint-commits] [galax] 02/05: Fix compilation with ocamlnet 4.1.2

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository galax.

commit d9a0d7fa7044d8d9e7a07bc99eee05aae14a14d2
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Aug 13 10:39:13 2016 +0200

    Fix compilation with ocamlnet 4.1.2
---
 debian/control                                     |  2 +-
 .../patches/0012-Compile-with-ocamlnet-4.1.2.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index d77b2ec..1da905d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  autotools-dev,
  camlp4,
  libpcre-ocaml-dev,
- libocamlnet-ocaml-dev (>= 4.0.4),
+ libocamlnet-ocaml-dev (>= 4.1),
  libpxp-ocaml-dev (>= 1.2.1-1~),
  libcamomile-ocaml-dev,
  hevea,
diff --git a/debian/patches/0012-Compile-with-ocamlnet-4.1.2.patch b/debian/patches/0012-Compile-with-ocamlnet-4.1.2.patch
new file mode 100644
index 0000000..3c917c5
--- /dev/null
+++ b/debian/patches/0012-Compile-with-ocamlnet-4.1.2.patch
@@ -0,0 +1,30 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 13 Aug 2016 10:35:24 +0200
+Subject: Compile with ocamlnet 4.1.2
+
+---
+ base/encoding.ml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/base/encoding.ml b/base/encoding.ml
+index e9fa43f..7d7f4c8 100644
+--- a/base/encoding.ml
++++ b/base/encoding.ml
+@@ -121,7 +121,7 @@ let pxp_fix_write_data_string ~(from_enc:rep_encoding) ~to_enc os content =
+     if to_enc = (from_enc :> encoding)
+     then s
+     else
+-      Netconversion.recode_string
++      Netconversion.convert
+         ~in_enc:(from_enc :> encoding)
+         ~out_enc:to_enc
+         ~subst:(fun n -> assert false)
+@@ -140,7 +140,7 @@ let pxp_fix_write_data_string ~(from_enc:rep_encoding) ~to_enc os content =
+     if to_enc = (from_enc :> encoding) then
+       Pxp_types.write os content j l
+     else begin
+-      let s' = Netconversion.recode_string
++      let s' = Netconversion.convert
+ 	         ~in_enc:(from_enc :> encoding)
+ 	         ~out_enc:to_enc
+ 	         ~subst:(fun n ->
diff --git a/debian/patches/series b/debian/patches/series
index 4ed8acf..6297f88 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0009-Fix-build-with-ocaml-4.01.patch
 0010-Fix-space-tab-issue-in-some-Makefiles.patch
 0011-Compile-with-ocamlnet-4.0.4.patch
+0012-Compile-with-ocamlnet-4.1.2.patch

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