#4219 tcltk-8.5.13-1 for 10.7 fink

Added_to_Fink
closed-fixed
Daniel Macks
5
2012-11-25
2012-11-17
Jack Howarth
No

The attached packaging updates tcltk-x86_64.info in 10.7 fink to the latest tcltk-8.5.13 release. The original patch from 8.45.10-5 is corrected to apply to 8.5.13 except for the change for /tk8.5.13/unix/Makefile.in which is already applied upstream. The packaging also uses...

SetCC: flag-sort -v -r gcc

to avoid the validation errors...

Looking for incorrect headers in 275 dependency files...
./tk8.5.13/unix/tkUnixRFont.d uses /usr/X11R6/include/X11/Xft/Xft.h
./tk8.5.13/unix/tkUnixRFont.d uses /usr/X11R6/include/X11/Xft/XftCompat.h
./tk8.5.13/unix/tkUnixRFont.d uses /usr/X11R6/include/fontconfig/fontconfig.h
./tk8.5.13/unix/tkUnixRFont.d uses /usr/X11R6/include/ft2build.h
Please fix build process to get consistent use of fink's headers.

The attached packaging with this BuildDepends on flag-sort passes 'fink -m' on 10.7.

Discussion

  • Jack Howarth
    Jack Howarth
    2012-11-17

    tcltk-8.5.13-1 info file for 10.7 tree

     
    Attachments
  • Jack Howarth
    Jack Howarth
    2012-11-17

    tcltk-8.5.13-1 patch file for 10.7 tree

     
    Attachments
  • Jack Howarth
    Jack Howarth
    2012-11-17

    Eliminated the usage of flag-sort in the tcltk-8.5.13-1 packaging for x86_64 and 10.7 fink by appending the patch...

    --- tcltk-8.5.13.orig/tk8.5.13/unix/Makefile.in 2012-11-17 11:21:56.000000000 -0500
    +++ tcltk-8.5.13/tk8.5.13/unix/Makefile.in 2012-11-17 11:24:13.000000000 -0500
    @@ -323,18 +323,18 @@

    CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \ --I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM@_INCLUDES} ${AC_FLAGS} \ +-I${TCL_PLATFORM_DIR} @EXTRA_CC_SWITCHES@ ${@TK_WINDOWINGSYSTEM@_INCLUDES} ${AC_FLAGS} \ ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \ -${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@
    +${NO_DEPRECATED_FLAGS}

    CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS}

    APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @EXTRA_APP_CC_SWITCHES@

    DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \ --I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM@_INCLUDES} \ +-I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} @EXTRA_CC_SWITCHES@ ${@TK_WINDOWINGSYSTEM@_INCLUDES} \ ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \ -${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@
    +${KEYSYM_FLAGS}

    WISH_OBJS = tkAppInit.o

    to tcltk-x86_64.patch. Passes 'fink -m' on 10.7.

     
  • Daniel Macks
    Daniel Macks
    2012-11-25

    • milestone: --> Added_to_Fink
    • status: open --> closed-fixed
     
  • Daniel Macks
    Daniel Macks
    2012-11-25

    Thanks! I committed with a slightly different patch (was tripping a grep heuristic for "fragile -I flags" even if it currently did not break in my test-building).