cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to tcl/tk 8.4

Browse Source 
bring in patches from ocaml anoncvs to deal with API change
ok brad@ naddy@
This commit is contained in:
jose 2003-12-27 23:29:31 +00:00
parent 39504fde78
commit a555f96092
3 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/ocaml/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2002/11/22 16:43:44 sturm Exp $
# $OpenBSD: Makefile,v 1.25 2003/12/27 23:29:31 jose Exp $
COMMENT= "ML language based on complete class-based objective system"
@ -18,14 +18,14 @@ PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= simple
CONFIGURE_ARGS+=-tkdefs '-I${LOCALBASE}/include/tk8.3 -I${LOCALBASE}/include/tcl8.3'
CONFIGURE_ARGS+=-tkdefs '-I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4'
CONFIGURE_ARGS+=-tklibs -L${LOCALBASE}/lib
CONFIGURE_ARGS+=-prefix ${PREFIX}
CONFIGURE_ARGS+=-cc '${CC} ${CFLAGS}'
CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib
LIB_DEPENDS= tcl83.1.3::lang/tcl/8.3 \
tk83.1.3::x11/tk/8.3
LIB_DEPENDS= tcl84::lang/tcl/8.4 \
tk84::x11/tk/8.4
# ocaml's configure script is too smart for its own good

16
lang/ocaml/patches/patch-otherlibs_labltk_support_cltkImg_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-otherlibs_labltk_support_cltkImg_c,v 1.1 2003/12/27 23:29:31 jose Exp $
--- otherlibs/labltk/support/cltkImg.c.orig 2002-07-23 10:11:59.000000000 -0400
+++ otherlibs/labltk/support/cltkImg.c 2003-12-20 11:13:35.000000000 -0500
@@ -99,7 +99,11 @@ camltk_setimgdata_native (value imgname,
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(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
+ );
}
CAMLprim void camltk_setimgdata_bytecode(argv,argn)

17
lang/ocaml/patches/patch-otherlibs_labltk_tkanim_tkAnimGIF_c Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-otherlibs_labltk_tkanim_tkAnimGIF_c,v 1.1 2003/12/27 23:29:31 jose Exp $
--- otherlibs/labltk/tkanim/tkAnimGIF.c.orig 2002-07-23 10:12:00.000000000 -0400
+++ otherlibs/labltk/tkanim/tkAnimGIF.c 2003-12-20 11:33:07.000000000 -0500
@@ -335,8 +335,11 @@ FileReadGIF(interp, f, fileName, formatS
goto error;
}
}
- Tk_PhotoPutBlock(photoHandle, &block, 0, 0,
- imageWidth, imageHeight);
+ Tk_PhotoPutBlock(photoHandle, &block, 0, 0, imageWidth, imageHeight
+#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
+ , TK_PHOTO_COMPOSITE_SET
+#endif
+ );
#ifdef TKANIM_DEBUG
fprintf(stderr, " Retrieving result\n");
#endif