rpms/iwidgets/devel iwidgets-4.0.2-upgrade.patch, NONE, 1.1 iwidgets.spec, 1.3, 1.4
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Sat Jan 12 03:13:40 UTC 2008
- Previous message (by thread): rpms/snownews/devel .cvsignore,1.4,1.5 sources,1.4,1.5
- Next message (by thread): rpms/snownews/devel snownews-1.5.7-charset.patch, 1.2, 1.3 snownews.spec, 1.11, 1.12 snownews-1.5.7-manpath.patch, 1.1, NONE snownews-1.5.7-softlink.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: wart
Update of /cvs/extras/rpms/iwidgets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14728
Modified Files:
iwidgets.spec
Added Files:
iwidgets-4.0.2-upgrade.patch
Log Message:
Update to 4.0.2 with patch from CVS
iwidgets-4.0.2-upgrade.patch:
--- NEW FILE iwidgets-4.0.2-upgrade.patch ---
? iwidgets-head.patch
Index: CHANGES
===================================================================
RCS file: /cvsroot/incrtcl/iwidgets/CHANGES,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CHANGES 13 Sep 2002 21:31:52 -0000 1.5
+++ CHANGES 17 Sep 2002 07:10:50 -0000 1.6
@@ -1,5 +1,13 @@
[incr Widgets] CHANGES
----------------------
+==========================================================================
+CURRENT VERSION: 4.0.2
+PREVIOUS VERSION: 4.0.1
+
+
+
+
+
==========================================================================
CURRENT VERSION: 4.0.1
Index: ChangeLog
===================================================================
RCS file: /cvsroot/incrtcl/iwidgets/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.33
diff -u -r1.20 -r1.33
--- ChangeLog 16 Sep 2002 00:49:01 -0000 1.20
+++ ChangeLog 10 Jun 2007 19:35:04 -0000 1.33
@@ -1,6 +1,70 @@
-=-=-=-=-=-=-=-=-=-=-= BEGIN IWIDGETS 4.0.1 CHANGES =-=-=-=-=-=-=-=-=-=-=-
+2007-06-10 Jeff Hobbs <jeffh at ActiveState.com>
+
+ * generic/shell.itk (::iwidgets::shell): fix problem with "tkwait
+ visibility" in iwidget's dialog box (allaert)
+
+ * generic/pushbutton.itk (::iwidgets::pushbutton): handle Tk 8.4
+ frame padx/y changes.
+
+ * iwidgets.tcl.in: don't add non-existent path to auto_path
+
+ * generic/datefield.itk (::iwidgets::datefield): use string match
+ instead of regexp
+
+2007-05-24 Jeff Hobbs <jeffh at ActiveState.com>
+
+ * generic/combobox.itk: use -state readonly for combobox.
+ [Bug 998874] (griffin)
+
+ * generic/calendar.itk: 8.5-compatible last day of month
+ calculation. [Bug 1311531] (broeken)
+
+ * demos/catalog: make location independent. [Bug 1631754] (kupries)
+
+2006-04-11 Jeff Hobbs <jeffh at ActiveState.com>
+
+ * generic/extfileselectionbox.itk
+ (iwidgets::Extfileselectionbox::_setDirList): set currentIndex to
+ default value
+
+2005-04-11 Jeff Hobbs <jeffh at ActiveState.com>
+
+ * configure, tclconfig/tcl.m4: TEA 3.2 update
+ * configure.in (AC_PROG_INSTALL): add back @INSTALL*@ check
+
+2005-01-24 Jeff Hobbs <jeffh at ActiveState.com>
+
+ * tclconfig/install-sh, tclconfig/tcl.m4 (new):
+ * tcl.m4 (removed):
+ * Makefile.in, aclocal.m4: Updated to TEA 3.1 build system
+ * configure, configure.in:
+ * iwidgets.tcl.in, pkgIndex.tcl.in:
+
+2002-10-25 Andreas Kupries <andreask at activestate.com>
+
+ * configure.in: Added determination of EXEEXT or else
+ SC_PROG_TCLSH may pick up the wrong file as executable (In my
+ case it mistook tclsh83g.pdb for the tclsh).
+ Regen'd configure.
+
+2002-09-25 Jeff Hobbs <jeffh at ActiveState.com>
+
+ * Makefile.in: improved libdir support (steffen)
+
+2002-09-22 Marty Backe <marty at lucidway.org>
+ * generic/shell.itk: SF ticket 611739
+ Changed _return from a private to protected.
+ * generic/entryfield.itk
+ <Return> bindings are now passed to the parent unless the -command
+ option is defined.
+
2002-09-09 Chad Smith <csmith at adc.com>
- * Makefile.in: SF ticket 227921
+
+ ********************************
+ **** IWIDGETS 4.0.1 RELEASE ****
+ ********************************
+
+ * Makefile.in: SF ticket 227921
Updated man page installation such that "iwidgets_" is now
prepended to the man page filename. This is done to avoid
naming conflicts with man pages in other extensions.
@@ -200,9 +264,12 @@
Had to do an "undo" of some previous code that was causing an
infinite resizing on <Configure> events.
-=-=-=-=-=-=-=-=-=-=-= END IWIDGETS 4.0.1 CHANGES =-=-=-=-=-=-=-=-=-=-=-=-
-
2001-08-07 Chad Smith <csmith at adc.com>
+
+ ********************************
+ **** IWIDGETS 4.0.0 RELEASE ****
+ ********************************
+
* Merged iwidgets_overhaul branch to CVS head. This branch
included all modifications necessary to extract the iwidgets
from the itcl distribution.
@@ -1293,15 +1360,15 @@
pasting text.
* generic/entryfield.itk:
- 1) Added a new configuration option, -pasting, which allows the user to
- disable pasting text into the entry component of the entryfield.
- Previously, when using -validate, the user was allowed to paste text
- which could cause stack dumps into the entryfield because pasting was
- not caught. The user, for instance, could paste a 40 digit number and
- kill any expr's since the integer is too large for tcl to handle.
- 2) The _keyPress method hardcoded state comparisons for <Ctrl>, <Alt>,
- <NumLock><Ctrl>, and <NumLock><Alt>. The problem was that these
- hardcoded values were UNIX-specific. I added platform-independant code.
+ 1) Added a new configuration option, -pasting, which allows the user to
+ disable pasting text into the entry component of the entryfield.
+ Previously, when using -validate, the user was allowed to paste text
+ which could cause stack dumps into the entryfield because pasting was
+ not caught. The user, for instance, could paste a 40 digit number and
+ kill any expr's since the integer is too large for tcl to handle.
+ 2) The _keyPress method hardcoded state comparisons for <Ctrl>, <Alt>,
+ <NumLock><Ctrl>, and <NumLock><Alt>. The problem was that these
+ hardcoded values were UNIX-specific. I added platform-independant code.
* CHANGES:
Added to entries under the Entryfield section: 1) documented new configuration
@@ -1330,21 +1397,18 @@
1999-01-25 stanton
* unix/iwidgets.tcl.in:
* win/iwidgets.tcl:
- Changed so iwidgets.tcl does a "namespace import -force itcl::*"
- This is a hack to get around the fact that iwidgets uses "class"
- instead of "itcl::class". The correct long term solution is to change
- all of the iwidgets code to use qualified names.
+ Changed so iwidgets.tcl does a "namespace import -force itcl::*"
+ This is a hack to get around the fact that iwidgets uses "class"
+ instead of "itcl::class". The correct long term solution is to change
+ all of the iwidgets code to use qualified names.
1998-12-22 rjohnson
- * demos/watch:
-
- Fixed bug in watch demo.
+ * demos/watch: Fixed bug in watch demo.
1998-12-18 rjohnson
* demos/catalog:
-
- Removed the mainwindow demo from the catalog demo. It was not a well
- behaved demo and running would break the catalog demo. [Bug ID: 508]
+ Removed the mainwindow demo from the catalog demo. It was not a well
+ behaved demo and running would break the catalog demo. [Bug ID: 508]
1998-09-14 stanton
* demos/images/clear.gif:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/incrtcl/iwidgets/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.15
diff -u -r1.13 -r1.15
--- Makefile.in 10 Sep 2002 21:27:21 -0000 1.13
+++ Makefile.in 25 Jan 2005 00:47:52 -0000 1.15
@@ -5,12 +5,11 @@
# script generated by the "autoconf" program (constructs like
# "@foo@" will get replaced in the actual Makefile.
#
-# RCS: $Id: Makefile.in,v 1.13 2002/09/10 21:27:21 smithc Exp $
+# RCS: $Id: Makefile.in,v 1.15 2005/01/25 00:47:52 hobbs Exp $
# Current [incr Widgets] version; used in various names.
ITCL_VERSION = @ITCL_VERSION@
-IWIDGETS_VERSION = @VERSION@
#----------------------------------------------------------------
# Things you can change to personalize the Makefile for your own
@@ -19,58 +18,11 @@
# the configuration script).
#----------------------------------------------------------------
[...4385 lines suppressed...]
+ regsub -all "%P" "$cmd" [list [_peek $char]] cmd
+ regsub -all "%S" "$cmd" [list [get]] cmd
+ regsub -all "%c" "$cmd" [list $char] cmd
regsub -all {\\} "$cmd" {\\\\} cmd
- set valid [uplevel #0 $cmd]
+ set valid [uplevel #0 $cmd]
- if {($valid == "") || ([regexp 0|false|off|no $valid])} {
- uplevel #0 $itk_option(-invalid)
- return -code break 0
- }
+ if {($valid == "") || ([regexp 0|false|off|no $valid])} {
+ uplevel #0 $itk_option(-invalid)
+ return -code break 0
+ }
}
return -code continue 1
@@ -586,18 +593,18 @@
# specified by the -fixed option.
# ------------------------------------------------------------------
itcl::body iwidgets::Entryfield::_checkLength {} {
- if {$itk_option(-fixed) != 0} {
- if [catch {::selection get -selection CLIPBOARD} pending] {
- # Nothing in the clipboard. Check the primary selection.
- if [catch {::selection get -selection PRIMARY} pending] {
- # Nothing here either. Goodbye.
- return
- }
- }
- set len [expr {[string length $pending] + [string length [get]]}]
- if {$len > $itk_option(-fixed)} {
- uplevel #0 $itk_option(-invalid)
- return -code break 0
+ if {$itk_option(-fixed) != 0} {
+ if {[catch {::selection get -selection CLIPBOARD} pending]} {
+ # Nothing in the clipboard. Check the primary selection.
+ if {[catch {::selection get -selection PRIMARY} pending]} {
+ # Nothing here either. Goodbye.
+ return
+ }
+ }
+ set len [expr {[string length $pending] + [string length [get]]}]
+ if {$len > $itk_option(-fixed)} {
+ uplevel #0 $itk_option(-invalid)
+ return -code break 0
+ }
}
- }
}
Index: generic/extfileselectionbox.itk
===================================================================
RCS file: /cvsroot/incrtcl/iwidgets/generic/extfileselectionbox.itk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- generic/extfileselectionbox.itk 10 Mar 2002 07:34:51 -0000 1.5
+++ generic/extfileselectionbox.itk 11 Apr 2006 19:50:38 -0000 1.6
@@ -11,7 +11,7 @@
# AUTHOR: Mark L. Ulferts EMAIL: mulferts at spd.dsccc.com
# Anthony L. Parent tony.parent at symbios.com
#
-# @(#) $Id: extfileselectionbox.itk,v 1.5 2002/03/10 07:34:51 mgbacke Exp $
+# @(#) $Id: extfileselectionbox.itk,v 1.6 2006/04/11 19:50:38 hobbs Exp $
# ----------------------------------------------------------------------
# Copyright (c) 1997 DSC Technologies Corporation
# ======================================================================
@@ -797,11 +797,11 @@
itcl::body iwidgets::Extfileselectionbox::_setDirList {} {
$itk_component(dirs) clear
+ set currentIndex ""
if {$itk_option(-dirsearchcommand) == {}} {
set cwd "$_pwd"
- set counter 0
- set currentIndex ""
+ set counter 0
foreach i [lsort [glob -nocomplain \
[file join $cwd .*] [file join $cwd *]]] {
if {[file isdirectory $i]} {
Index: generic/pushbutton.itk
===================================================================
RCS file: /cvsroot/incrtcl/iwidgets/generic/pushbutton.itk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- generic/pushbutton.itk 17 Aug 2001 19:03:44 -0000 1.3
+++ generic/pushbutton.itk 10 Jun 2007 19:28:30 -0000 1.4
@@ -11,7 +11,7 @@
# AUTHOR: Mark L. Ulferts EMAIL: mulferts at austin.dsccc.com
# Bret A. Schuhmacher EMAIL: bas at wn.com
#
-# @(#) $Id: pushbutton.itk,v 1.3 2001/08/17 19:03:44 smithc Exp $
+# @(#) $Id: pushbutton.itk,v 1.4 2007/06/10 19:28:30 hobbs Exp $
# ----------------------------------------------------------------------
# Copyright (c) 1995 DSC Technologies Corporation
# ======================================================================
@@ -100,19 +100,24 @@
itk_option add hull.borderwidth hull.relief
itk_option add hull.highlightcolor
itk_option add hull.highlightbackground
-
- component hull configure \
+
+ if {$::tk_version > 8.3} {
+ # Tk 8.4+ frame -padx -pady options creates inadvertant margin box
+ component hull configure -padx 0 -pady 0 \
-borderwidth [$this cget -borderwidth]
-
+ } else {
+ component hull configure -borderwidth [$this cget -borderwidth]
+ }
+
pack propagate $itk_component(hull) no
itk_component add pushbutton {
button $itk_component(hull).pushbutton \
} {
usual
- keep -underline -wraplength -state -command
+ keep -underline -wraplength -state -command
}
- pack $itk_component(pushbutton) -expand 1 -fill both
+ pack $itk_component(pushbutton) -expand 1 -fill both
#
# Initialize the widget based on the command line options.
Index: generic/scrolledhtml.itk
===================================================================
RCS file: /cvsroot/incrtcl/iwidgets/generic/scrolledhtml.itk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- generic/scrolledhtml.itk 16 Feb 2002 05:11:08 -0000 1.7
+++ generic/scrolledhtml.itk 2 Dec 2004 17:49:18 -0000 1.8
@@ -42,7 +42,7 @@
# ----------------------------------------------------------------------
# AUTHOR: Kris Raney EMAIL: kraney at spd.dsccc.com
#
-# @(#) $Id: scrolledhtml.itk,v 1.7 2002/02/16 05:11:08 mgbacke Exp $
+# @(#) $Id: scrolledhtml.itk,v 1.8 2004/12/02 17:49:18 davygrvy Exp $
# ----------------------------------------------------------------------
# Copyright (c) 1996 DSC Technologies Corporation
# ======================================================================
@@ -1418,7 +1418,7 @@
if {![regexp {^[+-].*} $ar(size)]} {
set _pointsndx $ar(size)
} else {
- set _pointsndx [expr {$_basefontsize $ar(size)}]
+ set _pointsndx [expr $_basefontsize $ar(size)]
}
if { $_pointsndx > 6 } {
set _pointsndx 6
Index: generic/shell.itk
===================================================================
RCS file: /cvsroot/incrtcl/iwidgets/generic/shell.itk,v
retrieving revision 1.7
retrieving revision 1.9
diff -u -r1.7 -r1.9
--- generic/shell.itk 25 Feb 2002 06:43:26 -0000 1.7
+++ generic/shell.itk 10 Jun 2007 19:35:04 -0000 1.9
@@ -8,7 +8,7 @@
# AUTHOR: Mark L. Ulferts EMAIL: mulferts at austin.dsccc.com
# Kris Raney EMAIL: kraney at spd.dsccc.com
#
-# @(#) $Id: shell.itk,v 1.7 2002/02/25 06:43:26 mgbacke Exp $
+# @(#) $Id: shell.itk,v 1.9 2007/06/10 19:35:04 hobbs Exp $
# ----------------------------------------------------------------------
# Copyright (c) 1996 DSC Technologies Corporation
# ======================================================================
@@ -60,7 +60,8 @@
public method deactivate {args}
public method center {{widget {}}}
- private variable _result {} ;# Resultant value for modal activation.
+ protected variable _result {} ;# Resultant value for modal activation.
+
private variable _busied {} ;# List of busied top level widgets.
common grabstack {}
@@ -243,6 +244,17 @@
raise $itk_component(hull)
wm deiconify $itk_component(hull)
tkwait visibility $itk_component(hull)
+ # For some mysterious reason, Tk sometimes returns too late from the
+ # "tkwait visibility", i.e. after the "deactivate" method was invoked,
+ # i.e. after the dialog window already disappeared. This would lead to
+ # an infinite vwait on _wait($this) further on. Trap this case.
+ # See also 2002-03-15 message to the Tcl/Tk newsgroup.
+ # Remark that tests show that if "raise" is given *after* "deiconify"
+ # (see above), "tkwait visibility" always returns duly on time.....
+ if {![winfo ismapped $itk_component(hull)]} {
+ # means "deactivate" went already through the grab-release stuff.
+ return $_result
+ }
# Need to flush the event loop. This line added as a result of
# SF ticket #227885.
Index: iwidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/iwidgets/devel/iwidgets.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iwidgets.spec 20 Aug 2007 14:51:50 -0000 1.3
+++ iwidgets.spec 12 Jan 2008 03:13:04 -0000 1.4
@@ -1,6 +1,9 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%{tcl_version}}
+
Name: iwidgets
-Version: 4.0.1
-Release: 5%{?dist}
+Version: 4.0.2
+Release: 1%{?dist}
Summary: A set of useful widgets based on itcl and itk
Group: Development/Libraries
@@ -10,7 +13,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: itk
+Requires: tcl(abi) = 8.5 itk
+BuildRequires: tcl
%description
A set of useful widgets based on itcl and itk.
@@ -28,29 +32,29 @@
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}
-install -p -m 644 generic/*.* $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}
-install -p -m 644 generic/tclIndex $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}
-install -p -m 644 iwidgets.tcl $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}
-install -p -m 644 pkgIndex.tcl $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}
+mkdir -p $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}
+install -p -m 644 generic/*.* $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}
+install -p -m 644 generic/tclIndex $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}
+install -p -m 644 iwidgets.tcl $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}
+install -p -m 644 pkgIndex.tcl $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/demos
+mkdir -p $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos
for i in demos/* ; do
if [ -f $i ] ; then
- install -p -m 644 $i $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/demos
+ install -p -m 644 $i $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos
fi
done
-chmod 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/demos/catalog
+chmod 755 $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos/catalog
# Remove rpmlint warning.
-chmod 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/demos/scopedobject
+chmod 755 $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos/scopedobject
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/demos/images
-install -p -m 644 demos/images/*.* $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/demos/images
+mkdir -p $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos/images
+install -p -m 644 demos/images/*.* $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos/images
# These html pages are part of the demonstration scripts, so they aren't
# packaged with the rest of the documentation.
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/demos/html
-install -p -m 644 demos/html/*.html $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/demos/html
+mkdir -p $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos/html
+install -p -m 644 demos/html/*.html $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos/html
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/mann
install -p -m 644 doc/*.n $RPM_BUILD_ROOT/%{_mandir}/mann/
@@ -65,11 +69,15 @@
%files
%defattr(-,root,root,-)
-%{_datadir}/iwidgets%{version}
+%{tcl_sitelib}/iwidgets%{version}
%{_mandir}/mann/*
%doc README license.terms doc/iwidgets.ps
%changelog
+* Fri Jan 11 2008 Wart <wart at kobold.org> - 4.0.2-1
+- Update to 4.0.2 using a patch from CVS
+- Rebuild for tcl 8.5
+
* Sun Aug 19 2007 Wart <wart at kobold.org> - 4.0.1-5
- License tag clarification
- Better download URL
- Previous message (by thread): rpms/snownews/devel .cvsignore,1.4,1.5 sources,1.4,1.5
- Next message (by thread): rpms/snownews/devel snownews-1.5.7-charset.patch, 1.2, 1.3 snownews.spec, 1.11, 1.12 snownews-1.5.7-manpath.patch, 1.1, NONE snownews-1.5.7-softlink.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list