From: Jan N. <jan...@gm...> - 2012-08-09 10:10:46
|
2012/8/9 Jan Nijtmans <jan...@gm...> > Then, let's look at the > differences between jn-cocoa-full-merge and > tk-cocoa-8-5-backport. It's only in 5 files: > Files ../tk8.5/unix/configure and ./unix/configure differ > Files ../tk8.5/unix/configure.in and ./unix/configure.in differ > Files ../tk8.5/unix/Makefile.in and ./unix/Makefile.in differ > Files ../tk8.5/unix/tcl.m4 and ./unix/tcl.m4 differ > Files ../tk8.5/xlib/xgc.c and ./xlib/xgc.c differ > Had a further look, and it turns out that tcl.m4 in the backport branch was an older version. Upgraded now and re-generated the configure script. xgc.c: All this does is allocate and free some extra space in XCreateGC/XFreeGC. Tk8.6 already has the same file, it has the proper #ifdefs, so those changes are OK. In "configure.in" and "Makefile.in" I only see changes in Mac-specific stuff, I tried to build the "tk-cocoa-8-5-backport" on Cygwin and win32, everything looks fine to me. This means that my reservations about this full merge are gone now. I think it can be done directly from the "tk-cocoa-8-5-backport", without problems for other platforms. Regards, Jan Nijtmans |