Sophie

Sophie

distrib > Mandriva > 2008.0 > x86_64 > by-pkgid > b97b431312a701e433ad0279d91657e5 > files > 10

ocaml-3.10.0-4mdv2008.0.src.rpm

--- ocaml-3.10.0/otherlibs/labltk/support/cltkImg.c.pix	2004-05-17 19:10:00.000000000 +0200
+++ ocaml-3.10.0/otherlibs/labltk/support/cltkImg.c	2007-05-29 11:07:24.000000000 +0200
@@ -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)
+		   cltclinterp,
+#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.10.0/otherlibs/labltk/tkanim/tkAnimGIF.c.pix	2004-05-17 19:10:00.000000000 +0200
+++ ocaml-3.10.0/otherlibs/labltk/tkanim/tkAnimGIF.c	2007-05-29 11:08:35.000000000 +0200
@@ -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)
+			 interp,
+#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
--- ocaml-3.10.0/configure.pix	2007-05-03 14:49:56.000000000 +0200
+++ ocaml-3.10.0/configure	2007-05-29 10:49:12.000000000 +0200
@@ -1342,6 +1379,7 @@
     8.2) tclmaj=8 tclmin=2 tkmaj=8 tkmin=2 ;;
     8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;;
     8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;;
+    8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;;
     *) echo "This version is not known."; has_tk=false ;;
     esac
   else