[Pkg-tcltk-commits] r294 - tk8.3/trunk/debian/patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Thu Oct 18 16:25:15 UTC 2007
Author: sgolovan-guest
Date: 2007-10-18 16:25:14 +0000 (Thu, 18 Oct 2007)
New Revision: 294
Modified:
tk8.3/trunk/debian/patches/CVE-2007-5137.diff
tk8.3/trunk/debian/patches/CVE-2007-5378.diff
tk8.3/trunk/debian/patches/canvpoly.diff
tk8.3/trunk/debian/patches/colors.diff
tk8.3/trunk/debian/patches/fonts.diff
tk8.3/trunk/debian/patches/m4quote.diff
tk8.3/trunk/debian/patches/m4typo.diff
tk8.3/trunk/debian/patches/manpages.diff
tk8.3/trunk/debian/patches/non-linux.diff
tk8.3/trunk/debian/patches/pkgindex.diff
tk8.3/trunk/debian/patches/ps-ml.diff
tk8.3/trunk/debian/patches/rpath.diff
tk8.3/trunk/debian/patches/scalable-fonts.diff
tk8.3/trunk/debian/patches/tkinc.diff
tk8.3/trunk/debian/patches/xincludes.diff
Log:
[tk8.3]
Refreshed patches.
Modified: tk8.3/trunk/debian/patches/CVE-2007-5137.diff
===================================================================
--- tk8.3/trunk/debian/patches/CVE-2007-5137.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/CVE-2007-5137.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -3,8 +3,8 @@
Index: tk8.3-8.3.5/generic/tkImgGIF.c
===================================================================
---- tk8.3-8.3.5.orig/generic/tkImgGIF.c
-+++ tk8.3-8.3.5/generic/tkImgGIF.c
+--- tk8.3-8.3.5.orig/generic/tkImgGIF.c 2002-03-26 05:29:01.000000000 +0300
++++ tk8.3-8.3.5/generic/tkImgGIF.c 2007-10-18 20:23:40.000000000 +0400
@@ -960,7 +960,7 @@
/* If interlacing, the next ypos is not just +1 */
if (interlace) {
Modified: tk8.3/trunk/debian/patches/CVE-2007-5378.diff
===================================================================
--- tk8.3/trunk/debian/patches/CVE-2007-5378.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/CVE-2007-5378.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -3,8 +3,8 @@
Index: tk8.3-8.3.5/generic/tkImgGIF.c
===================================================================
---- tk8.3-8.3.5.orig/generic/tkImgGIF.c
-+++ tk8.3-8.3.5/generic/tkImgGIF.c
+--- tk8.3-8.3.5.orig/generic/tkImgGIF.c 2007-10-18 20:23:40.000000000 +0400
++++ tk8.3-8.3.5/generic/tkImgGIF.c 2007-10-18 20:23:46.000000000 +0400
@@ -240,7 +240,7 @@
int srcX, srcY; /* Coordinates of top-left pixel to be used
* in image being read. */
Modified: tk8.3/trunk/debian/patches/canvpoly.diff
===================================================================
--- tk8.3/trunk/debian/patches/canvpoly.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/canvpoly.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -1,10 +1,10 @@
Patch by upstream fixes segfaults with postscript dump of canvas polygons
(see bug #192302).
-Index: tk8.3-8.3.5-8/generic/tkCanvPoly.c
+Index: tk8.3-8.3.5/generic/tkCanvPoly.c
===================================================================
---- tk8.3-8.3.5-8.orig/generic/tkCanvPoly.c 2001-08-25 03:59:11.000000000 +0400
-+++ tk8.3-8.3.5-8/generic/tkCanvPoly.c 2007-09-16 01:56:48.000000000 +0400
+--- tk8.3-8.3.5.orig/generic/tkCanvPoly.c 2001-08-25 03:59:11.000000000 +0400
++++ tk8.3-8.3.5/generic/tkCanvPoly.c 2007-10-18 20:23:53.000000000 +0400
@@ -1852,6 +1852,9 @@
}
if (polyPtr->numPoints==2) {
Modified: tk8.3/trunk/debian/patches/colors.diff
===================================================================
--- tk8.3/trunk/debian/patches/colors.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/colors.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -1,9 +1,9 @@
Patch by Ulrich Doehner fixes colors(3tk) manual page (see bug #182540).
-Index: tk8.3-8.3.5-8/doc/colors.n
+Index: tk8.3-8.3.5/doc/colors.n
===================================================================
---- tk8.3-8.3.5-8.orig/doc/colors.n 2000-07-01 00:33:44.000000000 +0400
-+++ tk8.3-8.3.5-8/doc/colors.n 2007-09-16 01:56:58.000000000 +0400
+--- tk8.3-8.3.5.orig/doc/colors.n 2000-07-01 00:33:44.000000000 +0400
++++ tk8.3-8.3.5/doc/colors.n 2007-10-18 20:23:59.000000000 +0400
@@ -18,189 +18,189 @@
specifying colors. The symbolic names recognized by Tk and their
8-bit RGB values are:
Modified: tk8.3/trunk/debian/patches/fonts.diff
===================================================================
--- tk8.3/trunk/debian/patches/fonts.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/fonts.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -2,10 +2,10 @@
Massimo Dal Zotto changes the font selection algorithm to prefer the first
best-match, not the last (see bug #156118).
-Index: tk8.3-8.3.5-8/unix/tkUnixFont.c
+Index: tk8.3-8.3.5/unix/tkUnixFont.c
===================================================================
---- tk8.3-8.3.5-8.orig/unix/tkUnixFont.c 2002-10-18 03:38:21.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/tkUnixFont.c 2007-09-16 02:04:20.000000000 +0400
+--- tk8.3-8.3.5.orig/unix/tkUnixFont.c 2002-10-18 03:38:21.000000000 +0400
++++ tk8.3-8.3.5/unix/tkUnixFont.c 2007-10-18 20:23:48.000000000 +0400
@@ -176,7 +176,7 @@
*/
Modified: tk8.3/trunk/debian/patches/m4quote.diff
===================================================================
--- tk8.3/trunk/debian/patches/m4quote.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/m4quote.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -1,10 +1,10 @@
Patch by Sergei Golovan fixes unerquoted definitions in tcl.m4 (see
bug #357365).
-Index: tcl8.3-8.3.5/unix/tcl.m4
+Index: tk8.3-8.3.5/unix/tcl.m4
===================================================================
---- tcl8.3-8.3.5.orig/unix/tcl.m4
-+++ tcl8.3-8.3.5/unix/tcl.m4
+--- tk8.3-8.3.5.orig/unix/tcl.m4 2002-10-23 21:45:50.000000000 +0400
++++ tk8.3-8.3.5/unix/tcl.m4 2007-10-18 20:24:05.000000000 +0400
@@ -17,7 +17,7 @@
# the tclConfig.sh file
#------------------------------------------------------------------------
Modified: tk8.3/trunk/debian/patches/m4typo.diff
===================================================================
--- tk8.3/trunk/debian/patches/m4typo.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/m4typo.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -1,10 +1,10 @@
Patch by Chris Waters fixes typo in tcl.m4. The bug is triggered by
using bash 3.
-Index: tk8.3-8.3.5-8/unix/configure
+Index: tk8.3-8.3.5/unix/configure
===================================================================
---- tk8.3-8.3.5-8.orig/unix/configure 2007-09-16 02:22:02.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/configure 2007-09-16 02:22:05.000000000 +0400
+--- tk8.3-8.3.5.orig/unix/configure 2007-10-18 20:24:08.000000000 +0400
++++ tk8.3-8.3.5/unix/configure 2007-10-18 20:24:11.000000000 +0400
@@ -1763,7 +1763,7 @@
# results, and the version is kept in special file).
@@ -14,10 +14,10 @@
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
-Index: tk8.3-8.3.5-8/unix/tcl.m4
+Index: tk8.3-8.3.5/unix/tcl.m4
===================================================================
---- tk8.3-8.3.5-8.orig/unix/tcl.m4 2007-09-16 02:22:02.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/tcl.m4 2007-09-16 02:22:05.000000000 +0400
+--- tk8.3-8.3.5.orig/unix/tcl.m4 2007-10-18 20:24:08.000000000 +0400
++++ tk8.3-8.3.5/unix/tcl.m4 2007-10-18 20:24:11.000000000 +0400
@@ -633,7 +633,7 @@
# results, and the version is kept in special file).
Modified: tk8.3/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.3/trunk/debian/patches/manpages.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/manpages.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -1,10 +1,10 @@
Patch by Mike Markley uses symlinks instead of hardlinks when installing
manual pages.
-Index: tk8.3-8.3.5-8/unix/mkLinks
+Index: tk8.3-8.3.5/unix/mkLinks
===================================================================
---- tk8.3-8.3.5-8.orig/unix/mkLinks 2002-10-23 21:45:51.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/mkLinks 2007-09-16 02:00:53.000000000 +0400
+--- tk8.3-8.3.5.orig/unix/mkLinks 2002-10-23 21:45:51.000000000 +0400
++++ tk8.3-8.3.5/unix/mkLinks 2007-10-18 20:24:21.000000000 +0400
@@ -20,6 +20,11 @@
exit 1
fi
Modified: tk8.3/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.3/trunk/debian/patches/non-linux.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/non-linux.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -1,11 +1,11 @@
Patch by Sergei Golovan (initially by Mike Markley abd Chris Waters) fixes
build on non-linux Debian architectures.
-Index: tk8.3-8.3.5-8/unix/configure
+Index: tk8.3-8.3.5/unix/configure
===================================================================
---- tk8.3-8.3.5-8.orig/unix/configure 2007-09-16 02:00:36.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/configure 2007-09-16 02:00:45.000000000 +0400
-@@ -1768,6 +1768,9 @@
+--- tk8.3-8.3.5.orig/unix/configure 2007-10-18 20:24:15.000000000 +0400
++++ tk8.3-8.3.5/unix/configure 2007-10-18 20:24:18.000000000 +0400
+@@ -1769,6 +1769,9 @@
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
fi
@@ -15,7 +15,7 @@
echo "$ac_t""$system" 1>&6
fi
fi
-@@ -2259,7 +2262,7 @@
+@@ -2260,7 +2263,7 @@
fi
fi
;;
@@ -24,11 +24,11 @@
SHLIB_CFLAGS="-fPIC"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
-Index: tk8.3-8.3.5-8/unix/tcl.m4
+Index: tk8.3-8.3.5/unix/tcl.m4
===================================================================
---- tk8.3-8.3.5-8.orig/unix/tcl.m4 2007-09-16 02:00:36.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/tcl.m4 2007-09-16 02:00:45.000000000 +0400
-@@ -641,6 +641,9 @@
+--- tk8.3-8.3.5.orig/unix/tcl.m4 2007-10-18 20:24:15.000000000 +0400
++++ tk8.3-8.3.5/unix/tcl.m4 2007-10-18 20:24:18.000000000 +0400
+@@ -640,6 +640,9 @@
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
fi
@@ -38,7 +38,7 @@
AC_MSG_RESULT($system)
fi
fi
-@@ -940,7 +943,7 @@
+@@ -939,7 +942,7 @@
fi
fi
;;
Modified: tk8.3/trunk/debian/patches/pkgindex.diff
===================================================================
--- tk8.3/trunk/debian/patches/pkgindex.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/pkgindex.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -1,9 +1,9 @@
Patch by Mike Markley adds pkgIndex.tcl for Tk.
-Index: tk8.3-8.3.5-8/unix/configure
+Index: tk8.3-8.3.5/unix/configure
===================================================================
---- tk8.3-8.3.5-8.orig/unix/configure 2007-09-16 02:07:02.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/configure 2007-09-16 02:21:49.000000000 +0400
+--- tk8.3-8.3.5.orig/unix/configure 2002-10-23 21:45:50.000000000 +0400
++++ tk8.3-8.3.5/unix/configure 2007-10-18 20:24:02.000000000 +0400
@@ -5012,7 +5012,7 @@
ac_given_srcdir=$srcdir
@@ -22,20 +22,20 @@
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-Index: tk8.3-8.3.5-8/unix/configure.in
+Index: tk8.3-8.3.5/unix/configure.in
===================================================================
---- tk8.3-8.3.5-8.orig/unix/configure.in 2007-09-16 02:07:02.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/configure.in 2007-09-16 02:21:49.000000000 +0400
+--- tk8.3-8.3.5.orig/unix/configure.in 2002-10-23 21:45:50.000000000 +0400
++++ tk8.3-8.3.5/unix/configure.in 2007-10-18 20:24:02.000000000 +0400
@@ -471,4 +471,4 @@
AC_SUBST(XLIBSW)
AC_SUBST(TK_SHARED_BUILD)
-AC_OUTPUT(Makefile tkConfig.sh)
+AC_OUTPUT(Makefile tkConfig.sh pkgIndex.tcl pkgIndex.tk)
-Index: tk8.3-8.3.5-8/unix/pkgIndex.tcl
+Index: tk8.3-8.3.5/unix/pkgIndex.tcl
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tk8.3-8.3.5-8/unix/pkgIndex.tcl 2007-09-16 02:21:49.000000000 +0400
++++ tk8.3-8.3.5/unix/pkgIndex.tcl 2007-10-18 20:24:02.000000000 +0400
@@ -0,0 +1,7 @@
+# Tcl package index file, version 1.0
+
@@ -44,10 +44,10 @@
+ [list [list Tksquare[info sharedlibextension] load square]]]
+package ifneeded Tktest 8.3 [list tclPkgSetup $dir Tktest 8.3\
+ [list [list Tktest[info sharedlibextension] load {testclipboard testcbind testdeleteapps testembed testmakeexist testmenubar testmetrics testprop testsend}]]]
-Index: tk8.3-8.3.5-8/unix/pkgIndex.tcl.in
+Index: tk8.3-8.3.5/unix/pkgIndex.tcl.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tk8.3-8.3.5-8/unix/pkgIndex.tcl.in 2007-09-16 02:21:49.000000000 +0400
++++ tk8.3-8.3.5/unix/pkgIndex.tcl.in 2007-10-18 20:24:02.000000000 +0400
@@ -0,0 +1,7 @@
+# Tcl package index file, version 1.0
+
@@ -56,20 +56,20 @@
+ [list [list Tksquare[info sharedlibextension] load square]]]
+package ifneeded Tktest @TK_VERSION@ [list tclPkgSetup $dir Tktest @TK_VERSION@\
+ [list [list Tktest[info sharedlibextension] load {testclipboard testcbind testdeleteapps testembed testmakeexist testmenubar testmetrics testprop testsend}]]]
-Index: tk8.3-8.3.5-8/unix/pkgIndex.tk
+Index: tk8.3-8.3.5/unix/pkgIndex.tk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tk8.3-8.3.5-8/unix/pkgIndex.tk 2007-09-16 02:21:49.000000000 +0400
++++ tk8.3-8.3.5/unix/pkgIndex.tk 2007-10-18 20:24:02.000000000 +0400
@@ -0,0 +1,5 @@
+# Tcl package index file, version 1.0
+
+if {[package vcompare [info tclversion] 8.3] < 0} return
+
+package ifneeded Tk 8.3 {load /usr/lib/libtk8.3.so.1 Tk}
-Index: tk8.3-8.3.5-8/unix/pkgIndex.tk.in
+Index: tk8.3-8.3.5/unix/pkgIndex.tk.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tk8.3-8.3.5-8/unix/pkgIndex.tk.in 2007-09-16 02:21:49.000000000 +0400
++++ tk8.3-8.3.5/unix/pkgIndex.tk.in 2007-10-18 20:24:02.000000000 +0400
@@ -0,0 +1,5 @@
+# Tcl package index file, version 1.0
+
Modified: tk8.3/trunk/debian/patches/ps-ml.diff
===================================================================
--- tk8.3/trunk/debian/patches/ps-ml.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/ps-ml.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -8,11 +8,11 @@
now (when 8.4 was released five years ago), but the patch is cheap and clear,
so, let it apply.
-Index: tk8.3-8.3.3/generic/tkCanvPs.c
+Index: tk8.3-8.3.5/generic/tkCanvPs.c
===================================================================
---- tk8.3-8.3.3.orig/generic/tkCanvPs.c
-+++ tk8.3-8.3.3/generic/tkCanvPs.c
-@@ -147,69 +147,47 @@
+--- tk8.3-8.3.5.orig/generic/tkCanvPs.c 2002-10-11 01:02:08.000000000 +0400
++++ tk8.3-8.3.5/generic/tkCanvPs.c 2007-10-18 20:23:56.000000000 +0400
+@@ -161,69 +161,47 @@
/yoffset 0 def\n\
/tmpstip null def\n\
\n\
@@ -113,7 +113,7 @@
currentdict\n\
end\n\
\n\
-@@ -360,7 +338,7 @@
+@@ -374,7 +352,7 @@
\n\
/lineLength 0 def\n\
strings {\n\
@@ -122,7 +122,7 @@
dup lineLength gt {/lineLength exch def}",
/* End of part 4 */
-@@ -395,10 +373,10 @@
+@@ -409,10 +387,10 @@
% display it.\n\
\n\
strings {\n\
@@ -135,7 +135,7 @@
% The text is stippled, so turn it into a path and print\n\
% by calling StippledText, which in turn calls StippleFill.\n\
% Unfortunately, many Postscript interpreters will get\n\
-@@ -408,16 +386,30 @@
+@@ -422,16 +400,30 @@
gsave\n\
/char (X) def\n\
{\n\
@@ -175,7 +175,7 @@
0 spacing neg translate\n\
} forall\n\
} bind def\n\
-@@ -470,7 +462,7 @@
+@@ -484,7 +476,7 @@
int result;
Tk_Item *itemPtr;
#define STRING_LENGTH 400
@@ -184,7 +184,7 @@
time_t now;
size_t length;
Tk_Window tkwin = canvasPtr->tkwin;
-@@ -715,7 +707,17 @@
+@@ -729,7 +721,17 @@
* Generate the header and prolog for the Postscript.
*--------------------------------------------------------
*/
@@ -203,7 +203,7 @@
if (psInfo.prolog) {
Tcl_AppendResult(interp, "%!PS-Adobe-3.0 EPSF-3.0\n",
"%%Creator: Tk Canvas Widget\n", (char *) NULL);
-@@ -764,7 +766,11 @@
+@@ -778,7 +780,11 @@
p = "%%+ font ";
}
Tcl_AppendResult(interp, "%%EndComments\n\n", (char *) NULL);
@@ -216,10 +216,10 @@
/*
* Insert the prolog
*/
-Index: tk8.3-8.3.3/generic/tkFont.c
+Index: tk8.3-8.3.5/generic/tkFont.c
===================================================================
---- tk8.3-8.3.3.orig/generic/tkFont.c Mon Apr 22 02:07:42 2002
-+++ tk8.3-8.3.3/generic/tkFont.c Mon Apr 22 02:12:41 2002
+--- tk8.3-8.3.5.orig/generic/tkFont.c 2007-10-18 20:23:50.000000000 +0400
++++ tk8.3-8.3.5/generic/tkFont.c 2007-10-18 20:23:56.000000000 +0400
@@ -2729,22 +2729,32 @@
Tk_TextLayout layout; /* The layout to be rendered. */
{
@@ -258,6 +258,21 @@
* data and display the lower byte. Eventually this should
* be revised to handle international postscript fonts.
*/
+-
+- p += Tcl_UtfToUniChar(p, &ch);
+- c = UCHAR(ch & 0xff);
+- if ((c == '(') || (c == ')') || (c == '\\') || (c < 0x20)
+- || (c >= UCHAR(0x7f))) {
+- /*
+- * Tricky point: the "03" is necessary in the sprintf
+- * below, so that a full three digits of octal are
+- * always generated. Without the "03", a number
+- * following this sequence could be interpreted by
+- * Postscript as part of this sequence.
+- */
+-
+- sprintf(buf + used, "\\%03o", c);
+- used += 4;
+ q=p; p +=(charsize= Tcl_UtfToUniChar(p,&ch));
+ Tcl_UtfToExternal(interp,NULL,q,charsize,0,NULL,one_char,4,
+ NULL,&bytecount,NULL);
@@ -273,21 +288,7 @@
+ * following this sequence could be interpreted by
+ * Postscript as part of this sequence.
+ */
-
-- p += Tcl_UtfToUniChar(p, &ch);
-- c = UCHAR(ch & 0xff);
-- if ((c == '(') || (c == ')') || (c == '\\') || (c < 0x20)
-- || (c >= UCHAR(0x7f))) {
-- /*
-- * Tricky point: the "03" is necessary in the sprintf
-- * below, so that a full three digits of octal are
-- * always generated. Without the "03", a number
-- * following this sequence could be interpreted by
-- * Postscript as part of this sequence.
-- */
--
-- sprintf(buf + used, "\\%03o", c);
-- used += 4;
++
+ sprintf(buf + used, "\\%03o", c);
+ used += 4;
+ } else {
@@ -320,10 +321,10 @@
buf[used++] = '\n';
buf[used] = '\0';
Tcl_AppendResult(interp, buf, (char *) NULL);
-Index: tk8.3-8.3.3/library/mkpsenc.tcl
+Index: tk8.3-8.3.5/library/mkpsenc.tcl
===================================================================
---- tk8.3-8.3.3.orig/library/mkpsenc.tcl Thu Jan 1 03:00:00 1970
-+++ tk8.3-8.3.3/library/mkpsenc.tcl Mon Apr 22 02:08:12 2002
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ tk8.3-8.3.5/library/mkpsenc.tcl 2007-10-18 20:23:56.000000000 +0400
@@ -0,0 +1,1083 @@
+#
+# mkPsEnc.tcl
@@ -1408,10 +1409,10 @@
+ FB4B afii57700
+}
+}
-Index: tk8.3-8.3.3/library/tclIndex
+Index: tk8.3-8.3.5/library/tclIndex
===================================================================
---- tk8.3-8.3.3.orig/library/tclIndex
-+++ tk8.3-8.3.3/library/tclIndex
+--- tk8.3-8.3.5.orig/library/tclIndex 2000-03-24 22:38:57.000000000 +0300
++++ tk8.3-8.3.5/library/tclIndex 2007-10-18 20:23:56.000000000 +0400
@@ -74,6 +74,7 @@
set auto_index(tk_menuSetFocus) [list source [file join $dir menu.tcl]]
set auto_index(tkGenerateMenuSelect) [list source [file join $dir menu.tcl]]
Modified: tk8.3/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.3/trunk/debian/patches/rpath.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/rpath.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -1,11 +1,11 @@
Patch by Chris Waters removes -rpath from search flags and adds -soname
to library build options.
-Index: tk8.3-8.3.5-8/unix/configure
+Index: tk8.3-8.3.5/unix/configure
===================================================================
---- tk8.3-8.3.5-8.orig/unix/configure 2007-09-16 02:22:07.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/configure 2007-09-16 02:22:13.000000000 +0400
-@@ -2275,7 +2275,7 @@
+--- tk8.3-8.3.5.orig/unix/configure 2007-10-18 20:24:13.000000000 +0400
++++ tk8.3-8.3.5/unix/configure 2007-10-18 20:24:15.000000000 +0400
+@@ -2276,7 +2276,7 @@
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
LDFLAGS="-rdynamic"
@@ -14,7 +14,7 @@
else
ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dld.h""... $ac_c" 1>&6
-@@ -4777,7 +4777,7 @@
+@@ -4778,7 +4778,7 @@
if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
@@ -23,10 +23,10 @@
RANLIB=":"
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
-Index: tk8.3-8.3.5-8/unix/configure.in
+Index: tk8.3-8.3.5/unix/configure.in
===================================================================
---- tk8.3-8.3.5-8.orig/unix/configure.in 2007-09-16 02:21:49.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/configure.in 2007-09-16 02:22:13.000000000 +0400
+--- tk8.3-8.3.5.orig/unix/configure.in 2007-10-18 20:24:13.000000000 +0400
++++ tk8.3-8.3.5/unix/configure.in 2007-10-18 20:24:15.000000000 +0400
@@ -348,7 +348,7 @@
if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
@@ -36,11 +36,11 @@
RANLIB=":"
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
-Index: tk8.3-8.3.5-8/unix/tcl.m4
+Index: tk8.3-8.3.5/unix/tcl.m4
===================================================================
---- tk8.3-8.3.5-8.orig/unix/tcl.m4 2007-09-16 02:22:07.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/tcl.m4 2007-09-16 02:22:13.000000000 +0400
-@@ -956,7 +956,7 @@
+--- tk8.3-8.3.5.orig/unix/tcl.m4 2007-10-18 20:24:13.000000000 +0400
++++ tk8.3-8.3.5/unix/tcl.m4 2007-10-18 20:24:15.000000000 +0400
+@@ -955,7 +955,7 @@
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
LDFLAGS="-rdynamic"
Modified: tk8.3/trunk/debian/patches/scalable-fonts.diff
===================================================================
--- tk8.3/trunk/debian/patches/scalable-fonts.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/scalable-fonts.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -11,8 +11,8 @@
Index: tk8.3-8.3.5/generic/tkFont.c
===================================================================
---- tk8.3-8.3.5.orig/generic/tkFont.c
-+++ tk8.3-8.3.5/generic/tkFont.c
+--- tk8.3-8.3.5.orig/generic/tkFont.c 2000-02-04 00:27:26.000000000 +0300
++++ tk8.3-8.3.5/generic/tkFont.c 2007-10-18 20:23:50.000000000 +0400
@@ -3395,8 +3395,15 @@
/* XLFD_SPACING ignored. */
@@ -31,11 +31,11 @@
if (FieldSpecified(field[XLFD_CHARSET])) {
xaPtr->charset = Tk_GetUid(field[XLFD_CHARSET]);
} else {
-Index: tk8.3/unix/tkUnixFont.c
+Index: tk8.3-8.3.5/unix/tkUnixFont.c
===================================================================
---- tk8.3.orig/unix/tkUnixFont.c
-+++ tk8.3/unix/tkUnixFont.c
-@@ -2660,6 +2660,9 @@
+--- tk8.3-8.3.5.orig/unix/tkUnixFont.c 2007-10-18 20:23:48.000000000 +0400
++++ tk8.3-8.3.5/unix/tkUnixFont.c 2007-10-18 20:23:50.000000000 +0400
+@@ -2547,6 +2547,9 @@
bestScore[1] = INT_MAX;
}
if (fontStructPtr == NULL) {
Modified: tk8.3/trunk/debian/patches/tkinc.diff
===================================================================
--- tk8.3/trunk/debian/patches/tkinc.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/tkinc.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -7,10 +7,10 @@
Also, it allows to find tclConfig.sh in /usr/share/tcltk/tcl8.3 and tkConfig.sh
in /usr/share/tcltk/tk8.3 where they are located in Debian installation.
-Index: tk8.3-8.3.5-8/unix/configure
+Index: tk8.3-8.3.5/unix/configure
===================================================================
---- tk8.3-8.3.5-8.orig/unix/configure 2007-09-16 02:22:05.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/configure 2007-09-16 02:22:07.000000000 +0400
+--- tk8.3-8.3.5.orig/unix/configure 2007-10-18 20:24:11.000000000 +0400
++++ tk8.3-8.3.5/unix/configure 2007-10-18 20:24:13.000000000 +0400
@@ -1612,6 +1612,7 @@
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
@@ -37,10 +37,10 @@
s%@TK_SRC_DIR@%$TK_SRC_DIR%g
s%@XINCLUDES@%$XINCLUDES%g
s%@XLIBSW@%$XLIBSW%g
-Index: tk8.3-8.3.5-8/unix/configure.in
+Index: tk8.3-8.3.5/unix/configure.in
===================================================================
---- tk8.3-8.3.5-8.orig/unix/configure.in 2007-09-16 02:22:05.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/configure.in 2007-09-16 02:22:07.000000000 +0400
+--- tk8.3-8.3.5.orig/unix/configure.in 2007-10-18 20:24:02.000000000 +0400
++++ tk8.3-8.3.5/unix/configure.in 2007-10-18 20:24:13.000000000 +0400
@@ -417,6 +417,9 @@
TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}"
TK_STUB_LIB_PATH="${libdir}/${TK_STUB_LIB_FILE}"
@@ -59,11 +59,11 @@
AC_SUBST(TK_SRC_DIR)
AC_SUBST(XINCLUDES)
AC_SUBST(XLIBSW)
-Index: tk8.3-8.3.5-8/unix/tkConfig.sh.in
+Index: tk8.3-8.3.5/unix/tkConfig.sh.in
===================================================================
---- tk8.3-8.3.5-8.orig/unix/tkConfig.sh.in 2007-09-16 02:07:02.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/tkConfig.sh.in 2007-09-16 02:22:07.000000000 +0400
-@@ -53,12 +53,16 @@
+--- tk8.3-8.3.5.orig/unix/tkConfig.sh.in 2002-10-23 21:45:50.000000000 +0400
++++ tk8.3-8.3.5/unix/tkConfig.sh.in 2007-10-18 20:24:13.000000000 +0400
+@@ -53,19 +53,23 @@
# String to pass to linker to pick up the Tk library from its
# build directory.
@@ -81,7 +81,6 @@
# Location of the top-level source directory from which Tk was built.
# This is the directory that contains a README file as well as
# subdirectories such as generic, unix, etc. If Tk was compiled in a
-@@ -65,7 +69,7 @@
# different place than the directory containing the source files, this
# points to the location of the sources, not the location where Tk was
# compiled.
@@ -107,10 +106,10 @@
# Path to the Tk stub library in the install directory.
TK_STUB_LIB_PATH='@TK_STUB_LIB_PATH@'
-Index: tk8.3-8.3.5-8/unix/tcl.m4
+Index: tk8.3-8.3.5/unix/tcl.m4
===================================================================
---- tk8.3-8.3.5-8.orig/unix/tcl.m4 2007-09-16 02:22:05.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/tcl.m4 2007-09-16 02:22:07.000000000 +0400
+--- tk8.3-8.3.5.orig/unix/tcl.m4 2007-10-18 20:24:11.000000000 +0400
++++ tk8.3-8.3.5/unix/tcl.m4 2007-10-18 20:24:13.000000000 +0400
@@ -62,6 +62,7 @@
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
Modified: tk8.3/trunk/debian/patches/xincludes.diff
===================================================================
--- tk8.3/trunk/debian/patches/xincludes.diff 2007-10-18 16:20:40 UTC (rev 293)
+++ tk8.3/trunk/debian/patches/xincludes.diff 2007-10-18 16:25:14 UTC (rev 294)
@@ -1,10 +1,10 @@
Patch by Sergei Golovan fixed TK_XINCLUDES definition (sets it to an empty
string instead of a comment, see bug #357808).
-Index: tk8.3-8.3.5-8/unix/configure
+Index: tk8.3-8.3.5/unix/configure
===================================================================
---- tk8.3-8.3.5-8.orig/unix/configure 2007-09-16 02:21:49.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/configure 2007-09-16 02:22:02.000000000 +0400
+--- tk8.3-8.3.5.orig/unix/configure 2007-10-18 20:24:02.000000000 +0400
++++ tk8.3-8.3.5/unix/configure 2007-10-18 20:24:08.000000000 +0400
@@ -3980,7 +3980,7 @@
if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
echo $ac_n "checking for X11 header files""... $ac_c" 1>&6
@@ -23,10 +23,10 @@
fi
fi
if test "$XINCLUDES" = nope; then
-Index: tk8.3-8.3.5-8/unix/tcl.m4
+Index: tk8.3-8.3.5/unix/tcl.m4
===================================================================
---- tk8.3-8.3.5-8.orig/unix/tcl.m4 2007-09-16 02:07:02.000000000 +0400
-+++ tk8.3-8.3.5-8/unix/tcl.m4 2007-09-16 02:22:02.000000000 +0400
+--- tk8.3-8.3.5.orig/unix/tcl.m4 2007-10-18 20:24:05.000000000 +0400
++++ tk8.3-8.3.5/unix/tcl.m4 2007-10-18 20:24:08.000000000 +0400
@@ -1759,7 +1759,7 @@
fi
if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
More information about the Pkg-tcltk-commits
mailing list