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
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
..
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
exit 1
fi
SRC="src/tk${TCLVERS}.tar.gz"
SRCURL="http://prdownloads.sourceforge.net/tcl/tk${TCLVERS}-src.tar.gz"
BUILDDIR="$(pwd)/build/tk${TCLVERS}"
OUTDIR="$(pwd)/out"
INSTDIR="$(pwd)/inst"
export SRC SRCURL BUILDDIR OUTDIR INSTDIR
rm -rf 'build' 'out' 'inst'
mkdir 'build' 'out' 'inst' || exit 1
if [ ! -f "${SRC}" ]; then
mkdir 'src' >/dev/null 2>/dev/null
if echo "${TCLVERS}" | grep '^cvs_' >/dev/null; then
CVSTAG=$(echo "${TCLVERS}" | sed 's/^cvs_//g')
export CVSTAG
................................................................................
if [ ! -d '../buildsrc' ]; then
gzip -dc "../${SRC}" | tar -xf -
else
cp -rp ../buildsrc/* './'
fi
cd "${BUILDDIR}" || exit 1
for dir in unix win macosx win64 __fail__; do
if [ "${dir}" = "__fail__" ]; then
exit 1
fi
# Windows/amd64 workarounds
win64="0"
|
>
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
..
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
exit 1 fi SRC="src/tk${TCLVERS}.tar.gz" SRCURL="http://prdownloads.sourceforge.net/tcl/tk${TCLVERS}-src.tar.gz" BUILDDIR="$(pwd)/build/tk${TCLVERS}" PATCHDIR="$(pwd)/patches" OUTDIR="$(pwd)/out" INSTDIR="$(pwd)/inst" export SRC SRCURL BUILDDIR PATCHDIR OUTDIR INSTDIR rm -rf 'build' 'out' 'inst' mkdir 'build' 'out' 'inst' || exit 1 # Determine Tcl version TCL_VERSION="unknown" if [ -f "${TCLCONFIGDIR}/tclConfig.sh" ]; then source "${TCLCONFIGDIR}/tclConfig.sh" fi export TCL_VERSION if [ ! -f "${SRC}" ]; then mkdir 'src' >/dev/null 2>/dev/null if echo "${TCLVERS}" | grep '^cvs_' >/dev/null; then CVSTAG=$(echo "${TCLVERS}" | sed 's/^cvs_//g') export CVSTAG ................................................................................ if [ ! -d '../buildsrc' ]; then gzip -dc "../${SRC}" | tar -xf - else cp -rp ../buildsrc/* './' fi cd "${BUILDDIR}" || exit 1 # Determine Tk version 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)" if [ -z "${TK_VERSION}" ]; then TK_VERSION="unknown" fi export TK_VERSION echo "Note: TCL_VERSION=\"${TCL_VERSION}\"" echo "Note: TK_VERSION=\"${TK_VERSION}\"" ( # Apply required patches cd "${BUILDDIR}" || exit 1 for patch in "${PATCHDIR}/all"/tk-${TK_VERSION}-*.diff "${PATCHDIR}/${TCL_VERSION}"/tk-${TK_VERSION}-*.diff; do if [ ! -f "${patch}" ]; then continue fi echo "Applying: ${patch}" ${PATCH:-patch} -p1 < "${patch}" done ) for dir in unix win macosx win64 __fail__; do if [ "${dir}" = "__fail__" ]; then exit 1 fi # Windows/amd64 workarounds win64="0" |
Added tk/patches/8.4/tk-8.4-removemousewheel.diff version [9b577b61e0].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
diff -uNr tk8.4.19.orig/library/listbox.tcl tk8.4.19-1rsk/library/listbox.tcl --- tk8.4.19.orig/library/listbox.tcl 2006-01-25 12:21:41.000000000 -0600 +++ tk8.4.19-1rsk/library/listbox.tcl 2010-09-18 16:18:34.000000000 -0500 @@ -191,10 +191,6 @@ bind Listbox <Shift-Option-MouseWheel> { %W xview scroll [expr {-10 * (%D)}] units } -} else { - bind Listbox <MouseWheel> { - %W yview scroll [expr {- (%D / 120) * 4}] units - } } if {"x11" eq [tk windowingsystem]} { diff -uNr tk8.4.19.orig/library/text.tcl tk8.4.19-1rsk/library/text.tcl --- tk8.4.19.orig/library/text.tcl 2006-09-10 12:07:36.000000000 -0500 +++ tk8.4.19-1rsk/library/text.tcl 2010-09-18 16:18:30.000000000 -0500 @@ -467,10 +467,6 @@ bind Text <Shift-Option-MouseWheel> { %W xview scroll [expr {-10 * (%D)}] units } -} else { - bind Text <MouseWheel> { - %W yview scroll [expr {- (%D / 120) * 4}] units - } } if {"x11" eq [tk windowingsystem]} { |