From: Mariusz Mazur <mmazur@pld-linux.org>
Date: Mon, 2 May 2005 18:27:05 +0000 (+0000)
Subject: - support for tk8.5
X-Git-Tag: auto/th/ocaml-3_08_3-4~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Focaml.git;a=commitdiff_plain;h=93ce37a676972a84bacaed0d990771a60a851163

- support for tk8.5

Changed files:
    ocaml-tk85support.patch -> 1.1
---

diff --git a/ocaml-tk85support.patch b/ocaml-tk85support.patch
new file mode 100644
index 0000000..44ead53
--- /dev/null
+++ b/ocaml-tk85support.patch
@@ -0,0 +1,30 @@
+--- 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