forked from pool/dialog
Accepting request 674416 from Base:System
- Update to version 1.3-20190211 + modify to work with ncurses' threaded-library, which does not allow assignment to LINES/COLS (report by Marcus Roeckrath). + correct clearing after text in progressbox from 2018/06/21 changes for resizing (reports by David Boyd, Alan Somers). + improved configure macros CF_GNU_SOURCE, CF_POSIX_C_SOURCE, CF_XOPEN_SOURCE + update config.guess, config.sub - Includes also version 1.3-20181107 + convert ja.po to UTF-8 for consistency (suggested by Stanislav Brabec). + repair mis-encoded hi.po (report/analysis by Stanislav Brabec). - Includes also version 1.3-20181022 + improved configure macros CF_CC_ENV_FLAGS, CF_LD_RPATH_OPT, CF_LIBRARY_PATH, CF_SHARED_OPTS, CF_WITH_MAN2HTML, CF_WITH_VERSIONED_SYMS from ncurses + add ast.po, from http://translationproject.org/latest/dialog/ - Includes also version 1.3-20180621 + improve file-offset computation in textbox.c (Werner Fink). + fix an overlooked case with real_auto_size() to maximize when height or width is given as -1. + build-fixes for configure options "--disable-Xdialog2" and "--disable-form" + add traces for each widget to show its parameters. + modify color scheme for mixedgauge to use the dialog window colors, like the captions. + fix a too-small malloc in the mixedgauge widget. + fix a use-after-free in dlg_remove_callback(). + improve handling of SIGWINCH for several widgets (Debian #865840). OBS-URL: https://build.opensuse.org/request/show/674416 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dialog?expand=0&rev=37
This commit is contained in:
commit
e4e1f14547
@ -2,7 +2,7 @@ Index: util.c
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- util.c.orig
|
--- util.c.orig
|
||||||
+++ util.c
|
+++ util.c
|
||||||
@@ -2115,8 +2115,10 @@ dlg_move_window(WINDOW *win, int height,
|
@@ -2176,8 +2176,10 @@ dlg_move_window(WINDOW *win, int height,
|
||||||
#ifdef HAVE_COLOR
|
#ifdef HAVE_COLOR
|
||||||
if (p->shadow != 0) {
|
if (p->shadow != 0) {
|
||||||
if (dialog_state.use_shadow) {
|
if (dialog_state.use_shadow) {
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:20139442119e2eff5c35236e8e5e313c901539008d9cccf8c8ab3851b41267e6
|
|
||||||
size 511503
|
|
@ -1,8 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
Version: GnuPG v1
|
|
||||||
Comment: See http://invisible-island.net/public/public.html for info
|
|
||||||
|
|
||||||
iEYEABECAAYFAlosSKMACgkQcCNT4Pfkjts3/ACguSHYHDsxJh1rkG0FGPbWmCmu
|
|
||||||
ib4An29irI0PskrpTxJUSxdjCqkGNar4
|
|
||||||
=e91d
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
dialog-1.3-20190211.tgz
Normal file
3
dialog-1.3-20190211.tgz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:49c0e289d77dcd7806f67056c54f36a96826a9b73a53fb0ffda1ffa6f25ea0d3
|
||||||
|
size 534749
|
8
dialog-1.3-20190211.tgz.asc
Normal file
8
dialog-1.3-20190211.tgz.asc
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
Version: GnuPG v1
|
||||||
|
Comment: See https://invisible-island.net/public/public.html for info
|
||||||
|
|
||||||
|
iEYEABECAAYFAlxiM6sACgkQcCNT4PfkjtvOiQCdGz8k8ZYMNFbHTmeGOIcSgzbx
|
||||||
|
EzYAoKouMw2wKtq7gzptztwQCMKjHE9L
|
||||||
|
=2JsW
|
||||||
|
-----END PGP SIGNATURE-----
|
1
dialog-rpmlintrc
Normal file
1
dialog-rpmlintrc
Normal file
@ -0,0 +1 @@
|
|||||||
|
addFilter(".*spurious-executable-perm.*dialog-examples/copifuncs/copi\..*")
|
@ -1,3 +1,89 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Feb 13 07:51:58 UTC 2019 - Dr. Werner Fink <werner@suse.de>
|
||||||
|
|
||||||
|
- Update to version 1.3-20190211
|
||||||
|
+ modify to work with ncurses' threaded-library, which does not allow
|
||||||
|
assignment to LINES/COLS (report by Marcus Roeckrath).
|
||||||
|
+ correct clearing after text in progressbox from 2018/06/21 changes
|
||||||
|
for resizing (reports by David Boyd, Alan Somers).
|
||||||
|
+ improved configure macros CF_GNU_SOURCE, CF_POSIX_C_SOURCE,
|
||||||
|
CF_XOPEN_SOURCE
|
||||||
|
+ update config.guess, config.sub
|
||||||
|
- Includes also version 1.3-20181107
|
||||||
|
+ convert ja.po to UTF-8 for consistency (suggested by Stanislav
|
||||||
|
Brabec).
|
||||||
|
+ repair mis-encoded hi.po (report/analysis by Stanislav Brabec).
|
||||||
|
- Includes also version 1.3-20181022
|
||||||
|
+ improved configure macros CF_CC_ENV_FLAGS, CF_LD_RPATH_OPT,
|
||||||
|
CF_LIBRARY_PATH, CF_SHARED_OPTS, CF_WITH_MAN2HTML,
|
||||||
|
CF_WITH_VERSIONED_SYMS from ncurses
|
||||||
|
+ add ast.po, from
|
||||||
|
http://translationproject.org/latest/dialog/
|
||||||
|
- Includes also version 1.3-20180621
|
||||||
|
+ improve file-offset computation in textbox.c (Werner Fink).
|
||||||
|
+ fix an overlooked case with real_auto_size() to maximize when
|
||||||
|
height or width is given as -1.
|
||||||
|
+ build-fixes for configure options "--disable-Xdialog2" and
|
||||||
|
"--disable-form"
|
||||||
|
+ add traces for each widget to show its parameters.
|
||||||
|
+ modify color scheme for mixedgauge to use the dialog window colors,
|
||||||
|
like the captions.
|
||||||
|
+ fix a too-small malloc in the mixedgauge widget.
|
||||||
|
+ fix a use-after-free in dlg_remove_callback().
|
||||||
|
+ improve handling of SIGWINCH for several widgets (Debian #865840).
|
||||||
|
+ menubox, the point of the Debian report was that it would be nice
|
||||||
|
to increase the window size if the terminal size increases. Did
|
||||||
|
that as a special case less problematic than decreasing the
|
||||||
|
terminal size. Added samples/menubox11 to demonstrate by
|
||||||
|
comparison with menubox10 a problem with debconf which puts extra
|
||||||
|
newlines in the caption that interfere with autowrap.
|
||||||
|
+ progressbox and derived prgbox, programbox, now handle resizing.
|
||||||
|
+ yesno, window was cleared
|
||||||
|
+ add dlg_ttysize() to support new options, allowing scripts to obtain
|
||||||
|
some text-formatting details without initializing the terminal.
|
||||||
|
+ add options --print-text-only, and --print-text-size for scripts that
|
||||||
|
adjust the widget size according to how the captions are formatted.
|
||||||
|
+ improve dialog.pl:
|
||||||
|
+ add demo.pl, to demonstrate the functions
|
||||||
|
+ quote/escape string parameters passed to dialog.
|
||||||
|
+ ensure all "integer" parameters are really integers.
|
||||||
|
+ use actual screensize for list captions rather than assuming 24
|
||||||
|
lines.
|
||||||
|
+ when trimming blanks, treat unconverted tabs the same as spaces.
|
||||||
|
+ correct parameter to test when trimming blanks from the script,
|
||||||
|
e.g., with "--trim" (report by Jarno Suni).
|
||||||
|
+ improve documentation of the various whitespace-filtering options,
|
||||||
|
to show which take precedence (Debian #867536, cf: Debian #102942).
|
||||||
|
+ modify msgbox.c, yesno.c to bind SCROLLKEY_BINDINGS before
|
||||||
|
TRAVERSE_BINDINGS so that up/down arrow will by default scroll the
|
||||||
|
message up/down rather than be aliases for tab-traversal (report by
|
||||||
|
Fredrik Kers).
|
||||||
|
+ modify dump_one_binding() to show when a binding is overridden.
|
||||||
|
+ improve format of trace-file, making comment-syntax consistent,
|
||||||
|
as well as showing argv-splitting as a series of comments.
|
||||||
|
+ modify dlg_string_to_argv() to change the quoting behavior to be
|
||||||
|
more consistent with shell behavior (patch by Denilson Sa Maia).
|
||||||
|
+ modify dlg_getc() to return ESC when a timeout expires, notifying
|
||||||
|
callers that a quit occurred rather than exiting the application
|
||||||
|
(suggested by Rodrigo Freitas).
|
||||||
|
+ modify handle_inputs() to ensure cursor-visibility is restored when
|
||||||
|
there is no input character available (report by Guillaume Vareille).
|
||||||
|
+ improve comment in manual page regarding which widgets can use the
|
||||||
|
"--help-button" (prompted by discussion with Csanyi Pal).
|
||||||
|
+ add a check for valid object pointer in tailbox's main loop since
|
||||||
|
the getc-callback may have been freed within ui_getc.c (report by
|
||||||
|
"David").
|
||||||
|
+ improved configure macros for ncurses: CF_GNU_SOURCE, CF_SHARED_OPTS,
|
||||||
|
CF_CURSES_LIBS, CF_CURSES_FUNCS, CF_NCURSES_CONFIG
|
||||||
|
+ improved configure script checks for groff vs man2html:
|
||||||
|
CF_PROG_GROFF and CF_WITH_MAN2HTML
|
||||||
|
+ build-fix from lynx for AM_WITH_NLS configure macro
|
||||||
|
+ update config.guess, config.sub
|
||||||
|
- Remove fix for Hindi translation as now upstream
|
||||||
|
- Remove patch textbox-file_size.patch now upstream
|
||||||
|
- Remove dialog.ko.po.bz2 as ko.po now upstream
|
||||||
|
- Modify patch dialog-1.2-20121230.dif
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Nov 7 22:33:50 CET 2018 - sbrabec@suse.com
|
Wed Nov 7 22:33:50 CET 2018 - sbrabec@suse.com
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:0f81ee4f183791b0bb4ad09534ffc702da31c6d1de8e6aa098388932df11ae0a
|
|
||||||
size 572
|
|
24
dialog.spec
24
dialog.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package dialog
|
# spec file for package dialog
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -12,12 +12,12 @@
|
|||||||
# license that conforms to the Open Source Definition (Version 1.9)
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
# published by the Open Source Initiative.
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define src_date 20171209
|
%define src_date 20190211
|
||||||
%define somajor 14
|
%define somajor 15
|
||||||
Name: dialog
|
Name: dialog
|
||||||
Version: 1.3
|
Version: 1.3
|
||||||
Release: 0
|
Release: 0
|
||||||
@ -29,10 +29,9 @@ Source0: ftp://ftp.invisible-island.net/dialog/%{name}-%{version}-%{src_d
|
|||||||
Source1: ftp://ftp.invisible-island.net/dialog/%{name}-%{version}-%{src_date}.tgz.asc
|
Source1: ftp://ftp.invisible-island.net/dialog/%{name}-%{version}-%{src_date}.tgz.asc
|
||||||
Source2: %{name}.keyring
|
Source2: %{name}.keyring
|
||||||
Source3: dialog.rc
|
Source3: dialog.rc
|
||||||
Source4: dialog.ko.po.bz2
|
Source4: dialog-rpmlintrc
|
||||||
# PATCH-FIX-OPENSUSE : fix shadow during resizing terminal
|
# PATCH-FIX-OPENSUSE : fix shadow during resizing terminal
|
||||||
Patch0: dialog-1.2-20121230.dif
|
Patch0: dialog-1.2-20121230.dif
|
||||||
Patch1: textbox-file_size.patch
|
|
||||||
Patch2: dialog-gcc-warnings.patch
|
Patch2: dialog-gcc-warnings.patch
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
@ -72,13 +71,8 @@ Examples of using menus and dialog boxes in shell scripts.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}-%{src_date}
|
%setup -q -n %{name}-%{version}-%{src_date}
|
||||||
bzcat %{SOURCE4} > po/ko.po
|
|
||||||
%patch0
|
%patch0
|
||||||
%patch1
|
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
# Fix mangled Hindi translation (bsc#1115005):
|
|
||||||
iconv -f UTF-8 -t ISO-8859-15 <po/hi.po >po/hi.po.utf-8
|
|
||||||
mv po/hi.po.utf-8 po/hi.po
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CC=gcc
|
CC=gcc
|
||||||
@ -122,13 +116,19 @@ rm -rf %{buildroot}%{_datadir}/locale/rm/ # Rhaeto-Romance
|
|||||||
mkdir %{buildroot}/etc
|
mkdir %{buildroot}/etc
|
||||||
install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/dialogrc
|
install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/dialogrc
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
xz CHANGES
|
||||||
|
|
||||||
%post -n libdialog%{somajor} -p /sbin/ldconfig
|
%post -n libdialog%{somajor} -p /sbin/ldconfig
|
||||||
%postun -n libdialog%{somajor} -p /sbin/ldconfig
|
%postun -n libdialog%{somajor} -p /sbin/ldconfig
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc CHANGES README VERSION COPYING
|
%if %{defined license}
|
||||||
|
%license COPYING
|
||||||
|
%doc CHANGES.xz README VERSION
|
||||||
|
%else
|
||||||
|
%doc CHANGES.xz README VERSION COPYING
|
||||||
|
%endif
|
||||||
%config(noreplace) %{_sysconfdir}/dialogrc
|
%config(noreplace) %{_sysconfdir}/dialogrc
|
||||||
%{_bindir}/dialog
|
%{_bindir}/dialog
|
||||||
%{_mandir}/man1/dialog.1%{ext_man}
|
%{_mandir}/man1/dialog.1%{ext_man}
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
---
|
|
||||||
textbox.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- textbox.c
|
|
||||||
+++ textbox.c 2018-05-29 08:53:10.083934467 +0000
|
|
||||||
@@ -92,7 +92,7 @@ lseek_end(MY_OBJ * obj, long offset)
|
|
||||||
{
|
|
||||||
long actual = lseek_obj(obj, offset, SEEK_END);
|
|
||||||
|
|
||||||
- if (actual > offset) {
|
|
||||||
+ if (offset == 0L && actual > offset) {
|
|
||||||
obj->file_size = actual;
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user