← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ocamlnet/trusty

« back to all changes in this revision

Viewing changes to debian/patches/0001-Camlp4-workarounds.patch

  • Committer: Bazaar Package Importer
  • Author(s): Stéphane Glondu
  • Date: 2011-09-02 14:12:33 UTC
  • mfrom: (18.2.3 sid)
  • Revision ID: james.westby@ubuntu.com-20110902141233-zbj0ygxb92u6gy4z
Tags: 3.4-1
http://bugs.debian.org/637147
* New upstream release
  - add a new NetcgiRequire directive to ease dependency management
    (Closes: #637147)
  - remove patches that were applied upstream:
    + Added-missing-shebang-lines-in-example-shell-scripts
    + Try-also-ocamlc-for-POSIX-threads

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0001-Camlp4-workarounds.patch
1
 
From: Stefano Zacchiroli <zack@debian.org>
2
 
Date: Tue, 6 Oct 2009 15:28:14 +0200
3
 
Subject: [PATCH] Camlp4 workarounds
4
 
 
5
 
Work around a non backward compatible change in camlp4 3.10 namely,
6
 
when camlp4.macro is loaded "`IN" is no longer a valid polymorphic
7
 
variant name.  Thanks to Fedora for the patch, original source:
8
 
http://cvs.fedoraproject.org/viewvc/devel/ocaml-ocamlnet/ocamlnet-ocaml310.patch?revision=1.1
9
 
 
10
 
Signed-off-by: Stefano Zacchiroli <zack@debian.org>
11
 
---
12
 
 src/equeue-gtk1/uq_gtk.ml |    7 ++++++-
13
 
 1 files changed, 6 insertions(+), 1 deletions(-)
14
 
 
15
 
diff --git a/src/equeue-gtk1/uq_gtk.ml b/src/equeue-gtk1/uq_gtk.ml
16
 
index ac99a2d..9b2c348 100644
17
 
--- a/src/equeue-gtk1/uq_gtk.ml
18
 
+++ b/src/equeue-gtk1/uq_gtk.ml
19
 
@@ -3,6 +3,11 @@
20
 
 open Equeue
21
 
 open Unixqueue
22
 
 
23
 
+(* Ugly hack required to compile under OCaml 3.10.  This unmarshals
24
 
+ * `IN.  IN is a reserved word for Camlp4.Macro.
25
 
+ *)
26
 
+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)
27
 
+
28
 
 IFDEF GTK1 THEN
29
 
   type event_id = GMain.Io.event_source
30
 
 ELSE
31
 
@@ -147,7 +152,7 @@ object (self)
32
 
               gtk_event_source_hup = None; } in
33
 
         ( match g.gtk_event_source_in with
34
 
               None when i ->
35
 
-                g.gtk_event_source_in <- Some(mk_handler `IN [fd] [] []);
36
 
+                g.gtk_event_source_in <- Some(mk_handler __in [fd] [] []);
37
 
             | Some s when not i ->
38
 
                 dest_handler s;
39
 
                 g.gtk_event_source_in <- None