debian/0000775000000000000000000000000012310156662007172 5ustar debian/tk8.6-doc.links0000664000000000000000000000007212167710407011653 0ustar usr/share/doc/tk8.6-doc/demos usr/share/tcltk/tk8.6/demos debian/copyright0000664000000000000000000000711111032152023011110 0ustar This package was debianized by David Engel from sources obtained at http://prdownloads.sourceforge.net/tcl List of copyright holders of individual files: Copyright 1985-1987, 1989, 1991 Massachusetts Institute of Technology Copyright 1987-1994 Adobe Systems Inc. Copyright 1987 Digital Equipment Corporation Copyright 1989-1994 The Regents of the University of California Copyright 1990, David Koblas Copyright 1994-1998 Sun Microsystems, Inc. Copyright 1994 Software Research Associates, Inc. Copyright 1994,1997 The Australian National University Copyright 1997-2000 Ajuba Solutions Copyright 1997-2000 Scriptics Corporation Copyright 1998 Paul Duffin Copyright 1999-2000 Jeffrey Hobbs Copyright 2000-2005,2007 ActiveState Corporation Copyright 2001-2002, Apple Computer, Inc. Copyright 2001-2008 Donal K. Fellows Copyright 2001-2004 David Gravereaux Copyright 2002 Frederic Bonnet Copyright 2002-2003 Keith Packard Copyright 2002-2004 Benjamin Riefenstahl Copyright 2002-2008 Daniel A. Steffen Copyright 2002 David Gravereaux Copyright 2002 Ludwig Callewaert Copyright 2003 Free Software Foundation, Inc. Copyright 2003 Georgios Petasis Copyright 2003-2004 Vincent Darley Copyright 2003-2006 Joe English Copyright 2002-2008 Patrick Thoyts Copyright 2004 George Peter Staplin Copyright 2005 Neil Madden Copyright 2007 the Tk developers Copyright 2008 Tcl Core Team Copyright Reed Wade Copyright Michael Kirkham Copyright: This software is copyrighted by the Regents of the University of California, Sun Microsystems, Inc., and other parties. The following terms apply to all files associated with the software unless explicitly disclaimed in individual files. The authors hereby grant permission to use, copy, modify, distribute, and license this software and its documentation for any purpose, provided that existing copyright notices are retained in all copies and that this notice is included verbatim in any distributions. No written agreement, license, or royalty fee is required for any of the authorized uses. Modifications to this software may be copyrighted by their authors and need not follow the licensing terms described here, provided that the new terms are clearly indicated on the first page of each file where they apply. IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. GOVERNMENT USE: If you are acquiring this software on behalf of the U.S. government, the Government shall have only "Restricted Rights" in the software and related documentation as defined in the Federal Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you are acquiring the software on behalf of the Department of Defense, the software shall be classified as "Commercial Computer Software" and the Government shall have only "Restricted Rights" as defined in Clause 252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the authors grant the U.S. Government and others acting in its behalf permission to use and distribute the software in accordance with the terms specified in this license. debian/tk8.6-dev.dirs0000664000000000000000000000001612220623461011474 0ustar usr/lib/tk8.6 debian/tk8.6-doc.install0000664000000000000000000000005312167710407012200 0ustar usr/share/doc/tk*/demos usr/share/man/man3 debian/libtk8.6.install0000664000000000000000000000011012176142326012115 0ustar usr/lib/*/*.so usr/lib/*/*.so.* usr/lib/tcltk/*/tk* usr/share/tcltk/tk* debian/tk8.6.docs0000664000000000000000000000000712167710407010716 0ustar README debian/tkConfig.sh0000775000000000000000000000012112167710407011272 0ustar #! /bin/sh . /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/tk8.6/tkConfig.sh debian/libtk8.6.lintian-overrides0000664000000000000000000000032512176142326014115 0ustar # Versioned soname is not necessary for libtk8.6.so libtk8.6: shlib-without-versioned-soname # Since the library has no suffix after .so then the symlink # is not necessary libtk8.6: dev-pkg-without-shlib-symlink debian/source/0000775000000000000000000000000012223744013010466 5ustar debian/source/format0000664000000000000000000000001411761176716011713 0ustar 3.0 (quilt) debian/changelog0000664000000000000000000001350512310156662011050 0ustar tk8.6 (8.6.1-3ubuntu2) trusty; urgency=medium * debian/patches/shutdown-crash.diff: Fix crash on shutdown. -- Adam Conrad Wed, 12 Mar 2014 16:17:43 -0600 tk8.6 (8.6.1-3ubuntu1) trusty; urgency=medium * Add Conflicts/Replaces on tk8.6-lib (<< 8.6.0-2) for the rename. -- Adam Conrad Thu, 02 Jan 2014 15:13:58 -0700 tk8.6 (8.6.1-3) experimental; urgency=low * Added the libtk8.6-dbg package with libtk8.6 debug symbols in it. -- Sergei Golovan Sat, 05 Oct 2013 11:59:47 +0400 tk8.6 (8.6.1-2) experimental; urgency=low * Renamed the development package back to tk8.6-dev after a discussion on debian-devel mailing list. -- Sergei Golovan Wed, 25 Sep 2013 22:08:28 +0400 tk8.6 (8.6.1-1) experimental; urgency=low * New upstream release. * Make tk8.6-doc replace tk8.6 because of moving the /usr/share/tcltk/tk8.6/demos link. -- Sergei Golovan Tue, 24 Sep 2013 20:23:15 +0400 tk8.6 (8.6.0-4) experimental; urgency=low * Removed unnecessary patch to tkPort.h. * Make libtk8.6-dev depend on tk8.6 for better backward compatibility. -- Sergei Golovan Mon, 19 Aug 2013 21:25:44 +0400 tk8.6 (8.6.0-3) experimental; urgency=low * Renamed tk8.6-lib and tk8.6-dev packages to libtk8.6 and libtk8.6-dev because the latter is a much more common naming scheme. * Added conflict with older tk8.6 to the tk8.6-doc package (a link to Tk demos was moved from one package to the other). * Fixed the maintainer 'name'. -- Sergei Golovan Wed, 31 Jul 2013 12:01:00 +0400 tk8.6 (8.6.0-2) experimental; urgency=low * Bumped debhelper compatibility version to 9. * Added multi-arch support. This includes splitting out the tk8.6-lib library package with libtk8.6.so and tkConfig.sh moved into a multi-archified location. * Recreated /usr/lib/tk8.6/tkConfig.sh for backward compatibility (intend to remove in the future). * Removed .0 suffix from the libtk8.6.so library in order to remove unnecessary diversions from the upstream practice, provided the symlink for backward compatibility (intend to remove in the future). * Switched to calculating dependency on libtk8.6 via a symbols table. * Don't use the alternatives mechanism for selecting /usr/bin/wish. This package ships only /usr/bin/wish8.6. The tcltk-defaults package provides the necessary symlink. This also means that tk8.6 does no longer provide the wish virtual package. * Moved the old changelog to the tk8.6-doc package to reduce size of the tk8.6 one. * Moved the Tk demos to the tk8.6-doc package. * Fixed clean target in debian/rules. * Bumped standards version to 3.9.4. -- Sergei Golovan Tue, 30 Jul 2013 20:27:35 +0400 tk8.6 (8.6.0-1) unstable; urgency=low * New upstream release. -- Sergei Golovan Fri, 21 Dec 2012 08:34:11 +0400 tk8.6 (8.6.0~b3-1) experimental; urgency=low * New upstream beta release. -- Sergei Golovan Fri, 21 Sep 2012 08:49:05 +0400 tk8.6 (8.6.0~b2-2) experimental; urgency=low * Fixed options(3tk) manpage. * Install FontId(3tk) and MeasureChar(3tk) manpages because they are referenced in the other manpages. * Fixed references to tclvars manpage. * Removed Chris Waters wrom the uploaders list (closes: #664118). * Switched to 3.0 (quilt) source package format. * Bumped debhelper compatibility version to 8. * Added hardening build flags using dpkg-buildflags. * Bumped standards version to 3.9.3. -- Sergei Golovan Tue, 29 May 2012 20:44:31 +0400 tk8.6 (8.6.0~b2-1) experimental; urgency=low * New upstream beta release. -- Sergei Golovan Mon, 08 Aug 2011 23:12:55 +0400 tk8.6 (8.6.0~b2~rc4-1) experimental; urgency=low * New upstream beta release candidate. -- Sergei Golovan Sun, 07 Aug 2011 12:30:32 +0400 tk8.6 (8.6.0~b2~rc0-1) experimental; urgency=low * New upstream beta release candidate. * Moved /usr/share/tcltk/tk8.6/tkConfig.sh back to the /usr/lib/tk8.6 * Fixed Xft detection in configure script, which is broken since xft-config was removed from the libxft-dev package. * Added README.source which explains how to apply quilt patches. * Bumped standards version to 3.9.2. -- Sergei Golovan Thu, 21 Jul 2011 10:31:32 +0400 tk8.6 (8.6.0~b1-3) experimental; urgency=low * Added libxft-dev to tk8.6-dev dependencies because -lXft is stored in tkConfig.sh configuration script. * Replaced xterm by xvt in recommended dependencies to reduce implicit dependencies list. * Added ${misc:Depends} to debian/control file because the binary packages are built using debhelper. * Bumped standards version to 3.9.1. -- Sergei Golovan Sun, 31 Oct 2010 14:58:40 +0300 tk8.6 (8.6.0~b1-2) experimental; urgency=low * Don't remove wish alternative in case of package upgrade because the manually installed alternative is also removed which isn't desirable. -- Sergei Golovan Sun, 01 Mar 2009 10:39:30 +0300 tk8.6 (8.6.0~b1-1) experimental; urgency=low * New upstream beta release. * Added private ttk headers to tk8.6-dev binary package. -- Sergei Golovan Sat, 27 Dec 2008 14:39:54 +0300 tk8.6 (8.6.0~a3-1) experimental; urgency=low * New upstream alpha release. -- Sergei Golovan Sat, 11 Oct 2008 02:19:43 +0400 tk8.6 (8.6.0~a2-1) experimental; urgency=low * New upstream alpha release. -- Sergei Golovan Sat, 23 Aug 2008 12:35:08 +0400 tk8.6 (8.6.0~a1-1) experimental; urgency=low * Initial alpha release (closes: #488655). -- Sergei Golovan Mon, 30 Jun 2008 15:57:54 +0400 debian/compat0000664000000000000000000000000212167710407010373 0ustar 9 debian/rules0000775000000000000000000001057012223743445010261 0ustar #!/usr/bin/make -f v = 8.6 DIR = $(shell pwd)/debian/tmp DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk include /usr/share/dpkg/architecture.mk ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) # See bug #446335 CFLAGS += -fno-unit-at-a-time endif %: dh $@ override_dh_auto_clean: [ ! -f unix/Makefile ] || $(MAKE) -C unix distclean override_dh_auto_configure: TK_LIBRARY="/usr/share/tcltk/tk$(v)" \ CFLAGS="$(CFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" \ TK_SHLIB_LD_EXTRAS="-Wl,-soname,\$${TK_LIB_FILE}" \ dh_auto_configure -Dunix -- \ --includedir=/usr/include/tcl$(v) \ --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(v) \ --enable-shared \ --enable-threads \ --disable-rpath \ --enable-xft \ --enable-man-symlinks override_dh_auto_build: $(MAKE) -C unix # Build the static library cd unix && \ ar cr libtk$(v).a *.o && \ ar d libtk$(v).a tkAppInit.o && \ ranlib libtk$(v).a override_dh_auto_install: $(MAKE) -C unix INSTALL_ROOT=$(DIR) \ MAN_INSTALL_DIR=$(DIR)/usr/share/man \ MANN_INSTALL_DIR=$(DIR)/usr/share/man/man3 \ install # Fix up pkgInstall.tcl install -d -m 755 $(DIR)/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/tk$(v) sed -e 's:\$$dir \.\.:/usr/lib/$(DEB_HOST_MULTIARCH):' \ $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/tk$(v)/pkgIndex.tcl \ >$(DIR)/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/tk$(v)/pkgIndex.tcl # Fix up the libraries cp unix/libtk$(v).a $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH) mv $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/*.sh $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/tk$(v) # Fix up the include files install -d $(DIR)/usr/include/tcl$(v)/tk-private/generic/ttk cp generic/*.h $(DIR)/usr/include/tcl$(v)/tk-private/generic cp generic/ttk/*.h $(DIR)/usr/include/tcl$(v)/tk-private/generic/ttk install -d $(DIR)/usr/include/tcl$(v)/tk-private/unix cp unix/*.h $(DIR)/usr/include/tcl$(v)/tk-private/unix install -d $(DIR)/usr/include/tcl$(v)/tk-private/compat cp compat/*.h $(DIR)/usr/include/tcl$(v)/tk-private/compat # Move the demos to the doc package install -d -m 755 $(DIR)/usr/share/doc/tk$(v)-doc mv -f $(DIR)/usr/share/tcltk/tk$(v)/demos $(DIR)/usr/share/doc/tk$(v)-doc rm -f $(DIR)/usr/share/doc/tk$(v)-doc/demos/license.terms # # Temporary HACK until all reverse dependencies will be rebuilt ln -sf libtk$(v).so $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/libtk$(v).so.0 # # Fix up the manpages. cd $(DIR)/usr/share/man/man1 && mv wish.1 wish$(v).1 cd $(DIR)/usr/share/man/man3 && \ for f in *.[3n] ; do \ f2=$$(echo $$f | sed -e 's/\.[3n]/.3tk/') ; \ if [ -L $$f ]; then \ l=$$(readlink -n $$f |sed -e 's/\.[3n]/.3tk/') ; \ rm $$f ; \ ln -sf $$l $$f2 ; \ else \ sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tk/' \ -e 's/\([0-9A-Za-z]\+\)(3)/\1(3tk)/g' \ -e 's/bgerror(n)/bgerror(3tcl)/g' \ -e 's/fconfigure(n)/fconfigure(3tcl)/g' \ -e 's/history(n)/history(3tcl)/g' \ -e 's/interp(n)/interp(3tcl)/g' \ -e 's/library(n)/library(3tcl)/g' \ -e 's/load(n)/load(3tcl)/g' \ -e 's/package(n)/package(3tcl)/g' \ -e 's/puts(n)/puts(3tcl)/g' \ -e 's/safe(n)/safe(3tcl)/g' \ -e 's/source(n)/source(3tcl)/g' \ -e 's/tclvars(n)/tclvars(3tcl)/g' \ -e 's/tclvars\\fR(n)/tclvars\\fR(3tcl)/g' \ -e 's/unknown(n)/unknown(3tcl)/g' \ -e 's/(n)/(3tk)/g' \ -e 's/^\.de OP$$/.de OOP/' \ -e 's/^.OP /.OOP /' \ $$f >$$f2 ; \ rm $$f ; \ fi ; \ done override_dh_compress: dh_compress -Xusr/share/doc/tk$(v)-doc/demos/ override_dh_strip: dh_strip -plibtk$(v) --dbg-package=libtk$(v)-dbg dh_strip -a -Nlibtk$(v) override_dh_makeshlibs: /usr/share/debhelper/autoscripts/postinst-makeshlibs /usr/share/debhelper/autoscripts/postrm-makeshlibs dh_makeshlibs -a cat /usr/share/debhelper/autoscripts/postinst-makeshlibs >>debian/libtk$(v).postinst.debhelper cat /usr/share/debhelper/autoscripts/postrm-makeshlibs >>debian/libtk$(v).postrm.debhelper override_dh_shlibdeps: 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 .PHONY: override_dh_auto_clean override_dh_auto_configure override_dh_auto_build \ override_dh_auto_install override_dh_compress override_dh_strip \ override_dh_makeshlibs override_dh_shlibdeps get-orig-source debian/control0000664000000000000000000000612612261362273010604 0ustar Source: tk8.6 Section: libs Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Tcl/Tk Packagers Uploaders: Sergei Golovan Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), x11proto-core-dev, libx11-dev, libxt-dev, libxss-dev, libxext-dev, libxft-dev, tcl8.6-dev (>= 8.6.0-2) Standards-Version: 3.9.4 Homepage: http://www.tcl.tk/ Package: tk8.6 Section: interpreters Priority: optional Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: xterm | x-terminal-emulator Conflicts: tk40 (<= 4.0p3-2), libtk-img (<< 1.2.5) Multi-Arch: foreign Description: Tk toolkit for Tcl and X11 v8.6 - windowing shell Tk is a cross-platform graphical toolkit which provides the Motif look-and-feel and is implemented using the Tcl scripting language. This package contains the windowing Tcl/Tk shell (wish). Package: libtk8.6 Section: libs Priority: optional Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: libtcl8.6 (>= 8.6.0-2), ${shlibs:Depends}, ${misc:Depends} Conflicts: tk8.6 (<<8.6.0-2), tk8.6-lib (<< 8.6.0-2), tk40 (<= 4.0p3-2), libtk-img (<< 1.2.5) Replaces: tk8.6 (<<8.6.0-2), tk8.6-lib (<< 8.6.0-2) Suggests: tk8.6 Provides: libtk Multi-Arch: same Description: Tk toolkit for Tcl and X11 v8.6 - run-time files Tk is a cross-platform graphical toolkit which provides the Motif look-and-feel and is implemented using the Tcl scripting language. This package contains the Tk library and supplementary packages you need to run Tk-enabled apps. Package: libtk8.6-dbg Section: debug Priority: extra Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: libtk8.6 (= ${binary:Version}) Multi-Arch: same Description: Symbol files for libtk8.6 Tk is a cross-platform graphical toolkit which provides the Motif look-and-feel and is implemented using the Tcl scripting language. This package contains the debug symbols for libtk8.6, to assist in debugging applications built with tk8.6. You will not normally need to install this package. Package: tk8.6-dev Section: libdevel Priority: optional Architecture: any Depends: dpkg-dev (>= 1.16.1~), x11proto-core-dev, libx11-dev, libxt-dev, libxss-dev, libxext-dev, libxft-dev, tcl8.6-dev (>= 8.6.0-2), libtk8.6 (= ${binary:Version}), tk8.6, ${misc:Depends} Suggests: tk8.6-doc Multi-Arch: same Description: Tk toolkit for Tcl and X11 v8.6 - development files Tk is a cross-platform graphical toolkit which provides the Motif look-and-feel and is implemented using the Tcl scripting language. This package contains the headers and libraries needed to extend or embed Tk. Package: tk8.6-doc Section: doc Priority: optional Architecture: all Depends: ${misc:Depends} Suggests: tk8.6 Conflicts: tkdoc, tk8.6 (<< 8.6.0-2) Replaces: tk8.6 (<< 8.6.0-2) Provides: tkdoc Description: Tk toolkit for Tcl and X11 v8.6 - manual pages Tk is a cross-platform graphical toolkit which provides the Motif look-and-feel and is implemented using the Tcl scripting language. This package contains the manual pages for the Tk commands. debian/libtk8.6.symbols0000664000000000000000000003155612176142326012161 0ustar libtk8.6.so libtk8.6 #MINVER# TkAllocWindow@Base 8.6.0 TkBTreeNumLines@Base 8.6.0 TkBezierPoints@Base 8.6.0 TkBezierScreenPoints@Base 8.6.0 TkBindEventProc@Base 8.6.0 TkBindFree@Base 8.6.0 TkBindInit@Base 8.6.0 TkCanvasDashParseProc@Base 8.6.0 TkCanvasDashPrintProc@Base 8.6.0 TkChangeEventWindow@Base 8.6.0 TkClipCleanup@Base 8.6.0 TkClipInit@Base 8.6.0 TkComputeAnchor@Base 8.6.0 TkCreateCursorFromData@Base 8.6.0 TkCreateFrame@Base 8.6.0 TkCreateMainWindow@Base 8.6.0 TkCreateThreadExitHandler@Base 8.6.0 TkCreateXEventSource@Base 8.6.0 TkCurrentTime@Base 8.6.0 TkDebugBitmap@Base 8.6.0 TkDebugBorder@Base 8.6.0 TkDebugColor@Base 8.6.0 TkDebugConfig@Base 8.6.0 TkDebugCursor@Base 8.6.0 TkDebugFont@Base 8.6.0 TkDeleteAllImages@Base 8.6.0 TkDeleteThreadExitHandler@Base 8.6.0 TkDoConfigureNotify@Base 8.6.0 TkDrawAngledChars@Base 8.6.0 TkDrawAngledTextLayout@Base 8.6.0 TkDrawInsetFocusHighlight@Base 8.6.0 TkEventDeadWindow@Base 8.6.0 TkFillPolygon@Base 8.6.0 TkFindStateNum@Base 8.6.0 TkFindStateNumObj@Base 8.6.0 TkFindStateString@Base 8.6.0 TkFocusDeadWindow@Base 8.6.0 TkFocusFilterEvent@Base 8.6.0 TkFocusFree@Base 8.6.0 TkFocusKeyEvent@Base 8.6.0 TkFontPkgFree@Base 8.6.0 TkFontPkgInit@Base 8.6.0 TkFreeBindingTags@Base 8.6.0 TkGCCleanup@Base 8.6.0 TkGetBitmapData@Base 8.6.0 TkGetBitmapPredefTable@Base 8.6.0 TkGetButtPoints@Base 8.6.0 TkGetCursorByName@Base 8.6.0 TkGetDefaultScreenName@Base 8.6.0 TkGetDisplay@Base 8.6.0 TkGetDisplayList@Base 8.6.0 TkGetDisplayOf@Base 8.6.0 TkGetFocusWin@Base 8.6.0 TkGetInterpNames@Base 8.6.0 TkGetMainInfoList@Base 8.6.0 TkGetMiterPoints@Base 8.6.0 TkGetOptionSpec@Base 8.6.0 TkGetPointerCoords@Base 8.6.0 TkGetServerInfo@Base 8.6.0 TkGetWindowFromObj@Base 8.6.0 TkGrabDeadWindow@Base 8.6.0 TkGrabState@Base 8.6.0 TkInOutEvents@Base 8.6.0 TkIncludePoint@Base 8.6.0 TkInstallFrameMenu@Base 8.6.0 TkIntersectAngledTextLayout@Base 8.6.0 TkKeysymToString@Base 8.6.0 TkLineToArea@Base 8.6.0 TkLineToPoint@Base 8.6.0 TkMakeBezierCurve@Base 8.6.0 TkMakeBezierPostscript@Base 8.6.0 TkMakeRawCurve@Base 8.6.0 TkMakeRawCurvePostscript@Base 8.6.0 TkOffsetParseProc@Base 8.6.0 TkOffsetPrintProc@Base 8.6.0 TkOptionClassChanged@Base 8.6.0 TkOptionDeadWindow@Base 8.6.0 TkOrientParseProc@Base 8.6.0 TkOrientPrintProc@Base 8.6.0 TkOvalToArea@Base 8.6.0 TkOvalToPoint@Base 8.6.0 TkPhotoGetValidRegion@Base 8.6.0 TkPixelParseProc@Base 8.6.0 TkPixelPrintProc@Base 8.6.0 TkPointerEvent@Base 8.6.0 TkPolygonToArea@Base 8.6.0 TkPolygonToPoint@Base 8.6.0 TkPositionInTree@Base 8.6.0 TkQueueEventForAllChildren@Base 8.6.0 TkReadBitmapFile@Base 8.6.0 TkScrollWindow@Base 8.6.0 TkSelDeadWindow@Base 8.6.0 TkSelEventProc@Base 8.6.0 TkSelGetSelection@Base 8.6.0 TkSelInit@Base 8.6.0 TkSelPropProc@Base 8.6.0 TkSendCleanup@Base 8.6.0 TkSetFocusWin@Base 8.6.0 TkSetWindowMenuBar@Base 8.6.0 TkSmoothParseProc@Base 8.6.0 TkSmoothPrintProc@Base 8.6.0 TkStateParseProc@Base 8.6.0 TkStatePrintProc@Base 8.6.0 TkStringToKeysym@Base 8.6.0 TkStylePkgFree@Base 8.6.0 TkStylePkgInit@Base 8.6.0 TkTextChanged@Base 8.6.0 TkTextGetIndex@Base 8.6.0 TkTextIndexBackBytes@Base 8.6.0 TkTextIndexForwBytes@Base 8.6.0 TkTextInsertDisplayProc@Base 8.6.0 TkTextMakeByteIndex@Base 8.6.0 TkTextPrintIndex@Base 8.6.0 TkTextSetMark@Base 8.6.0 TkTextXviewCmd@Base 8.6.0 TkThickPolyLineToArea@Base 8.6.0 TkToplevelWindowForCommand@Base 8.6.0 TkUnderlineAngledTextLayout@Base 8.6.0 TkUnixContainerId@Base 8.6.0 TkUnixDoOneXEvent@Base 8.6.0 TkUnixSetMenubar@Base 8.6.0 TkWmAddToColormapWindows@Base 8.6.0 TkWmCleanup@Base 8.6.0 TkWmDeadWindow@Base 8.6.0 TkWmFocusToplevel@Base 8.6.0 TkWmMapWindow@Base 8.6.0 TkWmNewWindow@Base 8.6.0 TkWmProtocolEventProc@Base 8.6.0 TkWmRemoveFromColormapWindows@Base 8.6.0 TkWmRestackToplevel@Base 8.6.0 TkWmSetClass@Base 8.6.0 TkWmStackorderToplevel@Base 8.6.0 TkWmUnmapWindow@Base 8.6.0 Tk_3DBorderColor@Base 8.6.0 Tk_3DBorderGC@Base 8.6.0 Tk_3DHorizontalBevel@Base 8.6.0 Tk_3DVerticalBevel@Base 8.6.0 Tk_AddOption@Base 8.6.0 Tk_Alloc3DBorderFromObj@Base 8.6.0 Tk_AllocBitmapFromObj@Base 8.6.0 Tk_AllocColorFromObj@Base 8.6.0 Tk_AllocCursorFromObj@Base 8.6.0 Tk_AllocFontFromObj@Base 8.6.0 Tk_AllocStyleFromObj@Base 8.6.0 Tk_BindEvent@Base 8.6.0 Tk_CanvasDrawableCoords@Base 8.6.0 Tk_CanvasEventuallyRedraw@Base 8.6.0 Tk_CanvasGetCoord@Base 8.6.0 Tk_CanvasGetCoordFromObj@Base 8.6.0 Tk_CanvasGetTextInfo@Base 8.6.0 Tk_CanvasPsBitmap@Base 8.6.0 Tk_CanvasPsColor@Base 8.6.0 Tk_CanvasPsFont@Base 8.6.0 Tk_CanvasPsOutline@Base 8.6.0 Tk_CanvasPsPath@Base 8.6.0 Tk_CanvasPsStipple@Base 8.6.0 Tk_CanvasPsY@Base 8.6.0 Tk_CanvasSetOffset@Base 8.6.0 Tk_CanvasSetStippleOrigin@Base 8.6.0 Tk_CanvasTagsParseProc@Base 8.6.0 Tk_CanvasTagsPrintProc@Base 8.6.0 Tk_CanvasTkwin@Base 8.6.0 Tk_CanvasWindowCoords@Base 8.6.0 Tk_ChangeOutlineGC@Base 8.6.0 Tk_ChangeWindowAttributes@Base 8.6.0 Tk_CharBbox@Base 8.6.0 Tk_ClearSelection@Base 8.6.0 Tk_ClipboardAppend@Base 8.6.0 Tk_ClipboardClear@Base 8.6.0 Tk_CollapseMotionEvents@Base 8.6.0 Tk_ComputeTextLayout@Base 8.6.0 Tk_ConfigOutlineGC@Base 8.6.0 Tk_ConfigureInfo@Base 8.6.0 Tk_ConfigureValue@Base 8.6.0 Tk_ConfigureWidget@Base 8.6.0 Tk_ConfigureWindow@Base 8.6.0 Tk_CoordsToWindow@Base 8.6.0 Tk_CreateAnonymousWindow@Base 8.6.0 Tk_CreateBinding@Base 8.6.0 Tk_CreateBindingTable@Base 8.6.0 Tk_CreateClientMessageHandler@Base 8.6.0 Tk_CreateConsoleWindow@Base 8.6.0 Tk_CreateErrorHandler@Base 8.6.0 Tk_CreateEventHandler@Base 8.6.0 Tk_CreateGenericHandler@Base 8.6.0 Tk_CreateImageType@Base 8.6.0 Tk_CreateItemType@Base 8.6.0 Tk_CreateOldImageType@Base 8.6.0 Tk_CreateOldPhotoImageFormat@Base 8.6.0 Tk_CreateOptionTable@Base 8.6.0 Tk_CreateOutline@Base 8.6.0 Tk_CreatePhotoImageFormat@Base 8.6.0 Tk_CreateSelHandler@Base 8.6.0 Tk_CreateSmoothMethod@Base 8.6.0 Tk_CreateStyle@Base 8.6.0 Tk_CreateWindow@Base 8.6.0 Tk_CreateWindowFromPath@Base 8.6.0 Tk_DefineBitmap@Base 8.6.0 Tk_DefineCursor@Base 8.6.0 Tk_DeleteAllBindings@Base 8.6.0 Tk_DeleteBinding@Base 8.6.0 Tk_DeleteBindingTable@Base 8.6.0 Tk_DeleteClientMessageHandler@Base 8.6.0 Tk_DeleteErrorHandler@Base 8.6.0 Tk_DeleteEventHandler@Base 8.6.0 Tk_DeleteGenericHandler@Base 8.6.0 Tk_DeleteImage@Base 8.6.0 Tk_DeleteOptionTable@Base 8.6.0 Tk_DeleteOutline@Base 8.6.0 Tk_DeleteSelHandler@Base 8.6.0 Tk_DestroyWindow@Base 8.6.0 Tk_DisplayName@Base 8.6.0 Tk_DistanceToTextLayout@Base 8.6.0 Tk_DitherPhoto@Base 8.6.0 Tk_Draw3DPolygon@Base 8.6.0 Tk_Draw3DRectangle@Base 8.6.0 Tk_DrawChars@Base 8.6.0 Tk_DrawElement@Base 8.6.0 Tk_DrawFocusHighlight@Base 8.6.0 Tk_DrawTextLayout@Base 8.6.0 Tk_Fill3DPolygon@Base 8.6.0 Tk_Fill3DRectangle@Base 8.6.0 Tk_FindPhoto@Base 8.6.0 Tk_FontId@Base 8.6.0 Tk_Free3DBorder@Base 8.6.0 Tk_Free3DBorderFromObj@Base 8.6.0 Tk_FreeBitmap@Base 8.6.0 Tk_FreeBitmapFromObj@Base 8.6.0 Tk_FreeColor@Base 8.6.0 Tk_FreeColorFromObj@Base 8.6.0 Tk_FreeColormap@Base 8.6.0 Tk_FreeConfigOptions@Base 8.6.0 Tk_FreeCursor@Base 8.6.0 Tk_FreeCursorFromObj@Base 8.6.0 Tk_FreeFont@Base 8.6.0 Tk_FreeFontFromObj@Base 8.6.0 Tk_FreeGC@Base 8.6.0 Tk_FreeImage@Base 8.6.0 Tk_FreeOptions@Base 8.6.0 Tk_FreePixmap@Base 8.6.0 Tk_FreeSavedOptions@Base 8.6.0 Tk_FreeStyle@Base 8.6.0 Tk_FreeStyleFromObj@Base 8.6.0 Tk_FreeTextLayout@Base 8.6.0 Tk_FreeXId@Base 8.6.0 Tk_GCForColor@Base 8.6.0 Tk_GeometryRequest@Base 8.6.0 Tk_Get3DBorder@Base 8.6.0 Tk_Get3DBorderFromObj@Base 8.6.0 Tk_GetAllBindings@Base 8.6.0 Tk_GetAnchor@Base 8.6.0 Tk_GetAnchorFromObj@Base 8.6.0 Tk_GetAtomName@Base 8.6.0 Tk_GetBinding@Base 8.6.0 Tk_GetBitmap@Base 8.6.0 Tk_GetBitmapFromData@Base 8.6.0 Tk_GetBitmapFromObj@Base 8.6.0 Tk_GetCapStyle@Base 8.6.0 Tk_GetColor@Base 8.6.0 Tk_GetColorByValue@Base 8.6.0 Tk_GetColorFromObj@Base 8.6.0 Tk_GetColormap@Base 8.6.0 Tk_GetCursor@Base 8.6.0 Tk_GetCursorFromData@Base 8.6.0 Tk_GetCursorFromObj@Base 8.6.0 Tk_GetDash@Base 8.6.0 Tk_GetElementBorderWidth@Base 8.6.0 Tk_GetElementBox@Base 8.6.0 Tk_GetElementId@Base 8.6.0 Tk_GetElementSize@Base 8.6.0 Tk_GetFont@Base 8.6.0 Tk_GetFontFromObj@Base 8.6.0 Tk_GetFontMetrics@Base 8.6.0 Tk_GetGC@Base 8.6.0 Tk_GetImage@Base 8.6.0 Tk_GetImageMasterData@Base 8.6.0 Tk_GetItemTypes@Base 8.6.0 Tk_GetJoinStyle@Base 8.6.0 Tk_GetJustify@Base 8.6.0 Tk_GetJustifyFromObj@Base 8.6.0 Tk_GetMMFromObj@Base 8.6.0 Tk_GetNumMainWindows@Base 8.6.0 Tk_GetOption@Base 8.6.0 Tk_GetOptionInfo@Base 8.6.0 Tk_GetOptionValue@Base 8.6.0 Tk_GetPixels@Base 8.6.0 Tk_GetPixelsFromObj@Base 8.6.0 Tk_GetPixmap@Base 8.6.0 Tk_GetRelief@Base 8.6.0 Tk_GetReliefFromObj@Base 8.6.0 Tk_GetRootCoords@Base 8.6.0 Tk_GetScreenMM@Base 8.6.0 Tk_GetScrollInfo@Base 8.6.0 Tk_GetScrollInfoObj@Base 8.6.0 Tk_GetSelection@Base 8.6.0 Tk_GetStyle@Base 8.6.0 Tk_GetStyleEngine@Base 8.6.0 Tk_GetStyleFromObj@Base 8.6.0 Tk_GetStyledElement@Base 8.6.0 Tk_GetUid@Base 8.6.0 Tk_GetUserInactiveTime@Base 8.6.0 Tk_GetVRootGeometry@Base 8.6.0 Tk_GetVisual@Base 8.6.0 Tk_Grab@Base 8.6.0 Tk_HandleEvent@Base 8.6.0 Tk_IdToWindow@Base 8.6.0 Tk_ImageChanged@Base 8.6.0 Tk_Init@Base 8.6.0 Tk_InitConsoleChannels@Base 8.6.0 Tk_InitOptions@Base 8.6.0 Tk_InternAtom@Base 8.6.0 Tk_Interp@Base 8.6.0 Tk_IntersectTextLayout@Base 8.6.0 Tk_MainEx@Base 8.6.0 Tk_MainLoop@Base 8.6.0 Tk_MainWindow@Base 8.6.0 Tk_MaintainGeometry@Base 8.6.0 Tk_MakeWindowExist@Base 8.6.0 Tk_ManageGeometry@Base 8.6.0 Tk_MapWindow@Base 8.6.0 Tk_MeasureChars@Base 8.6.0 Tk_MoveResizeWindow@Base 8.6.0 Tk_MoveToplevelWindow@Base 8.6.0 Tk_MoveWindow@Base 8.6.0 Tk_NameOf3DBorder@Base 8.6.0 Tk_NameOfAnchor@Base 8.6.0 Tk_NameOfBitmap@Base 8.6.0 Tk_NameOfCapStyle@Base 8.6.0 Tk_NameOfColor@Base 8.6.0 Tk_NameOfCursor@Base 8.6.0 Tk_NameOfFont@Base 8.6.0 Tk_NameOfImage@Base 8.6.0 Tk_NameOfJoinStyle@Base 8.6.0 Tk_NameOfJustify@Base 8.6.0 Tk_NameOfRelief@Base 8.6.0 Tk_NameOfStyle@Base 8.6.0 Tk_NameToWindow@Base 8.6.0 Tk_OwnSelection@Base 8.6.0 Tk_ParseArgv@Base 8.6.0 Tk_PhotoBlank@Base 8.6.0 Tk_PhotoExpand@Base 8.6.0 Tk_PhotoExpand_Panic@Base 8.6.0 Tk_PhotoGetImage@Base 8.6.0 Tk_PhotoGetSize@Base 8.6.0 Tk_PhotoPutBlock@Base 8.6.0 Tk_PhotoPutBlock_NoComposite@Base 8.6.0 Tk_PhotoPutBlock_Panic@Base 8.6.0 Tk_PhotoPutZoomedBlock@Base 8.6.0 Tk_PhotoPutZoomedBlock_NoComposite@Base 8.6.0 Tk_PhotoPutZoomedBlock_Panic@Base 8.6.0 Tk_PhotoSetSize@Base 8.6.0 Tk_PhotoSetSize_Panic@Base 8.6.0 Tk_PkgInitStubsCheck@Base 8.6.0 Tk_PointToChar@Base 8.6.0 Tk_PostscriptBitmap@Base 8.6.0 Tk_PostscriptColor@Base 8.6.0 Tk_PostscriptFont@Base 8.6.0 Tk_PostscriptFontName@Base 8.6.0 Tk_PostscriptImage@Base 8.6.0 Tk_PostscriptPath@Base 8.6.0 Tk_PostscriptPhoto@Base 8.6.0 Tk_PostscriptStipple@Base 8.6.0 Tk_PostscriptY@Base 8.6.0 Tk_PreserveColormap@Base 8.6.0 Tk_QueueWindowEvent@Base 8.6.0 Tk_RedrawImage@Base 8.6.0 Tk_RegisterStyleEngine@Base 8.6.0 Tk_RegisterStyledElement@Base 8.6.0 Tk_ResetOutlineGC@Base 8.6.0 Tk_ResetUserInactiveTime@Base 8.6.0 Tk_ResizeWindow@Base 8.6.0 Tk_RestackWindow@Base 8.6.0 Tk_RestoreSavedOptions@Base 8.6.0 Tk_RestrictEvents@Base 8.6.0 Tk_SafeInit@Base 8.6.0 Tk_SetAppName@Base 8.6.0 Tk_SetBackgroundFromBorder@Base 8.6.0 Tk_SetCaretPos@Base 8.6.0 Tk_SetClass@Base 8.6.0 Tk_SetClassProcs@Base 8.6.0 Tk_SetGrid@Base 8.6.0 Tk_SetInternalBorder@Base 8.6.0 Tk_SetInternalBorderEx@Base 8.6.0 Tk_SetMinimumRequestSize@Base 8.6.0 Tk_SetOptions@Base 8.6.0 Tk_SetTSOrigin@Base 8.6.0 Tk_SetWindowBackground@Base 8.6.0 Tk_SetWindowBackgroundPixmap@Base 8.6.0 Tk_SetWindowBorder@Base 8.6.0 Tk_SetWindowBorderPixmap@Base 8.6.0 Tk_SetWindowBorderWidth@Base 8.6.0 Tk_SetWindowColormap@Base 8.6.0 Tk_SetWindowVisual@Base 8.6.0 Tk_SizeOfBitmap@Base 8.6.0 Tk_SizeOfImage@Base 8.6.0 Tk_StrictMotif@Base 8.6.0 Tk_TextLayoutToPostscript@Base 8.6.0 Tk_TextWidth@Base 8.6.0 Tk_UndefineCursor@Base 8.6.0 Tk_UnderlineChars@Base 8.6.0 Tk_UnderlineTextLayout@Base 8.6.0 Tk_Ungrab@Base 8.6.0 Tk_UnmaintainGeometry@Base 8.6.0 Tk_UnmapWindow@Base 8.6.0 Tk_UnsetGrid@Base 8.6.0 Tk_UpdatePointer@Base 8.6.0 TkpChangeFocus@Base 8.6.0 TkpClaimFocus@Base 8.6.0 TkpCloseDisplay@Base 8.6.0 TkpCmapStressed@Base 8.6.0 TkpDisplayWarning@Base 8.6.0 TkpDrawFrame@Base 8.6.0 TkpDrawHighlightBorder@Base 8.6.0 TkpFreeCursor@Base 8.6.0 TkpGetAppName@Base 8.6.0 TkpGetKeySym@Base 8.6.0 TkpGetOtherWindow@Base 8.6.0 TkpGetString@Base 8.6.0 TkpGetSubFonts@Base 8.6.0 TkpGetSystemDefault@Base 8.6.0 TkpGetWrapperWindow@Base 8.6.0 TkpInit@Base 8.6.0 TkpInitKeymapInfo@Base 8.6.0 TkpInitializeMenuBindings@Base 8.6.0 TkpMakeContainer@Base 8.6.0 TkpMakeMenuWindow@Base 8.6.0 TkpMakeWindow@Base 8.6.0 TkpMenuNotifyToplevelCreate@Base 8.6.0 TkpMenuThreadInit@Base 8.6.0 TkpOpenDisplay@Base 8.6.0 TkpRedirectKeyEvent@Base 8.6.0 TkpScanWindowId@Base 8.6.0 TkpSetKeycodeAndState@Base 8.6.0 TkpSetMainMenubar@Base 8.6.0 TkpSync@Base 8.6.0 TkpTestembedCmd@Base 8.6.0 TkpTestsendCmd@Base 8.6.0 TkpTesttextCmd@Base 8.6.0 TkpUseWindow@Base 8.6.0 TkpWmSetState@Base 8.6.0 _LIB_VERSION@Base 8.6.0 debian/tk8.6.menu0000664000000000000000000000021111032152023010707 0ustar ?package(tk8.6):needs="x11"\ section="Applications/Programming"\ title="TkWish8.6"\ command="x-terminal-emulator -e /usr/bin/wish8.6" debian/watch0000664000000000000000000000006711032152023010211 0ustar version=3 http://sf.net/tcl/tk(8\.6\.\d+)-src\.tar\.gz debian/README.Debian0000664000000000000000000000030211032152023011211 0ustar Please see the Documentation section in the upstream README for a list of books on getting started with Tcl/Tk. Also see the main Tcl/Tk web site at http://www.tcl.tk/ for other documentation. debian/tk8.6-doc.docs0000664000000000000000000000001012167710407011453 0ustar changes debian/patches/0000775000000000000000000000000012310156670010620 5ustar debian/patches/xft.diff0000664000000000000000000000267312220337055012261 0ustar Author: Sergei Golovan Description: Patch fixes Xft detection and list of libraries to link to. Forwarded: yes 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 @@ -485,8 +485,8 @@ XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no" if test "$found_xft" = "no" ; then found_xft=yes - XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no" - XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no" + XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no" + XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no" 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 @@ XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no" if test "$found_xft" = "no" ; then found_xft=yes - XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no" - XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no" + XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no" + XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no" fi echo "$as_me:$LINENO: result: $found_xft" >&5 echo "${ECHO_T}$found_xft" >&6 debian/patches/manpages.diff0000664000000000000000000000122712220337055013245 0ustar Patch by Chris Waters fixes installing of several manual pages which 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 @@ -92,12 +92,20 @@ exit 2 ;; esac +Name=`basename $ManPage .$Section` SrcDir=`dirname $ManPage` ######################################################################## ### Process Page to Create Target Pages ### +Specials="FindPhoto FontId MeasureChar" +for n in $Specials; do + if [ "$Name" = "$n" ] ; then + Names="$n $Names" + fi +done + First="" for Target in $Names; do Target=$Target.$Section$Suffix debian/patches/non-linux.diff0000664000000000000000000000135712220337055013405 0ustar 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 @@ if test "`uname -s`" = "AIX" ; then tcl_cv_sys_version=AIX-`uname -v`.`uname -r` fi + if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then + tcl_cv_sys_version=NetBSD-Debian + fi fi fi --- tk8.6-8.6.1.orig/unix/tcl.m4 +++ tk8.6-8.6.1/unix/tcl.m4 @@ -928,6 +928,9 @@ if test "`uname -s`" = "AIX" ; then tcl_cv_sys_version=AIX-`uname -v`.`uname -r` fi + if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then + tcl_cv_sys_version=NetBSD-Debian + fi fi fi ]) debian/patches/tkprivate.diff0000664000000000000000000000267112220337055013467 0ustar Patch by Chris Waters sets path which are normally point to a directory 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 @@ -53,7 +53,7 @@ # String to pass to linker to pick up the Tk library from its # build directory. -TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@' +TK_BUILD_LIB_SPEC='@TK_LIB_SPEC@' # String to pass to linker to pick up the Tk library from its # installed directory. @@ -69,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. -TK_SRC_DIR='@TK_SRC_DIR@' +TK_SRC_DIR='@includedir@/tk-private' # Needed if you want to make a 'fat' shared library library # containing tk objects or link a different wish. @@ -84,14 +84,14 @@ # String to pass to linker to pick up the Tk stub library from its # build directory. -TK_BUILD_STUB_LIB_SPEC='@TK_BUILD_STUB_LIB_SPEC@' +TK_BUILD_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@' # String to pass to linker to pick up the Tk stub library from its # installed directory. TK_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@' # Path to the Tk stub library in the build directory. -TK_BUILD_STUB_LIB_PATH='@TK_BUILD_STUB_LIB_PATH@' +TK_BUILD_STUB_LIB_PATH='@TK_STUB_LIB_PATH@' # Path to the Tk stub library in the install directory. TK_STUB_LIB_PATH='@TK_STUB_LIB_PATH@' debian/patches/shutdown-crash.diff0000664000000000000000000001016612310156377014433 0ustar 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 debian/patches/tklibrary.diff0000664000000000000000000000123612220337055013455 0ustar --- tk8.6-8.6.1.orig/unix/configure +++ tk8.6-8.6.1/unix/configure @@ -11213,7 +11213,7 @@ TCL_STUB_FLAGS="-DUSE_TCL_STUBS" fi -TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' +test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' 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 @@ TCL_STUB_FLAGS="-DUSE_TCL_STUBS" fi -TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' +test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' PRIVATE_INCLUDE_DIR='$(includedir)' HTML_DIR='$(DISTDIR)/html' TK_PKG_DIR='tk$(VERSION)' debian/patches/series0000664000000000000000000000015012310156670012031 0ustar tklibrary.diff tkprivate.diff confsearch.diff non-linux.diff manpages.diff xft.diff shutdown-crash.diff debian/patches/confsearch.diff0000664000000000000000000000214112220337055013561 0ustar Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5 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 @@ -1431,6 +1431,7 @@ `ls -d ${prefix}/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \ `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 @@ -93,6 +93,7 @@ `ls -d ${prefix}/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do @@ -223,6 +224,7 @@ `ls -d ${prefix}/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do debian/tk8.6.install0000664000000000000000000000003312167710407011433 0ustar usr/bin usr/share/man/man1 debian/tk8.6-dev.install0000664000000000000000000000011612220623461012202 0ustar usr/include usr/lib/*/*.a usr/lib/*/tk*/*.sh debian/tkConfig.sh usr/lib/tk8.6