[Pkg-tcltk-commits] r296 - tk8.4/trunk/debian/patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Thu Oct 18 16:35:46 UTC 2007
Author: sgolovan-guest
Date: 2007-10-18 16:35:46 +0000 (Thu, 18 Oct 2007)
New Revision: 296
Modified:
tk8.4/trunk/debian/patches/manpages.diff
tk8.4/trunk/debian/patches/non-linux.diff
tk8.4/trunk/debian/patches/rpath.diff
tk8.4/trunk/debian/patches/scalable-fonts.diff
tk8.4/trunk/debian/patches/tkinc.diff
tk8.4/trunk/debian/patches/tklibrary.diff
Log:
[tk8.4]
Refreshed patches.
Modified: tk8.4/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.4/trunk/debian/patches/manpages.diff 2007-10-18 16:29:52 UTC (rev 295)
+++ tk8.4/trunk/debian/patches/manpages.diff 2007-10-18 16:35:46 UTC (rev 296)
@@ -5,7 +5,7 @@
Index: tk8.4-8.4.16/unix/installManPage
===================================================================
--- tk8.4-8.4.16.orig/unix/installManPage 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/installManPage 2007-09-21 23:30:02.000000000 +0400
++++ tk8.4-8.4.16/unix/installManPage 2007-10-18 20:34:33.000000000 +0400
@@ -49,7 +49,16 @@
}' $MANPAGE`
Modified: tk8.4/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.4/trunk/debian/patches/non-linux.diff 2007-10-18 16:29:52 UTC (rev 295)
+++ tk8.4/trunk/debian/patches/non-linux.diff 2007-10-18 16:35:46 UTC (rev 296)
@@ -3,9 +3,9 @@
Index: tk8.4-8.4.16/unix/configure
===================================================================
---- tk8.4-8.4.16.orig/unix/configure 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/configure 2007-09-21 23:29:35.000000000 +0400
-@@ -2001,6 +2001,9 @@
+--- tk8.4-8.4.16.orig/unix/configure 2007-10-18 20:34:29.000000000 +0400
++++ tk8.4-8.4.16/unix/configure 2007-10-18 20:34:31.000000000 +0400
+@@ -2002,6 +2002,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -15,7 +15,7 @@
fi
fi
-@@ -2556,7 +2559,7 @@
+@@ -2557,7 +2560,7 @@
fi
fi
;;
@@ -26,9 +26,9 @@
SHLIB_SUFFIX=".so"
Index: tk8.4-8.4.16/unix/tcl.m4
===================================================================
---- tk8.4-8.4.16.orig/unix/tcl.m4 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/tcl.m4 2007-09-21 23:29:35.000000000 +0400
-@@ -896,6 +899,9 @@
+--- tk8.4-8.4.16.orig/unix/tcl.m4 2007-10-18 20:34:29.000000000 +0400
++++ tk8.4-8.4.16/unix/tcl.m4 2007-10-18 20:34:31.000000000 +0400
+@@ -898,6 +898,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -38,7 +38,7 @@
fi
fi
])
-@@ -1333,7 +1336,7 @@
+@@ -1335,7 +1338,7 @@
fi
fi
;;
Modified: tk8.4/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.4/trunk/debian/patches/rpath.diff 2007-10-18 16:29:52 UTC (rev 295)
+++ tk8.4/trunk/debian/patches/rpath.diff 2007-10-18 16:35:46 UTC (rev 296)
@@ -5,9 +5,9 @@
Index: tk8.4-8.4.16/unix/configure
===================================================================
---- tk8.4-8.4.16.orig/unix/configure 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/configure 2007-09-21 23:29:35.000000000 +0400
-@@ -2567,12 +2570,15 @@
+--- tk8.4-8.4.16.orig/unix/configure 2007-10-18 20:34:27.000000000 +0400
++++ tk8.4-8.4.16/unix/configure 2007-10-18 20:34:29.000000000 +0400
+@@ -2568,12 +2568,15 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -27,7 +27,7 @@
Index: tk8.4-8.4.16/unix/Makefile.in
===================================================================
--- tk8.4-8.4.16.orig/unix/Makefile.in 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/Makefile.in 2007-09-21 23:29:35.000000000 +0400
++++ tk8.4-8.4.16/unix/Makefile.in 2007-10-18 20:34:29.000000000 +0400
@@ -635,7 +635,7 @@
relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
echo "if {[package vcompare [package provide Tcl] $(TCLVERSION)] != 0} { return }";\
@@ -39,9 +39,9 @@
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
Index: tk8.4-8.4.16/unix/tcl.m4
===================================================================
---- tk8.4-8.4.16.orig/unix/tcl.m4 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/tcl.m4 2007-09-21 23:29:35.000000000 +0400
-@@ -1344,20 +1350,23 @@
+--- tk8.4-8.4.16.orig/unix/tcl.m4 2007-10-18 20:34:27.000000000 +0400
++++ tk8.4-8.4.16/unix/tcl.m4 2007-10-18 20:34:29.000000000 +0400
+@@ -1346,20 +1346,23 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
Modified: tk8.4/trunk/debian/patches/scalable-fonts.diff
===================================================================
--- tk8.4/trunk/debian/patches/scalable-fonts.diff 2007-10-18 16:29:52 UTC (rev 295)
+++ tk8.4/trunk/debian/patches/scalable-fonts.diff 2007-10-18 16:35:46 UTC (rev 296)
@@ -9,11 +9,11 @@
when no non-scalable fonts are returned and chosen fixed font is infeasible
(this case was never triggered without tkFont.c patch).
-Index: tk8.4/generic/tkFont.c
+Index: tk8.4-8.4.16/generic/tkFont.c
===================================================================
---- tk8.4.orig/generic/tkFont.c
-+++ tk8.4/generic/tkFont.c
-@@ -3395,8 +3395,15 @@
+--- tk8.4-8.4.16.orig/generic/tkFont.c 2007-05-31 17:39:26.000000000 +0400
++++ tk8.4-8.4.16/generic/tkFont.c 2007-10-18 20:34:20.000000000 +0400
+@@ -3454,8 +3454,15 @@
/* XLFD_SPACING ignored. */
@@ -31,10 +31,10 @@
if (FieldSpecified(field[XLFD_CHARSET])) {
xaPtr->charset = Tk_GetUid(field[XLFD_CHARSET]);
} else {
-Index: tk8.4/unix/tkUnixFont.c
+Index: tk8.4-8.4.16/unix/tkUnixFont.c
===================================================================
---- tk8.4.orig/unix/tkUnixFont.c
-+++ tk8.4/unix/tkUnixFont.c
+--- tk8.4-8.4.16.orig/unix/tkUnixFont.c 2006-10-06 01:28:17.000000000 +0400
++++ tk8.4-8.4.16/unix/tkUnixFont.c 2007-10-18 20:34:20.000000000 +0400
@@ -2660,6 +2660,9 @@
bestScore[1] = INT_MAX;
}
Modified: tk8.4/trunk/debian/patches/tkinc.diff
===================================================================
--- tk8.4/trunk/debian/patches/tkinc.diff 2007-10-18 16:29:52 UTC (rev 295)
+++ tk8.4/trunk/debian/patches/tkinc.diff 2007-10-18 16:35:46 UTC (rev 296)
@@ -9,8 +9,8 @@
Index: tk8.4-8.4.16/unix/configure
===================================================================
---- tk8.4-8.4.16.orig/unix/configure 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/configure 2007-09-21 23:29:35.000000000 +0400
+--- tk8.4-8.4.16.orig/unix/configure 2007-10-18 20:34:25.000000000 +0400
++++ tk8.4-8.4.16/unix/configure 2007-10-18 20:34:27.000000000 +0400
@@ -641,6 +641,7 @@
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
@@ -22,7 +22,7 @@
Index: tk8.4-8.4.16/unix/tkConfig.sh.in
===================================================================
--- tk8.4-8.4.16.orig/unix/tkConfig.sh.in 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/tkConfig.sh.in 2007-09-21 23:29:54.000000000 +0400
++++ tk8.4-8.4.16/unix/tkConfig.sh.in 2007-10-18 20:34:27.000000000 +0400
@@ -53,7 +53,7 @@
# String to pass to linker to pick up the Tk library from its
@@ -61,7 +61,7 @@
Index: tk8.4-8.4.16/unix/tcl.m4
===================================================================
--- tk8.4-8.4.16.orig/unix/tcl.m4 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/tcl.m4 2007-09-21 23:29:35.000000000 +0400
++++ tk8.4-8.4.16/unix/tcl.m4 2007-10-18 20:34:27.000000000 +0400
@@ -84,6 +84,7 @@
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
Modified: tk8.4/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.4/trunk/debian/patches/tklibrary.diff 2007-10-18 16:29:52 UTC (rev 295)
+++ tk8.4/trunk/debian/patches/tklibrary.diff 2007-10-18 16:35:46 UTC (rev 296)
@@ -1,7 +1,7 @@
-Index: tk8.4/unix/configure
+Index: tk8.4-8.4.16/unix/configure
===================================================================
---- tk8.4.orig/unix/configure
-+++ tk8.4/unix/configure
+--- tk8.4-8.4.16.orig/unix/configure 2007-09-21 21:04:18.000000000 +0400
++++ tk8.4-8.4.16/unix/configure 2007-10-18 20:34:25.000000000 +0400
@@ -5858,7 +5858,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
@@ -11,10 +11,10 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)'
-Index: tk8.4/unix/configure.in
+Index: tk8.4-8.4.16/unix/configure.in
===================================================================
---- tk8.4.orig/unix/configure.in
-+++ tk8.4/unix/configure.in
+--- tk8.4-8.4.16.orig/unix/configure.in 2007-09-21 21:04:18.000000000 +0400
++++ tk8.4-8.4.16/unix/configure.in 2007-10-18 20:34:25.000000000 +0400
@@ -402,7 +402,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
More information about the Pkg-tcltk-commits
mailing list