OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tk?expand=0&rev=4

baselibs.conf

@@ -0,0 +1,3 @@
+tk
+ +/usr/lib(64)?/tcl/.*
+ requires -tk-<targettype>

tk-gifcrash.patch

@@ -1,11 +0,0 @@
---- generic/tkImgGIF.c
-+++ generic/tkImgGIF.c
-@@ -995,7 +995,7 @@
- 	 */
- 	if (interlace) {
- 	    ypos += interlaceStep[pass];
--	    while (ypos >= height) {
-+	    while (ypos >= rows) {
- 		pass++;
- 		if (pass > 3) {
- 		    return TCL_OK;

tk-rpmlintrc

@@ -0,0 +1,2 @@
+addFilter("no-soname")
+addFilter("files-duplicate")

tk.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Wed Apr  2 18:15:28 CEST 2008 - max@suse.de
+
+- New version: 8.5.2:
+
+  * New modern theming engine: New and complementary widgets that
+    make use of platform-specific theming on Mac OS X and Windows
+    to better fit in with those environments, and feature an
+    improved look and feel under X11.
+  * New widgets: Part of the themed widget set, Tk now has core
+    notebook, combobox, treeview and progressbar widgets.
+  * text widget: Smooth scrolling, widget peering, and improved
+    procedures for counting and replacing text.
+  * Font rendering: Now uses anti-aliased text under X11, and a
+    more modern text engine (ATSUI) on Mac OS X.
+  * Additional improvements: Window transparency, new fullscreen
+    option for windows, enhancements to specific widgets and
+    window layout, and more.
+- Adjusted paths according to the new Tcl extension layoout.
+
 -------------------------------------------------------------------
 Tue Sep 11 20:35:28 CEST 2007 - max@suse.de
 

tk.patch

@@ -1,16 +1,6 @@
---- unix/Makefile.in
+Index: unix/Makefile.in
-+++ unix/Makefile.in
+===================================================================
-@@ -113,7 +113,8 @@
+@@ -539,7 +540,8 @@ AQUA_XLIB_HDRS = $(XLIB_DIR)/X11/*.h $(X
- TK_PKG_DIR		= @TK_PKG_DIR@
- 
- # Directory in which to install the pkgIndex.tcl file for loadable Tk
--PKG_INSTALL_DIR		= $(LIB_INSTALL_DIR)/$(TK_PKG_DIR)
-+#PKG_INSTALL_DIR		= $(LIB_INSTALL_DIR)/$(TK_PKG_DIR)
-+PKG_INSTALL_DIR		= $(INSTALL_ROOT)/$(TK_LIBRARY)
- 
- # Package index file for loadable Tk
- PKG_INDEX		= $(PKG_INSTALL_DIR)/pkgIndex.tcl
-@@ -471,7 +472,8 @@
  
  AQUA_PRIVATE_HDRS = $(MAC_OSX_DIR)/tkMacOSXPort.h $(MAC_OSX_DIR)/tkMacOSXInt.h
  
@@ -18,43 +8,5 @@
 +X11_PRIVATE_HDRS = $(UNIX_DIR)/tkUnixPort.h $(UNIX_DIR)/tkUnixInt.h \
 +	$(UNIX_DIR)/tkUnixDefault.h
  
- HDRS = bltList.h \
+ # Currently private, eventually public
- 	default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h  \
+ TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h
-@@ -634,7 +636,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 }";\
- 	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)\
--		[list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
-+		[list load $(TK_LIB_FILE) Tk]";\
- 	    ) > $(PKG_INDEX); \
- 	    fi
- 	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
---- unix/tcl.m4
-+++ unix/tcl.m4
-@@ -1124,7 +1124,7 @@
- 
- 	    # AIX v<=4.1 has some different flags than 4.2+
- 	    if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then
--		LIBOBJS="$LIBOBJS tclLoadAix.o"
-+		AC_LIBOBJ(tclLoadAix)
- 		DL_LIBS="-lld"
- 	    fi
- 
-@@ -1366,7 +1366,7 @@
- 	    # is kind of overkill but it works.
- 	    # Disable inlining only when one of the
- 	    # files in compat/*.c is being linked in.
--	    if test x"${LIBOBJS}" != x ; then
-+	    if test x"${LIBO@&t@BJS}" != x ; then
- 	        CFLAGS="$CFLAGS -fno-inline"
- 	    fi
- 
-@@ -2585,7 +2585,7 @@
- 		}], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy,
- 		    tcl_cv_strtod_buggy=buggy)])
- 	if test "$tcl_cv_strtod_buggy" = buggy; then
--	    LIBOBJS="$LIBOBJS fixstrtod.o"
-+	    AC_LIBOBJ([fixstrtod])
- 	    AC_DEFINE(strtod, fixstrtod)
- 	fi
-     fi

tk.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package tk (Version 8.4.15)
+# spec file for package tk (Version 8.5.2)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -10,23 +10,25 @@
 
 # norootforbuild
 
+
 Name:           tk
-BuildRequires:  tcl-devel xorg-x11-libX11-devel xorg-x11-libXt-devel
+BuildRequires:  tcl-devel xorg-x11-devel
-URL:            http://www.tcl.tk
+Url:            http://www.tcl.tk
-Version:        8.4.15
+Version:        8.5.2
-Release:        21
+Release:        2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Graphical User Interface Toolkit for Tcl
 License:        BSD 3-Clause
 Group:          Development/Languages/Tcl
-Autoreqprov:    on
+AutoReqProv:    on
 Summary:        Graphical User Interface Toolkit for Tcl
 Provides:       wish wish8.4
-Requires:       tcl >= %version tcl < 8.5
+Requires:       tcl >= %version
-Prereq:         /bin/rm
+PreReq:         /bin/rm
 Source0:        %name%{version}-src.tar.bz2
+Source1:        tk-rpmlintrc
+Source2:        baselibs.conf
 Patch0:         %name.patch
-Patch1:         tk-gifcrash.patch
 
 %description
 Tk is a graphical user interface toolkit that takes developing desktop
@@ -61,48 +63,41 @@ Authors:
 --------
     The Tcl Core Team <tcl-core@lists.sourceforge.net>
 
-%define V_TKK   8.4
+%define TK_MINOR %(echo %version | cut -c1-3)
+%define scriptdir %(echo 'puts -nonewline [file dirname $tcl_library]' | tclsh)/tk%TK_MINOR
+
 %prep
 %setup -q -n %name%version
 %patch0
-%patch1
-pushd unix
-  autoconf
-popd
 
 %build
-mkdir build
+cd unix
-pushd build
+%configure \
-  ../unix/configure \
-	--prefix=%_prefix \
-	--libdir=%_libdir \
-	--mandir=%_mandir \
 	--with-tcl=%_libdir \
 	--enable-threads \
 	--enable-man-symlinks \
 	--enable-man-compression=gzip
-  make %{?jobs:-j%jobs} \
+make %{?jobs:-j%jobs} \
-	TK_LIBRARY="%_datadir/tcl/tk%V_TKK" \
+	TK_LIBRARY="%scriptdir" \
-	CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
+	TK_PKG_DIR="tcl/tk%TK_MINOR"
-	CFLAGS_WARNING=""
-popd
 
 %install
 # these renamings are needed to avoid some file name clashes with other packages
 mv doc/menubar.n doc/tk_menubar.n
 mv doc/dialog.n doc/tk_dialog.n
 mv doc/panedwindow.n doc/tk_panedwindow.n
-make -C build install install-private-headers \
+make -C unix install install-private-headers \
-	TK_LIBRARY="%_datadir/tcl/tk%V_TKK" \
+	INSTALL_ROOT=%buildroot \
-	INSTALL_ROOT=%buildroot
+	TK_LIBRARY="%scriptdir" \
-ln -sf wish%V_TKK %buildroot%_prefix/bin/wish
+	TK_PKG_DIR="tcl/tk%TK_MINOR"
+ln -sf wish%TK_MINOR %buildroot%_prefix/bin/wish
 
 %clean
 rm -rf %buildroot
 %if %_lib == lib64
 
 %post
-test -L /usr/lib/tk%V_TKK && rm -f /usr/lib/tk%V_TKK
+test -L /usr/lib/tk%TK_MINOR && rm -f /usr/lib/tk%TK_MINOR
 exit 0
 %endif
 
@@ -113,26 +108,44 @@ exit 0
 %doc %_mandir/man1/*
 %doc %_mandir/mann/*
 %_prefix/bin/*
-%_datadir/tcl
 %_libdir/*.so
+%scriptdir
+%exclude %scriptdir/tkAppInit.c
 
 %files devel
 %defattr(-,root,root)
 %doc %_mandir/man3/*
 %_prefix/include/*
+%scriptdir/tkAppInit.c
 %_libdir/*.a
 %_libdir/tkConfig.sh
 
 %changelog
-* Tue Sep 11 2007 - max@suse.de
+* Wed Apr 02 2008 max@suse.de
+- New version: 8.5.2:
+  * New modern theming engine: New and complementary widgets that
+  make use of platform-specific theming on Mac OS X and Windows
+  to better fit in with those environments, and feature an
+  improved look and feel under X11.
+  * New widgets: Part of the themed widget set, Tk now has core
+  notebook, combobox, treeview and progressbar widgets.
+  * text widget: Smooth scrolling, widget peering, and improved
+  procedures for counting and replacing text.
+  * Font rendering: Now uses anti-aliased text under X11, and a
+  more modern text engine (ATSUI) on Mac OS X.
+  * Additional improvements: Window transparency, new fullscreen
+  option for windows, enhancements to specific widgets and
+  window layout, and more.
+- Adjusted paths according to the new Tcl extension layoout.
+* Tue Sep 11 2007 max@suse.de
 - Fix a crash with multi-frame interlaced GIFs (#309607).
-* Wed Jun 06 2007 - max@suse.de
+* Wed Jun 06 2007 max@suse.de
 - New patchlevel release: 8.4.15
 - improve performance of [$listbox itemconfigure]
 - use fd_mask for 64bit support
 - fix [tk_getOpenFile] in empty dir
 - fix list shimmer crash [grid *configure]
-* Tue Oct 17 2006 - max@suse.de
+* Tue Oct 17 2006 max@suse.de
 - New patchlevel release: 8.4.14rc2
 - Fix crash on invalid font name from XServer
 - Unmap canvas window items on canvas Unmap
@@ -143,116 +156,116 @@ exit 0
 - Add WM_UNICHAR window message
 - Improve speed on [text] delete
 - Alignment fixes in ucs-2be encoding routines
-* Thu Sep 14 2006 - max@suse.de
+* Thu Sep 14 2006 max@suse.de
 - New version: 8.4.13
 - Fixes the SCIM issues (#77424, obsoletes tk-scim.patch)
 - Speeds up photo image updates.
 - Fixes a crash in animated GIFs.
-* Wed Aug 16 2006 - aj@suse.de
+* Wed Aug 16 2006 aj@suse.de
 - Replace xorg-x11-devel BuildRequires with really needed libs.
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Wed Jan 04 2006 - max@suse.de
+* Wed Jan 04 2006 max@suse.de
 - Finally fixed the SCIM issues (#77424).
-* Fri Dec 09 2005 - max@suse.de
+* Fri Dec 09 2005 max@suse.de
 - New version: 8.4.12.
 - Enabled support for multithreading.
-* Sun Nov 06 2005 - schwab@suse.de
+* Sun Nov 06 2005 schwab@suse.de
 - Fix syntax error in unix configure script.
-* Tue Sep 06 2005 - max@suse.de
+* Tue Sep 06 2005 max@suse.de
 - Disabled the SCIM patch, because it causes some focus problems.
 - Added a workaround that prevents Tk from using SCIM, so that at
   least normal keyboard input is possible (#77424).
-* Fri Sep 02 2005 - max@suse.de
+* Fri Sep 02 2005 max@suse.de
 - Added tk-scim.patch to improve XIM support and make Tk work
   correctly with SCIM (#77424).
-* Fri Jul 29 2005 - max@suse.de
+* Fri Jul 29 2005 max@suse.de
 - Re-added tkUnixDefault.h to tk-devel. It is needed by Tix.
-* Wed Jul 27 2005 - max@suse.de
+* Wed Jul 27 2005 max@suse.de
 - New version: 8.4.11.
-* Tue Jun 14 2005 - max@suse.de
+* Tue Jun 14 2005 max@suse.de
 - New version 8.4.10.
 - Moved script libraries to /usr/share/tcl .
-* Mon Mar 21 2005 - max@suse.de
+* Mon Mar 21 2005 max@suse.de
 - Fixed a small typo in the trigger script.
-* Mon Mar 21 2005 - max@suse.de
+* Mon Mar 21 2005 max@suse.de
 - Added prerequisites for the trigger scripts (bug #74027).
-* Fri Mar 18 2005 - max@suse.de
+* Fri Mar 18 2005 max@suse.de
 - Make sure that tk-32bit finds the script libraries when
   installed on a 64bit system.
-* Fri Dec 03 2004 - max@suse.de
+* Fri Dec 03 2004 max@suse.de
 - New version: 8.4.9
-* Mon Nov 22 2004 - max@suse.de
+* Mon Nov 22 2004 max@suse.de
 - New version: 8.4.8
-* Fri Jul 30 2004 - max@suse.de
+* Fri Jul 30 2004 max@suse.de
 - New 8.4.7 tarball with a last-minute fix for broken Compose key.
-* Wed Jul 28 2004 - max@suse.de
+* Wed Jul 28 2004 max@suse.de
 - New version: 8.4.7
-* Fri Mar 05 2004 - max@suse.de
+* Fri Mar 05 2004 max@suse.de
 - Updated to the official 8.4.6 release tarball.
-* Fri Feb 27 2004 - max@suse.de
+* Fri Feb 27 2004 max@suse.de
 - New version: 8.4.6
-* Fri Feb 06 2004 - max@suse.de
+* Fri Feb 06 2004 max@suse.de
 - Added -fno-strict-aliasing to CFLAGS.
-* Mon Feb 02 2004 - max@suse.de
+* Mon Feb 02 2004 max@suse.de
 - Building as a non-root user.
-* Thu Jan 15 2004 - max@suse.de
+* Thu Jan 15 2004 max@suse.de
 - Package Tk internal headers again. They are still needed by some
   packages (e.g. tix).
-* Mon Jan 12 2004 - max@suse.de
+* Mon Jan 12 2004 max@suse.de
 - New version: 8.4.5
 - Cleaned up the spec file.
-* Tue Sep 02 2003 - max@suse.de
+* Tue Sep 02 2003 max@suse.de
 - Disabled building of the static library to save build time and
   CD space.
-* Wed Jul 23 2003 - max@suse.de
+* Wed Jul 23 2003 max@suse.de
 - New version: 8.4.4
 - Split into tk and tk-devel.
-* Wed May 21 2003 - max@suse.de
+* Wed May 21 2003 max@suse.de
 - New version: 8.4.3
 - Removed obsolete patches.
-* Wed Mar 05 2003 - max@suse.de
+* Wed Mar 05 2003 max@suse.de
 - Updated to official 8.4.2 release tarball.
 - Added essential diff to RC1 as tk-20030305.patch.bz2.
-* Fri Feb 28 2003 - max@suse.de
+* Fri Feb 28 2003 max@suse.de
 - Updated to 8.4.2 RC1, and added an essential diff to the
   previous tarball (tk-20030227.patch.bz2).
-* Wed Feb 19 2003 - max@suse.de
+* Wed Feb 19 2003 max@suse.de
 - Updated to CVS HEAD, and added diff to previous verssion
   for completeness.
 - Fixes several bugs, see ChangeLog for details.
-* Fri Feb 07 2003 - max@suse.de
+* Fri Feb 07 2003 max@suse.de
 - Upgrade to CVS HEAD (8.4.2pre).
-* Tue Nov 26 2002 - max@suse.de
+* Tue Nov 26 2002 max@suse.de
 - Included private header files (needed for Tix).
-* Tue Nov 26 2002 - max@suse.de
+* Tue Nov 26 2002 max@suse.de
 - New version: 8.4.1
 - Added tk-HEAD.patch with fixes that went in after the release.
 - Moved the Tk sources back into a separate package, now that Tk
   can be built without access to the Tcl source tree.
 - For the changes of the last four years see tcl.changes in the
   tcl package.
-* Tue Nov 24 1998 - max@suse.de
+* Tue Nov 24 1998 max@suse.de
 - merged spec-files into tcl_new.spec
-* Mon Nov 23 1998 - max@suse.de
+* Mon Nov 23 1998 max@suse.de
 - new version: 8.0.4
 - cleand up softlinks and compression for man pages
-* Thu Jan 08 1998 - hf@suse.de
+* Thu Jan 08 1998 hf@suse.de
 - bugfix for missing tkConfig8.0.sh
-* Mon Nov 10 1997 - hf@suse.de
+* Mon Nov 10 1997 hf@suse.de
 - new version 8.0p1
-* Wed Oct 15 1997 - hf@suse.de
+* Wed Oct 15 1997 hf@suse.de
 - ready for autobuild
-* Thu Jul 03 1997 - hf@suse.de
+* Thu Jul 03 1997 hf@suse.de
 - A new version 8.0b2. The second (and probably last) beta release of
   Tk 8.0.
-* Tue Jun 03 1997 - hf@suse.de
+* Tue Jun 03 1997 hf@suse.de
 - added static librs and all links for the manpages in
   the /usr/doc/packages/tk8.0/man
-* Fri May 16 1997 - hf@suse.de
+* Fri May 16 1997 hf@suse.de
 - added new link
-* Mon May 12 1997 - hf@suse.de
+* Mon May 12 1997 hf@suse.de
 - added new patch invisible.patch
-* Tue Apr 15 1997 - hf@suse.de
+* Tue Apr 15 1997 hf@suse.de
 - Manpages hardlinks removed and added softlinks to compressd manpages
 - The new directory for the manpages is /usr/doc/packeges/tcl8.0/man

tk8.4.15-src.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ddfc7584091dab2d51eb79dd992fbec17db41e7ca7a05bd4043f5a71dcebefc0
-size 2664091

tk8.5.2-src.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5dd4fa15dbe6072713b8d921caca4169ecc4de3d41547e1a0e95963f1ef822da
+size 3015395