[Pkg-tcltk-commits] r1662 - in tk8.6/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Wed Aug 27 16:25:53 UTC 2014
Author: sgolovan
Date: 2014-08-27 16:25:53 +0000 (Wed, 27 Aug 2014)
New Revision: 1662
Removed:
tk8.6/trunk/debian/patches/shutdown-crash.diff
Modified:
tk8.6/trunk/debian/changelog
tk8.6/trunk/debian/patches/confsearch.diff
tk8.6/trunk/debian/patches/manpages.diff
tk8.6/trunk/debian/patches/non-linux.diff
tk8.6/trunk/debian/patches/series
tk8.6/trunk/debian/patches/tklibrary.diff
tk8.6/trunk/debian/patches/tkprivate.diff
tk8.6/trunk/debian/patches/xft.diff
tk8.6/trunk/debian/rules
Log:
[tk8.6]
* New upstream release.
* Refreshed patches.
* Removed patch which fixed freeing fonts on exit because it has been
applied upstream.
Modified: tk8.6/trunk/debian/changelog
===================================================================
--- tk8.6/trunk/debian/changelog 2014-08-27 16:17:13 UTC (rev 1661)
+++ tk8.6/trunk/debian/changelog 2014-08-27 16:25:53 UTC (rev 1662)
@@ -1,8 +1,11 @@
-tk8.6 (8.6.1-7) UNRELEASED; urgency=medium
+tk8.6 (8.6.2-1) unstable; urgency=medium
- * NOT RELEASED YET
+ * New upstream release.
+ * Refreshed patches.
+ * Removed patch which fixed freeing fonts on exit because it has been
+ applied upstream.
- -- Sergei Golovan <sgolovan at debian.org> Fri, 18 Jul 2014 22:56:32 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 27 Aug 2014 20:25:29 +0400
tk8.6 (8.6.1-6) unstable; urgency=low
Modified: tk8.6/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.6/trunk/debian/patches/confsearch.diff 2014-08-27 16:17:13 UTC (rev 1661)
+++ tk8.6/trunk/debian/patches/confsearch.diff 2014-08-27 16:25:53 UTC (rev 1662)
@@ -2,8 +2,8 @@
and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
installation.
---- tk8.6-8.6.1.orig/unix/configure
-+++ tk8.6-8.6.1/unix/configure
+--- a/unix/configure
++++ b/unix/configure
@@ -1431,6 +1431,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
@@ -12,8 +12,8 @@
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
---- tk8.6-8.6.1.orig/unix/tcl.m4
-+++ tk8.6-8.6.1/unix/tcl.m4
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
@@ -93,6 +93,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
Modified: tk8.6/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.6/trunk/debian/patches/manpages.diff 2014-08-27 16:17:13 UTC (rev 1661)
+++ tk8.6/trunk/debian/patches/manpages.diff 2014-08-27 16:25:53 UTC (rev 1662)
@@ -2,8 +2,8 @@
aren't installed by upstream script but are referenced inside other
manual pages.
---- tk8.6-8.6.1.orig/unix/installManPage
-+++ tk8.6-8.6.1/unix/installManPage
+--- a/unix/installManPage
++++ b/unix/installManPage
@@ -92,12 +92,20 @@
exit 2 ;;
esac
Modified: tk8.6/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.6/trunk/debian/patches/non-linux.diff 2014-08-27 16:17:13 UTC (rev 1661)
+++ tk8.6/trunk/debian/patches/non-linux.diff 2014-08-27 16:25:53 UTC (rev 1662)
@@ -1,9 +1,9 @@
Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
building on non-linux Debian architectures.
---- tk8.6-8.6.1.orig/unix/configure
-+++ tk8.6-8.6.1/unix/configure
-@@ -4521,6 +4521,9 @@
+--- a/unix/configure
++++ b/unix/configure
+@@ -4447,6 +4447,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -13,9 +13,9 @@
fi
fi
---- tk8.6-8.6.1.orig/unix/tcl.m4
-+++ tk8.6-8.6.1/unix/tcl.m4
-@@ -928,6 +928,9 @@
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
+@@ -926,6 +926,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
Modified: tk8.6/trunk/debian/patches/series
===================================================================
--- tk8.6/trunk/debian/patches/series 2014-08-27 16:17:13 UTC (rev 1661)
+++ tk8.6/trunk/debian/patches/series 2014-08-27 16:25:53 UTC (rev 1662)
@@ -4,4 +4,3 @@
non-linux.diff
manpages.diff
xft.diff
-shutdown-crash.diff
Deleted: tk8.6/trunk/debian/patches/shutdown-crash.diff
===================================================================
--- tk8.6/trunk/debian/patches/shutdown-crash.diff 2014-08-27 16:17:13 UTC (rev 1661)
+++ tk8.6/trunk/debian/patches/shutdown-crash.diff 2014-08-27 16:25:53 UTC (rev 1662)
@@ -1,153 +0,0 @@
-Description: Fix crash on shutdown
-Bug: http://core.tcl.tk/tk/info/f214b8ad5b
-Origin: http://core.tcl.tk/tk/vpatch?from=8b40f8cacfa04130&to=9fc8df19b1c093ef
-
-Index: generic/tkFont.c
-==================================================================
---- x/generic/tkFont.c
-+++ x/generic/tkFont.c
-@@ -419,11 +419,11 @@
- searchPtr != NULL;
- searchPtr = Tcl_NextHashEntry(&search)) {
- fontsLeft++;
- #ifdef DEBUG_FONTS
- fprintf(stderr, "Font %s still in cache.\n",
-- Tcl_GetHashKey(&fiPtr->fontCache, searchPtr));
-+ (char *) Tcl_GetHashKey(&fiPtr->fontCache, searchPtr));
- #endif
- }
-
- #ifdef PURIFY
- if (fontsLeft) {
-@@ -1091,11 +1091,12 @@
- Tcl_HashEntry *cacheHashPtr, *namedHashPtr;
- TkFont *fontPtr, *firstFontPtr, *oldFontPtr;
- int isNew, descent;
- NamedFont *nfPtr;
-
-- if (objPtr->typePtr != &tkFontObjType) {
-+ if (objPtr->typePtr != &tkFontObjType
-+ || objPtr->internalRep.twoPtrValue.ptr2 != fiPtr) {
- SetFontFromAny(interp, objPtr);
- }
-
- oldFontPtr = objPtr->internalRep.twoPtrValue.ptr1;
- if (oldFontPtr != NULL) {
-@@ -1131,10 +1132,11 @@
- fontPtr = fontPtr->nextPtr) {
- if (Tk_Screen(tkwin) == fontPtr->screen) {
- fontPtr->resourceRefCount++;
- fontPtr->objRefCount++;
- objPtr->internalRep.twoPtrValue.ptr1 = fontPtr;
-+ objPtr->internalRep.twoPtrValue.ptr2 = fiPtr;
- return (Tk_Font) fontPtr;
- }
- }
-
- /*
-@@ -1241,10 +1243,11 @@
- fontPtr->underlineHeight = 1;
- }
- }
-
- objPtr->internalRep.twoPtrValue.ptr1 = fontPtr;
-+ objPtr->internalRep.twoPtrValue.ptr2 = fiPtr;
- return (Tk_Font) fontPtr;
- }
-
- /*
- *----------------------------------------------------------------------
-@@ -1273,11 +1276,12 @@
- {
- TkFontInfo *fiPtr = ((TkWindow *) tkwin)->mainPtr->fontInfoPtr;
- TkFont *fontPtr;
- Tcl_HashEntry *hashPtr;
-
-- if (objPtr->typePtr != &tkFontObjType) {
-+ if (objPtr->typePtr != &tkFontObjType
-+ || objPtr->internalRep.twoPtrValue.ptr2 != fiPtr) {
- SetFontFromAny(NULL, objPtr);
- }
-
- fontPtr = objPtr->internalRep.twoPtrValue.ptr1;
- if (fontPtr != NULL) {
-@@ -1309,10 +1313,11 @@
- for (fontPtr = Tcl_GetHashValue(hashPtr); fontPtr != NULL;
- fontPtr = fontPtr->nextPtr) {
- if (Tk_Screen(tkwin) == fontPtr->screen) {
- fontPtr->objRefCount++;
- objPtr->internalRep.twoPtrValue.ptr1 = fontPtr;
-+ objPtr->internalRep.twoPtrValue.ptr2 = fiPtr;
- return (Tk_Font) fontPtr;
- }
- }
- }
-
-@@ -1354,10 +1359,11 @@
- if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
- typePtr->freeIntRepProc(objPtr);
- }
- objPtr->typePtr = &tkFontObjType;
- objPtr->internalRep.twoPtrValue.ptr1 = NULL;
-+ objPtr->internalRep.twoPtrValue.ptr2 = NULL;
-
- return TCL_OK;
- }
-
- /*
-@@ -1517,10 +1523,11 @@
- fontPtr->objRefCount--;
- if ((fontPtr->resourceRefCount == 0) && (fontPtr->objRefCount == 0)) {
- ckfree(fontPtr);
-- objPtr->internalRep.twoPtrValue.ptr1 = NULL;
- }
-+ objPtr->internalRep.twoPtrValue.ptr1 = NULL;
-+ objPtr->internalRep.twoPtrValue.ptr2 = NULL;
- }
- }
-
- /*
- *---------------------------------------------------------------------------
-@@ -1547,10 +1554,12 @@
- {
- TkFont *fontPtr = srcObjPtr->internalRep.twoPtrValue.ptr1;
-
- dupObjPtr->typePtr = srcObjPtr->typePtr;
- dupObjPtr->internalRep.twoPtrValue.ptr1 = fontPtr;
-+ dupObjPtr->internalRep.twoPtrValue.ptr2
-+ = srcObjPtr->internalRep.twoPtrValue.ptr2;
-
- if (fontPtr != NULL) {
- fontPtr->objRefCount++;
- }
- }
-
-Index: tests/font.test
-==================================================================
---- x/tests/font.test
-+++ x/tests/font.test
-@@ -2343,13 +2343,23 @@
-
- test font-46.5 {font actual, too many chars} -body {
- font actual {times 10} 123456789012345678901234567890123456789012345678901
- } -returnCodes error -result {expected a single character but got "1234567890123456789012345678901234567..."}
-
-+test font-47.1 {Bug f214b8ad5b} -body {
-+ interp create one
-+ interp create two
-+ load {} Tk one
-+ load {} Tk two
-+ one eval menu .menubar
-+ two eval menu .menubar
-+ interp delete one
-+ interp delete two
-+} -result {}
-
- # cleanup
- cleanupTests
- return
-
-
-
-
-
Modified: tk8.6/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.6/trunk/debian/patches/tklibrary.diff 2014-08-27 16:17:13 UTC (rev 1661)
+++ tk8.6/trunk/debian/patches/tklibrary.diff 2014-08-27 16:25:53 UTC (rev 1662)
@@ -1,6 +1,6 @@
---- tk8.6-8.6.1.orig/unix/configure
-+++ tk8.6-8.6.1/unix/configure
-@@ -11213,7 +11213,7 @@
+--- a/unix/configure
++++ b/unix/configure
+@@ -11227,7 +11227,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
@@ -9,9 +9,9 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
TK_PKG_DIR='tk$(VERSION)'
---- tk8.6-8.6.1.orig/unix/configure.in
-+++ tk8.6-8.6.1/unix/configure.in
-@@ -666,7 +666,7 @@
+--- a/unix/configure.in
++++ b/unix/configure.in
+@@ -678,7 +678,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
Modified: tk8.6/trunk/debian/patches/tkprivate.diff
===================================================================
--- tk8.6/trunk/debian/patches/tkprivate.diff 2014-08-27 16:17:13 UTC (rev 1661)
+++ tk8.6/trunk/debian/patches/tkprivate.diff 2014-08-27 16:25:53 UTC (rev 1662)
@@ -2,8 +2,8 @@
with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
puts private Tk headers there).
---- tk8.6-8.6.1.orig/unix/tkConfig.sh.in
-+++ tk8.6-8.6.1/unix/tkConfig.sh.in
+--- a/unix/tkConfig.sh.in
++++ b/unix/tkConfig.sh.in
@@ -53,7 +53,7 @@
# String to pass to linker to pick up the Tk library from its
Modified: tk8.6/trunk/debian/patches/xft.diff
===================================================================
--- tk8.6/trunk/debian/patches/xft.diff 2014-08-27 16:17:13 UTC (rev 1661)
+++ tk8.6/trunk/debian/patches/xft.diff 2014-08-27 16:25:53 UTC (rev 1662)
@@ -4,8 +4,8 @@
Bug: https://sourceforge.net/tracker/?func=detail&aid=3184834&group_id=12997&atid=112997
Last-updated: Wed, 20 Jul 2011 16:11:14 +0400
---- tk8.6-8.6.1.orig/unix/configure.in
-+++ tk8.6-8.6.1/unix/configure.in
+--- a/unix/configure.in
++++ b/unix/configure.in
@@ -485,8 +485,8 @@
XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
if test "$found_xft" = "no" ; then
@@ -17,9 +17,9 @@
fi
AC_MSG_RESULT([$found_xft])
dnl make sure that compiling against Xft header file doesn't bomb
---- tk8.6-8.6.1.orig/unix/configure
-+++ tk8.6-8.6.1/unix/configure
-@@ -10370,8 +10370,8 @@
+--- a/unix/configure
++++ b/unix/configure
+@@ -10306,8 +10306,8 @@
XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
if test "$found_xft" = "no" ; then
found_xft=yes
Modified: tk8.6/trunk/debian/rules
===================================================================
--- tk8.6/trunk/debian/rules 2014-08-27 16:17:13 UTC (rev 1661)
+++ tk8.6/trunk/debian/rules 2014-08-27 16:25:53 UTC (rev 1662)
@@ -118,8 +118,8 @@
dh_shlibdeps -ldebian/libtk$(v)/usr/lib/$(DEB_HOST_MULTIARCH)
get-orig-source:
- wget -O tk$(v)_$(v).1.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tk$(v).1-src.tar.gz
+ wget -O tk$(v)_$(v).2.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tk$(v).2-src.tar.gz
.PHONY: override_dh_auto_clean override_dh_auto_configure override_dh_auto_build \
override_dh_auto_install override_dh_compress override_dh_strip \
More information about the Pkg-tcltk-commits
mailing list