[Pkg-ocaml-maint-commits] r4144 - /trunk/packages/pxp/trunk/debian/patches/build_w_camlp5.dpatch

[zack at users.alioth.debian.org]

Author: zack
Date: Thu Aug  9 20:47:18 2007
New Revision: 4144

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4144
Log:
avoid FTBFS with camlp5/ulex08

Modified:
    trunk/packages/pxp/trunk/debian/patches/build_w_camlp5.dpatch

Modified: trunk/packages/pxp/trunk/debian/patches/build_w_camlp5.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pxp/trunk/debian/patches/build_w_camlp5.dpatch?rev=4144&op=diff
==============================================================================
--- trunk/packages/pxp/trunk/debian/patches/build_w_camlp5.dpatch (original)
+++ trunk/packages/pxp/trunk/debian/patches/build_w_camlp5.dpatch Thu Aug  9 20:47:18 2007
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad trunk~/configure trunk/configure
 --- trunk~/configure	2007-05-15 10:21:01.000000000 -0400
-+++ trunk/configure	2007-08-09 16:12:28.000000000 -0400
++++ trunk/configure	2007-08-09 16:46:08.000000000 -0400
 @@ -211,7 +211,7 @@
  
  if [ $with_ulex -gt 0 ]; then
@@ -28,7 +28,7 @@
  else
 diff -urNad trunk~/examples/preprocessor/Makefile trunk/examples/preprocessor/Makefile
 --- trunk~/examples/preprocessor/Makefile	2007-05-15 10:21:02.000000000 -0400
-+++ trunk/examples/preprocessor/Makefile	2007-08-09 16:11:35.000000000 -0400
++++ trunk/examples/preprocessor/Makefile	2007-08-09 16:46:08.000000000 -0400
 @@ -1,6 +1,6 @@
  library.cgi: library.ml
  	ocamlfind ocamlc -o library.cgi library.ml \
@@ -39,7 +39,7 @@
  	rm *.cmo *.cmi *.cgi
 diff -urNad trunk~/examples/pullparser/Makefile trunk/examples/pullparser/Makefile
 --- trunk~/examples/pullparser/Makefile	2007-05-15 10:21:02.000000000 -0400
-+++ trunk/examples/pullparser/Makefile	2007-08-09 16:11:35.000000000 -0400
++++ trunk/examples/pullparser/Makefile	2007-08-09 16:46:08.000000000 -0400
 @@ -1,6 +1,6 @@
  pull.cma: pull.ml
 -	ocamlfind ocamlc -a -o pull.cma -package "pxp,camlp4" \
@@ -51,7 +51,7 @@
  clean:
 diff -urNad trunk~/gensrc/pxp-ulex-utf8/META.in trunk/gensrc/pxp-ulex-utf8/META.in
 --- trunk~/gensrc/pxp-ulex-utf8/META.in	2007-05-15 10:21:03.000000000 -0400
-+++ trunk/gensrc/pxp-ulex-utf8/META.in	2007-08-09 16:14:19.000000000 -0400
++++ trunk/gensrc/pxp-ulex-utf8/META.in	2007-08-09 16:46:08.000000000 -0400
 @@ -1,5 +1,5 @@
  description = "Polymorphic XML parser - Lexical analyzer for UTF-8 based on wlex"
 -requires = "pxp-engine,ulex"
@@ -60,8 +60,8 @@
  
  archive(byte) = "pxp_ulex_utf8.cma pxp_ulex_link_utf8.cmo"
 diff -urNad trunk~/gensrc/pxp-ulex-utf8/Makefile trunk/gensrc/pxp-ulex-utf8/Makefile
---- trunk~/gensrc/pxp-ulex-utf8/Makefile	2007-08-09 16:11:35.000000000 -0400
-+++ trunk/gensrc/pxp-ulex-utf8/Makefile	2007-08-09 16:14:06.000000000 -0400
+--- trunk~/gensrc/pxp-ulex-utf8/Makefile	2007-08-09 16:46:08.000000000 -0400
++++ trunk/gensrc/pxp-ulex-utf8/Makefile	2007-08-09 16:46:08.000000000 -0400
 @@ -7,9 +7,10 @@
  ML = $(shell echo pxp_ulex_$(ENC)_*.ml)
  CMO = $(ML:.ml=.cmo)
@@ -87,7 +87,7 @@
  	rm -f $(CLEAN_LIST) *.ml *.mll gen_done
 diff -urNad trunk~/src/pxp-pp/META.in trunk/src/pxp-pp/META.in
 --- trunk~/src/pxp-pp/META.in	2007-05-15 10:21:03.000000000 -0400
-+++ trunk/src/pxp-pp/META.in	2007-08-09 16:15:26.000000000 -0400
++++ trunk/src/pxp-pp/META.in	2007-08-09 16:46:08.000000000 -0400
 @@ -2,13 +2,13 @@
  version = "@VERSION@"
  
@@ -106,8 +106,8 @@
  # Specification of stand-alone preprocessor call:
  archive(syntax,preprocessor) = "pxp_pp.cma"
 diff -urNad trunk~/src/pxp-pp/Makefile trunk/src/pxp-pp/Makefile
---- trunk~/src/pxp-pp/Makefile	2007-08-09 16:11:35.000000000 -0400
-+++ trunk/src/pxp-pp/Makefile	2007-08-09 16:15:12.000000000 -0400
+--- trunk~/src/pxp-pp/Makefile	2007-08-09 16:46:08.000000000 -0400
++++ trunk/src/pxp-pp/Makefile	2007-08-09 16:46:08.000000000 -0400
 @@ -2,9 +2,10 @@
  
  include $(TOP_DIR)/Makefile.rules
@@ -121,3 +121,28 @@
  OCAMLC_OPTIONS += $(CAMLP4_LOC) -ppopt -loc -ppopt loc
  
  
+diff -urNad trunk~/src/pxp-pp/pxp_pp.ml trunk/src/pxp-pp/pxp_pp.ml
+--- trunk~/src/pxp-pp/pxp_pp.ml	2007-05-15 10:21:03.000000000 -0400
++++ trunk/src/pxp-pp/pxp_pp.ml	2007-08-09 16:46:39.000000000 -0400
+@@ -625,20 +625,7 @@
+ 
+ let mkloc ((_p1_line,_p1_line_start,p1_pos)) 
+           ((_p2_line,_p2_line_start,p2_pos)) =
+-  (* Differs in O'Caml 3.07 and 3.08 *)
+-  IFDEF OCAML_NEW_LOC THEN
+-    let l1 = { Lexing.pos_fname = "";
+-	       Lexing.pos_lnum = _p1_line;
+-	       Lexing.pos_bol = _p1_line_start;
+-	       Lexing.pos_cnum = p1_pos } in
+-    let l2 = { Lexing.pos_fname = "";
+-	       Lexing.pos_lnum = _p2_line;
+-	       Lexing.pos_bol = _p2_line_start;
+-	       Lexing.pos_cnum = p2_pos } in
+-    (l1,l2)
+-  ELSE
+-    (p1_pos,p2_pos)
+-  END
++  Stdpp.make_lined_loc _p1_line _p1_line_start (p1_pos, p2_pos)
+ ;;
+ 
+