- CFLAGS fixes (5 sed invokations replaced with patch)

[packages/ocaml.git] / ocaml-tk85support.patch

--- ocaml-3.08.3/otherlibs/labltk/support/cltkImg.c.orig	2005-05-02 17:37:05.485370160 +0000
+++ ocaml-3.08.3/otherlibs/labltk/support/cltkImg.c	2005-05-02 17:45:33.717107192 +0000
@@ -98,7 +98,11 @@
   pib.offset[0] = 0;
   pib.offset[1] = 1;
   pib.offset[2] = 2;
-  Tk_PhotoPutBlock(ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)
+  Tk_PhotoPutBlock(
+#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 5 || TK_MAJOR_VERSION > 8)
+		  NULL, 
+#endif
+		  ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)
 #if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
                    , TK_PHOTO_COMPOSITE_SET
 #endif
--- ocaml-3.08.3/otherlibs/labltk/tkanim/tkAnimGIF.c.orig	2005-05-02 17:53:48.000000000 +0000
+++ ocaml-3.08.3/otherlibs/labltk/tkanim/tkAnimGIF.c	2005-05-02 17:53:33.000000000 +0000
@@ -334,7 +334,11 @@
                 goto error;
             }
         }
-        Tk_PhotoPutBlock(photoHandle, &block, 0, 0, imageWidth, imageHeight
+        Tk_PhotoPutBlock(
+#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 5 || TK_MAJOR_VERSION > 8)
+                 NULL,
+#endif
+				photoHandle, &block, 0, 0, imageWidth, imageHeight
 #if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
                    , TK_PHOTO_COMPOSITE_SET
 #endif