Hello community,
here is the log from the commit of package yast2-ncurses
checked in at Wed Jan 30 03:59:25 CET 2008.
--------
--- yast2-ncurses/yast2-ncurses.changes 2008-01-18 18:10:17.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2008-01-29 20:10:23.028102000 +0100
@@ -1,0 +2,16 @@
+Tue Jan 29 20:04:53 CET 2008 - sh@suse.de
+
+- YCP-less event handling
+- V 2.16.12
+
+-------------------------------------------------------------------
+Tue Jan 29 15:50:37 CET 2008 - kmachalkova@suse.cz
+
+- Delete any leftover dialogs (popups, menus) on exit from package
+ selector (bnc#354712)
+- Moved BusyIndicator widget handling to idleLoop, do not use signals
+ as they may freeze yast (libncurses and malloc are not signal-safe)
+ (bnc#355562)
+- 2.16.11
+
+-------------------------------------------------------------------
Old:
----
yast2-ncurses-2.16.10.tar.bz2
New:
----
yast2-ncurses-2.16.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.y17534/_old 2008-01-30 03:58:33.000000000 +0100
+++ /var/tmp/diff_new_pack.y17534/_new 2008-01-30 03:58:33.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ncurses (Version 2.16.10)
+# spec file for package yast2-ncurses (Version 2.16.12)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-ncurses
-Version: 2.16.10
+Version: 2.16.12
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-2.16.10.tar.bz2
+Source0: yast2-ncurses-2.16.12.tar.bz2
Prefix: /usr
BuildRequires: dejagnu doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools
BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel
@@ -32,8 +32,8 @@
Provides: y2curses
Obsoletes: y2curses
Requires: glibc-locale
-BuildRequires: yast2-core-devel >= 2.16.15
-Requires: yast2-core >= 2.16.15
+BuildRequires: yast2-core-devel >= 2.16.24
+Requires: yast2-core >= 2.16.24
#adapted to libzypp 3.11 refactoring
Requires: libzypp >= 3.11.8
#FSize.h and YRpmGroupsTree.h moved to libyui
@@ -46,7 +46,7 @@
%prep
-%setup -n yast2-ncurses-2.16.10
+%setup -n yast2-ncurses-2.16.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -81,6 +81,16 @@
/usr/share/YaST2/data/you_layout.ycp
%doc %{prefix}/share/doc/packages/yast2-ncurses
%changelog
+* Tue Jan 29 2008 sh@suse.de
+- YCP-less event handling
+- V 2.16.12
+* Tue Jan 29 2008 kmachalkova@suse.cz
+- Delete any leftover dialogs (popups, menus) on exit from package
+ selector (bnc#354712)
+- Moved BusyIndicator widget handling to idleLoop, do not use signals
+ as they may freeze yast (libncurses and malloc are not signal-safe)
+ (bnc#355562)
+- 2.16.11
* Fri Jan 18 2008 kmachalkova@suse.cz
- Running separate UI-thread re-enabled (adjusted idleLoop, file
descriptor saving/restoring) (bug #164999, FaTE #301899)
@@ -728,7 +738,7 @@
* Mon Mar 15 2004 gs@suse.de
- V 2.9.15
- show license (EULA), bug #33584
-* Fri Mar 12 2004 sh@suse.de
+* Sat Mar 13 2004 sh@suse.de
- V 2.9.14
- Adapted to const ref fix in libyui for all widget constructors
* Fri Mar 12 2004 gs@suse.de
@@ -1139,7 +1149,7 @@
* Tue Jun 19 2001 kkaempf@suse.de
- implement callback mechanism
- version 2.4.1
-* Fri May 11 2001 kendy@suse.cz
+* Sat May 12 2001 kendy@suse.cz
- version 2.3.12
- fixed switching of fonts: czech language was unreadable
(not reported bug)
++++++ yast2-ncurses-2.16.10.tar.bz2 -> yast2-ncurses-2.16.12.tar.bz2 ++++++
++++ 10640 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.10/configure.in new/yast2-ncurses-2.16.12/configure.in
--- old/yast2-ncurses-2.16.10/configure.in 2007-11-19 16:37:53.000000000 +0100
+++ new/yast2-ncurses-2.16.12/configure.in 2008-01-29 20:08:23.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ncurses
dnl
-dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ncurses, 2.16.1, http://bugs.opensuse.org/, yast2-ncurses)
+AC_INIT(yast2-ncurses, 2.16.12, http://bugs.opensuse.org/, yast2-ncurses)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -14,10 +14,11 @@
AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
+dnl long filenames; we use GNU Make extensions and that's ok
+AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.1"
+VERSION="2.16.12"
RPMNAME="yast2-ncurses"
MAINTAINER="Katarina Machalkova "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.10/COPYRIGHT.english new/yast2-ncurses-2.16.12/COPYRIGHT.english
--- old/yast2-ncurses-2.16.10/COPYRIGHT.english 2008-01-18 18:01:54.000000000 +0100
+++ new/yast2-ncurses-2.16.12/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.10/Makefile.am new/yast2-ncurses-2.16.12/Makefile.am
--- old/yast2-ncurses-2.16.10/Makefile.am 2007-11-19 16:37:54.000000000 +0100
+++ new/yast2-ncurses-2.16.12/Makefile.am 2008-01-29 20:08:23.000000000 +0100
@@ -23,13 +23,14 @@
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
-COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
+COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
+# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.10/missing new/yast2-ncurses-2.16.12/missing
--- old/yast2-ncurses-2.16.10/missing 2007-11-19 16:38:26.000000000 +0100
+++ new/yast2-ncurses-2.16.12/missing 2008-01-29 20:08:41.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,8 +33,6 @@
fi
run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -46,7 +44,7 @@
msg="missing on your system"
-case $1 in
+case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -79,7 +77,6 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case $1 in
+case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -138,7 +135,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -167,7 +164,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case $f in
+ case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +214,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,18 +244,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -270,9 +267,11 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
@@ -290,17 +289,11 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -324,13 +317,13 @@
fi
firstarg="$1"
if shift; then
- case $firstarg in
+ case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case $firstarg in
+ case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.10/src/NCBusyIndicator.cc new/yast2-ncurses-2.16.12/src/NCBusyIndicator.cc
--- old/yast2-ncurses-2.16.10/src/NCBusyIndicator.cc 2008-01-18 17:44:04.000000000 +0100
+++ new/yast2-ncurses-2.16.12/src/NCBusyIndicator.cc 2008-01-29 17:24:12.000000000 +0100
@@ -50,8 +50,9 @@
struct itimerval interval;
NCBusyIndicator* NCBusyIndicatorObject;
+#if 0
void NCBusyIndicatorHandlerWrapper(int sig_num);
-
+#endif
///////////////////////////////////////////////////////////////////
//
@@ -86,10 +87,12 @@
_timer_divisor = (double) REPAINT_INTERVAL / (double) timeout;
_timer_progress=0;
+#if 0
signal(SIGALRM, NCBusyIndicatorHandlerWrapper);
interval.it_value.tv_sec=0;
interval.it_value.tv_usec=REPAINT_INTERVAL * 1000;
setitimer(ITIMER_REAL, &interval, NULL);
+#endif
}
///////////////////////////////////////////////////////////////////
@@ -102,7 +105,7 @@
//
NCBusyIndicator::~NCBusyIndicator()
{
- signal(SIGALRM, SIG_IGN);
+ NCBusyIndicatorObject = NULL;
delete _lwin;
delete _twin;
WIDDBG << endl;
@@ -248,9 +251,12 @@
_alive=false;
}
update();
+
+ #if 0
interval.it_value.tv_sec=0;
interval.it_value.tv_usec=REPAINT_INTERVAL * 1000;
setitimer(ITIMER_REAL, &interval, NULL);
+ #endif
}
@@ -262,12 +268,14 @@
//
// DESCRIPTION : static wrapper for member function handler
//
+#if 0
void NCBusyIndicatorHandlerWrapper(int sig_num)
{
signal(SIGALRM, SIG_IGN);
NCBusyIndicatorObject->handler(sig_num);
signal(SIGALRM, NCBusyIndicatorHandlerWrapper);
}
+#endif
///////////////////////////////////////////////////////////////////
//
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.10/src/NCDialog.cc new/yast2-ncurses-2.16.12/src/NCDialog.cc
--- old/yast2-ncurses-2.16.10/src/NCDialog.cc 2008-01-15 16:35:39.000000000 +0100
+++ new/yast2-ncurses-2.16.12/src/NCDialog.cc 2008-01-29 11:57:10.000000000 +0100
@@ -1397,7 +1397,7 @@
{
YWidget * w = dynamic_cast (c->Value() );
- if ( w && w->hasFunctionKey() )
+ if ( w && w->hasFunctionKey() && w->isEnabled() )
{
// Retrieve the widget's "shortcut property" that describes
// whatever it is - regardless of widget type (PushButton, ...)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.10/src/NCPackageSelectorPlugin.cc new/yast2-ncurses-2.16.12/src/NCPackageSelectorPlugin.cc
--- old/yast2-ncurses-2.16.10/src/NCPackageSelectorPlugin.cc 2007-11-23 20:45:23.000000000 +0100
+++ new/yast2-ncurses-2.16.12/src/NCPackageSelectorPlugin.cc 2008-01-29 19:59:31.000000000 +0100
@@ -22,6 +22,7 @@
#include
#include "NCPackageSelectorStart.h"
#include "NCPkgTable.h"
+#include "YNCursesUI.h" // NCtoY2Event
#define y2log_component "ncurses-ui"
@@ -124,12 +125,12 @@
//
//
// METHOD NAME : NCPackageSelectorPLugin::runPkgSelection
-// METHOD TYPE : void
+// METHOD TYPE : YEvent *
//
// DESCRIPTION : Implementation of UI builtin RunPkgSelection() which
// has to be called after OpenDialog( `PackageSelector() ).
//
-YCPValue NCPackageSelectorPlugin::runPkgSelection( YDialog * dialog,
+YEvent * NCPackageSelectorPlugin::runPkgSelection( YDialog * dialog,
YWidget * selector )
{
NCPackageSelectorStart * ncSelector = 0;
@@ -139,12 +140,12 @@
if ( !dialog )
{
UIERR << "ERROR package selection: No dialog existing." << endl;
- return YCPVoid();
+ return 0;
}
if ( !selector )
{
UIERR << "ERROR package selection: No package selector existing." << endl;
- return YCPVoid();
+ return 0;
}
ncSelector = dynamic_cast( selector );
@@ -153,13 +154,13 @@
// start event loop
NCursesEvent event = NCursesEvent::cancel;
+ NCDialog * ncd = static_cast( dialog );
if ( ncSelector )
{
try
{
ncSelector->showDefaultList();
- NCDialog * ncd = static_cast( dialog );
NCMIL << "NCDialog: " << ncd << endl;
do
{
@@ -183,14 +184,19 @@
UIERR << "No NCPackageSelectorStart existing" << endl;
}
- YDialog::deleteTopmostDialog();
if ( event.result != "" )
{
+ // Before returning some value to the YCP client,
+ // we must delete (==close) any leftover dialogs,
+ // Wizard will not do it for us (#354712)
+ while( YDialog::topmostDialog() != dialog ) {
+ YDialog::deleteTopmostDialog();
+ }
NCMIL << "Return value: " << event.result << endl;
- return YCPSymbol( event.result );
+ return new YMenuEvent( event.result );
}
else
- return YCPVoid();
+ return new YCancelEvent();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.10/src/NCPackageSelectorPlugin.h new/yast2-ncurses-2.16.12/src/NCPackageSelectorPlugin.h
--- old/yast2-ncurses-2.16.10/src/NCPackageSelectorPlugin.h 2007-11-19 18:09:02.000000000 +0100
+++ new/yast2-ncurses-2.16.12/src/NCPackageSelectorPlugin.h 2008-01-29 19:33:08.000000000 +0100
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
@@ -58,7 +59,7 @@
/**
* Fills the PackageSelector widget (runs the package selection).
*/
- virtual YCPValue runPkgSelection( YDialog *currentDialog,
+ virtual YEvent * runPkgSelection( YDialog *currentDialog,
YWidget * packageSelector );
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.10/src/pkg/NCPackageSelector.cc new/yast2-ncurses-2.16.12/src/pkg/NCPackageSelector.cc
--- old/yast2-ncurses-2.16.10/src/pkg/NCPackageSelector.cc 2008-01-18 17:44:04.000000000 +0100
+++ new/yast2-ncurses-2.16.12/src/pkg/NCPackageSelector.cc 2008-01-29 17:57:27.000000000 +0100
@@ -57,6 +57,7 @@
#include "YWidgetID.h"
#include "YCPDialogParser.h"
+#include "YCPMenuItem.h"
#include "YCPValueWidgetID.h"
#include "YPackageSelector.h"
@@ -495,22 +496,15 @@
string NCPackageSelector::getMenuId( YMenuItem *menuItem )
{
- string id;
- YMenuEvent * menuEvent;
-
- if ( !menuItem )
- return id;
-
- menuEvent = new YMenuEvent( menuItem );
- if ( menuEvent )
+ if ( menuItem )
{
- YCPValue selectionId = menuEvent->id();
- id = selectionId->toString();
+ YCPMenuItem * ycpMenuItem = dynamic_cast ( menuItem );
- delete menuEvent;
+ if ( ycpMenuItem )
+ return ycpMenuItem->id()->toString();
}
- return id;
+ return "";
}
///////////////////////////////////////////////////////////////////
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.10/src/YNCursesUI.cc new/yast2-ncurses-2.16.12/src/YNCursesUI.cc
--- old/yast2-ncurses-2.16.10/src/YNCursesUI.cc 2008-01-18 17:44:04.000000000 +0100
+++ new/yast2-ncurses-2.16.12/src/YNCursesUI.cc 2008-01-29 20:01:09.000000000 +0100
@@ -162,6 +162,10 @@
if (currentDialog) {
NCDialog * ncd = static_cast( currentDialog );
if( ncd ) {
+ extern NCBusyIndicator* NCBusyIndicatorObject;
+ if (NCBusyIndicatorObject)
+ NCBusyIndicatorObject->handler(0);
+
ncd->idleInput();
}
}
@@ -275,7 +279,6 @@
ncd->activate ( false );
YEvent * yevent = cevent.propagate();
- UIDBG << "Returning event: " << ( yevent ? yevent->ycpEvent()->toString().c_str() : "(nil)" ) << endl;
return yevent;
}
@@ -301,9 +304,6 @@
YEvent * yevent = cevent.propagate();
- if ( yevent )
- UIDBG << "Returning event: " << yevent->ycpEvent()->toString() << endl;
-
return yevent;
}
@@ -371,14 +371,14 @@
//
//
// METHOD NAME : YNCursesUI::runPkgSelection
-// METHOD TYPE : YCPValue
+// METHOD TYPE : YEvent *
//
// DESCRIPTION : Implementation of UI builtin RunPkgSelection() which
// has to be called after OpenDialog( `PackageSelector() ).
//
-YCPValue YNCursesUI::runPkgSelection( YWidget * selector )
+YEvent * YNCursesUI::runPkgSelection( YWidget * selector )
{
- YCPValue result = YCPVoid();
+ YEvent * event = 0;
YDialog *dialog = YDialog::currentDialog();
NCPackageSelectorPlugin * plugin = packageSelectorPlugin();
@@ -386,12 +386,12 @@
if ( !dialog )
{
UIERR << "ERROR package selection: No dialog rexisting." << endl;
- return YCPVoid();
+ return 0;
}
if ( !selector )
{
UIERR << "ERROR package selection: No package selector existing." << endl;
- return YCPVoid();
+ return 0;
}
// FIXME - remove debug logging
NCMIL << "Dump current dialog in YNCursesUI::runPkgSelection" << endl;
@@ -400,10 +400,10 @@
if ( plugin )
{
- result = plugin->runPkgSelection( dialog, selector );
+ event = plugin->runPkgSelection( dialog, selector );
}
- return result;
+ return event;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.10/src/YNCursesUI.h new/yast2-ncurses-2.16.12/src/YNCursesUI.h
--- old/yast2-ncurses-2.16.10/src/YNCursesUI.h 2007-12-17 09:32:48.000000000 +0100
+++ new/yast2-ncurses-2.16.12/src/YNCursesUI.h 2008-01-29 20:01:09.000000000 +0100
@@ -132,9 +132,9 @@
virtual void closeDialog( YDialog * dialog );
/**
- * Fills the PackageSelector widget.
+ * Fills the PackageSelector widget and runs package selection.
*/
- virtual YCPValue runPkgSelection( YWidget * packageSelector );
+ virtual YEvent * runPkgSelection( YWidget * packageSelector );
/**
* UI-specific setConsoleFont() function.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.16.10/VERSION new/yast2-ncurses-2.16.12/VERSION
--- old/yast2-ncurses-2.16.10/VERSION 2008-01-18 17:47:18.000000000 +0100
+++ new/yast2-ncurses-2.16.12/VERSION 2008-01-29 20:04:44.000000000 +0100
@@ -1 +1 @@
-2.16.10
+2.16.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org