[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/2.2.9-5-13-g6d97656

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 3ad54edfc9c7afa1b8d1719cf8e57adcd325d8eb
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Fri Feb 27 00:17:48 2009 +0100

    add patch camlp4-workarounds to workaround a camlp4 regression

diff --git a/debian/changelog b/debian/changelog
index 80e8a48..4863d3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ ocamlnet (2.2.9-6) unstable; urgency=low
     - switch build dep from camlp5 to camlp4, now we built against that
   * debian/*.install.in: avoid specifying debian/tmp/ (is default now)
   * debian/patches/*
+    - add patch camlp4-workarounds (thanks Fedora!) to avoid stumbling
+      upon a camlp4 regression
     - disable patches to build against camlp5: build_w_camlp5,
       camlp5_5_alias_pat. Now ocamlnet can be built using camlp4
     - add patch enable_struct_ucred to make 'struct ucred' from
diff --git a/debian/patches/00list b/debian/patches/00list
index 5cc7594..a0bb02c 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
+camlp4-workarounds.dpatch
 enable_struct_ucred.dpatch
 camlrun_shared.dpatch
 rpath-apache.dpatch
diff --git a/debian/patches/camlp4-workarounds.dpatch b/debian/patches/camlp4-workarounds.dpatch
new file mode 100755
index 0000000..14e7e49
--- /dev/null
+++ b/debian/patches/camlp4-workarounds.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## camlp4-workarounds.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Work around a non backward compatible change in camlp4 3.10
+## DP: namely, when camlp4.macro is loaded "`IN" is no longer a valid
+## DP: polymorphic variant name.
+## DP: Thanks to Fedora for the patch, original source:
+## DP: http://cvs.fedoraproject.org/viewvc/devel/ocaml-ocamlnet/ocamlnet-ocaml310.patch?revision=1.1
+
+ at DPATCH@
+diff -urNad ocamlnet~/src/equeue-gtk1/uq_gtk.ml ocamlnet/src/equeue-gtk1/uq_gtk.ml
+--- ocamlnet~/src/equeue-gtk1/uq_gtk.ml	2009-02-26 23:46:06.000000000 +0100
++++ ocamlnet/src/equeue-gtk1/uq_gtk.ml	2009-02-27 00:13:24.351111692 +0100
+@@ -3,6 +3,11 @@
+ open Equeue
+ open Unixqueue
+ 
++(* Ugly hack required to compile under OCaml 3.10.  This unmarshals
++ * `IN.  IN is a reserved word for Camlp4.Macro.
++ *)
++let __in = (Marshal.from_string "\132\149\166\190\000\000\000\003\000\000\000\000\000\000\000\000\000\000\000\000\001?\229" 0 : GMain.Io.condition)
++
+ IFDEF GTK1 THEN
+   type event_id = GMain.Io.event_source
+ ELSE
+@@ -147,7 +152,7 @@
+ 	       gtk_event_source_hup = None; } in
+ 	 ( match g.gtk_event_source_in with
+ 	       None when i ->
+-		 g.gtk_event_source_in <- Some(mk_handler `IN [fd] [] []);
++		 g.gtk_event_source_in <- Some(mk_handler __in [fd] [] []);
+ 	     | Some s when not i ->
+ 		 dest_handler s;
+ 		 g.gtk_event_source_in <- None

-- 
ocamlnet packaging