Check-in [6aed8e99b7]
Overview
Comment:Added patch for Tk to fix Tk 8.4 on UNIX's bind ... <MouseWheel>
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:6aed8e99b79a405cd880de94f7d1245c92bb4d2b
User & Date: rkeene on 2010-09-26 04:49:10
Other Links: manifest | tags
Context
2010-09-26
04:49
Updated to not provide Tk package, since that is taken care of by Tk itself check-in: d589e2755f user: rkeene tags: trunk
04:49
Added patch for Tk to fix Tk 8.4 on UNIX's bind ... <MouseWheel> check-in: 6aed8e99b7 user: rkeene tags: trunk
04:49
Updated to invoke Xvfb with 24bpp depth to avoid segfault in FreeColormap()

Updated to invoke Xvfb in sub-shell to avoid bash message regarding the process being killed check-in: 3a9fc82d6e user: rkeene tags: trunk

Changes

Modified tk/build.sh from [74d986fc51] to [7c3301f812].

    10     10   
    11     11   	exit 1
    12     12   fi
    13     13   
    14     14   SRC="src/tk${TCLVERS}.tar.gz"
    15     15   SRCURL="http://prdownloads.sourceforge.net/tcl/tk${TCLVERS}-src.tar.gz"
    16     16   BUILDDIR="$(pwd)/build/tk${TCLVERS}"
           17  +PATCHDIR="$(pwd)/patches"
    17     18   OUTDIR="$(pwd)/out"
    18     19   INSTDIR="$(pwd)/inst"
    19         -export SRC SRCURL BUILDDIR OUTDIR INSTDIR
           20  +export SRC SRCURL BUILDDIR PATCHDIR OUTDIR INSTDIR
    20     21   
    21     22   rm -rf 'build' 'out' 'inst'
    22     23   mkdir 'build' 'out' 'inst' || exit 1
           24  +
           25  +# Determine Tcl version
           26  +TCL_VERSION="unknown"
           27  +if [ -f "${TCLCONFIGDIR}/tclConfig.sh" ]; then
           28  +	source "${TCLCONFIGDIR}/tclConfig.sh"
           29  +fi
           30  +export TCL_VERSION
           31  +
    23     32   
    24     33   if [ ! -f "${SRC}" ]; then
    25     34   	mkdir 'src' >/dev/null 2>/dev/null
    26     35   
    27     36   	if echo "${TCLVERS}" | grep '^cvs_' >/dev/null; then
    28     37   		CVSTAG=$(echo "${TCLVERS}" | sed 's/^cvs_//g')
    29     38   		export CVSTAG
................................................................................
    50     59   	if [ ! -d '../buildsrc' ]; then
    51     60   		gzip -dc "../${SRC}" | tar -xf -
    52     61   	else    
    53     62   		cp -rp ../buildsrc/* './'
    54     63   	fi
    55     64   
    56     65   	cd "${BUILDDIR}" || exit 1
           66  +
           67  +	# Determine Tk version
           68  +	TK_VERSION="$(grep '^#.*define.*TK_VERSION' generic/tk.h 2>/dev/null | sed 's@^# *define[[:space:]][[:space:]]*TK_VERSION[[:space:]][[:space:]]*\"@@;s@\"$@@' 2>/dev/null | head -n 1)"
           69  +	if [ -z "${TK_VERSION}" ]; then
           70  +		TK_VERSION="unknown"
           71  +	fi
           72  +	export TK_VERSION
           73  +
           74  +	echo "Note: TCL_VERSION=\"${TCL_VERSION}\""
           75  +	echo "Note: TK_VERSION=\"${TK_VERSION}\""
           76  +
           77  +	(
           78  +		# Apply required patches
           79  +		cd "${BUILDDIR}" || exit 1
           80  +		for patch in "${PATCHDIR}/all"/tk-${TK_VERSION}-*.diff "${PATCHDIR}/${TCL_VERSION}"/tk-${TK_VERSION}-*.diff; do
           81  +			if [ ! -f "${patch}" ]; then
           82  +				continue
           83  +			fi
           84  +
           85  +			echo "Applying: ${patch}"
           86  +			${PATCH:-patch} -p1 < "${patch}"
           87  +		done
           88  +	)
           89  +
    57     90   	for dir in unix win macosx win64 __fail__; do
    58     91   		if [ "${dir}" = "__fail__" ]; then
    59     92   			exit 1
    60     93   		fi
    61     94   
    62     95   		# Windows/amd64 workarounds
    63     96   		win64="0"

Added tk/patches/8.4/tk-8.4-removemousewheel.diff version [9b577b61e0].

            1  +diff -uNr tk8.4.19.orig/library/listbox.tcl tk8.4.19-1rsk/library/listbox.tcl
            2  +--- tk8.4.19.orig/library/listbox.tcl	2006-01-25 12:21:41.000000000 -0600
            3  ++++ tk8.4.19-1rsk/library/listbox.tcl	2010-09-18 16:18:34.000000000 -0500
            4  +@@ -191,10 +191,6 @@
            5  +     bind Listbox <Shift-Option-MouseWheel> {
            6  +         %W xview scroll [expr {-10 * (%D)}] units
            7  +     }
            8  +-} else {
            9  +-    bind Listbox <MouseWheel> {
           10  +-        %W yview scroll [expr {- (%D / 120) * 4}] units
           11  +-    }
           12  + }
           13  + 
           14  + if {"x11" eq [tk windowingsystem]} {
           15  +diff -uNr tk8.4.19.orig/library/text.tcl tk8.4.19-1rsk/library/text.tcl
           16  +--- tk8.4.19.orig/library/text.tcl	2006-09-10 12:07:36.000000000 -0500
           17  ++++ tk8.4.19-1rsk/library/text.tcl	2010-09-18 16:18:30.000000000 -0500
           18  +@@ -467,10 +467,6 @@
           19  +     bind Text <Shift-Option-MouseWheel> {
           20  +         %W xview scroll [expr {-10 * (%D)}] units
           21  +     }
           22  +-} else {
           23  +-    bind Text <MouseWheel> {
           24  +-        %W yview scroll [expr {- (%D / 120) * 4}] units
           25  +-    }
           26  + }
           27  + 
           28  + if {"x11" eq [tk windowingsystem]} {