rpm/dialog
SHA256
1
0
Fork 0
forked from pool/dialog
Code Pull Requests Activity

Accepting request 156820 from Base:System

Browse Source 
- Re-add patch dialog-1.2-20121230.dif: Fix problem with moving
  shadows during terminal resize
- Use a /etc/dialogrc for openSUSE default coloring/shadow defaults
- Re-add Korean language message file

- Update to version 1.2-20121230
  * See included CHANGES file for detailes

- Fix libraries
  * dialog-libs.patch

OBS-URL: https://build.opensuse.org/request/show/156820
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dialog?expand=0&rev=23
This commit is contained in:
Stephan Kulow
2013-03-08 09:49:03 +00:00
committed by Git OBS Bridge
parent 572a2226df 7083d465c9
commit 41949e2848
9 changed files with 274 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
dialog-1.1-20080727.dif
View File

@@ -1,125 +0,0 @@
--- dialog.h
+++ dialog.h 2008-04-10 13:28:27.840374000 +0200
@@ -38,6 +38,23 @@
#include <string.h>
#include <signal.h> /* fork() etc. */
#include <math.h> /* sqrt() */
+#include <sys/ioctl.h> /* struct winsize */
+
+#ifndef GCC_NORETURN
+#if defined(__GNUC__)
+#define GCC_NORETURN __attribute__((noreturn))
+#else
+#define GCC_NORETURN /*nothing*/
+#endif
+#endif
+
+#ifndef GCC_UNUSED
+#if defined(__GNUC__)
+#define GCC_UNUSED __attribute__((unused))
+#else
+#define GCC_UNUSED /*nothing*/
+#endif
+#endif
#if defined(HAVE_NCURSESW_NCURSES_H)
#include <ncursesw/ncurses.h>
@@ -71,14 +88,6 @@
#define _(s) s
#endif
-#ifndef GCC_NORETURN
-#define GCC_NORETURN /*nothing*/
-#endif
-
-#ifndef GCC_UNUSED
-#define GCC_UNUSED /*nothing*/
-#endif
-
#ifndef HAVE_WGET_WCH
#undef USE_WIDE_CURSES
#endif
--- dlg_colors.h
+++ dlg_colors.h 2006-07-10 14:42:18.000000000 +0200
@@ -42,13 +42,13 @@
#define DLGC_FG_SHADOW COLOR_BLACK
#define DLGC_BG_SHADOW COLOR_BLACK
-#define DLGC_HL_SHADOW TRUE
+#define DLGC_HL_SHADOW FALSE
#define DLGC_FG_DIALOG COLOR_BLACK
#define DLGC_BG_DIALOG COLOR_WHITE
#define DLGC_HL_DIALOG FALSE
-#define DLGC_FG_TITLE COLOR_BLUE
+#define DLGC_FG_TITLE COLOR_YELLOW
#define DLGC_BG_TITLE COLOR_WHITE
#define DLGC_HL_TITLE TRUE
@@ -96,7 +96,7 @@
#define DLGC_BG_SEARCHBOX COLOR_WHITE
#define DLGC_HL_SEARCHBOX FALSE
-#define DLGC_FG_SEARCHBOX_TITLE COLOR_BLUE
+#define DLGC_FG_SEARCHBOX_TITLE COLOR_YELLOW
#define DLGC_BG_SEARCHBOX_TITLE COLOR_WHITE
#define DLGC_HL_SEARCHBOX_TITLE TRUE
@@ -104,7 +104,7 @@
#define DLGC_BG_SEARCHBOX_BORDER COLOR_WHITE
#define DLGC_HL_SEARCHBOX_BORDER TRUE
-#define DLGC_FG_POSITION_INDICATOR COLOR_BLUE
+#define DLGC_FG_POSITION_INDICATOR COLOR_YELLOW
#define DLGC_BG_POSITION_INDICATOR COLOR_WHITE
#define DLGC_HL_POSITION_INDICATOR TRUE
@@ -124,7 +124,7 @@
#define DLGC_BG_ITEM_SELECTED COLOR_BLUE
#define DLGC_HL_ITEM_SELECTED TRUE
-#define DLGC_FG_TAG COLOR_BLUE
+#define DLGC_FG_TAG COLOR_YELLOW
#define DLGC_BG_TAG COLOR_WHITE
#define DLGC_HL_TAG TRUE
--- guage.c
+++ guage.c 2008-04-10 12:53:27.303792000 +0200
@@ -229,7 +229,7 @@ dialog_gauge(const char *title,
#endif
fclose(dialog_state.pipe_input);
- dialog_state.pipe_input = 0;
+ dialog_state.pipe_input = (FILE*)0;
curs_set(1);
dlg_del_window(dialog);
--- util.c
+++ util.c 2008-08-14 11:45:04.905477461 +0200
@@ -1144,12 +1144,12 @@ dlg_exit(int code)
*/
if (dialog_state.input) {
fclose(dialog_state.input);
- dialog_state.input = 0;
+ dialog_state.input = (FILE*)0;
}
if (dialog_state.pipe_input) {
if (dialog_state.pipe_input != stdin) {
fclose(dialog_state.pipe_input);
- dialog_state.pipe_input = 0;
+ dialog_state.pipe_input = (FILE*)0;
}
}
_exit(code);
@@ -1520,8 +1520,10 @@ dlg_move_window(WINDOW *win, int height,
#ifdef HAVE_COLOR
if (p->shadow != 0) {
if (dialog_state.use_shadow) {
+ (void) wresize(p->shadow, height, width);
(void) mvwin(p->shadow, y + SHADOW_ROWS, x + SHADOW_COLS);
} else {
+ delwin(p->shadow);
p->shadow = 0;
}
}

3
dialog-1.1-20080727.tar.bz2
View File

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

13
dialog-1.2-20121230.dif Normal file
View File

@@ -0,0 +1,13 @@
--- util.c
+++ util.c 2013-02-28 11:09:24.466267899 +0100
@@ -2112,8 +2112,10 @@ dlg_move_window(WINDOW *win, int height,
#ifdef HAVE_COLOR
if (p->shadow != 0) {
if (dialog_state.use_shadow) {
+ (void) wresize(p->shadow, height, width);
(void) mvwin(p->shadow, y + SHADOW_ROWS, x + SHADOW_COLS);
} else {
+ delwin(p->shadow);
p->shadow = 0;
}
}

3
dialog-1.2-20121230.tgz Normal file
View File

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

43
dialog-gcc-warnings.patch Normal file
View File

@@ -0,0 +1,43 @@
Index: dialog-1.2-20121230/dialog.h
===================================================================
--- dialog-1.2-20121230.orig/dialog.h
+++ dialog-1.2-20121230/dialog.h
@@ -43,6 +43,23 @@
#include <string.h>
#include <signal.h> /* fork() etc. */
#include <math.h> /* sqrt() */
+#include <sys/ioctl.h> /* struct winsize */
+
+#ifndef GCC_NORETURN
+#if defined(__GNUC__)
+#define GCC_NORETURN __attribute__((noreturn))
+#else
+#define GCC_NORETURN /*nothing*/
+#endif
+#endif
+
+#ifndef GCC_UNUSED
+#if defined(__GNUC__)
+#define GCC_UNUSED __attribute__((unused))
+#else
+#define GCC_UNUSED /*nothing*/
+#endif
+#endif
/* header conflict with Solaris xpg4 versus <sys/regset.h> */
#if defined(ERR) && (ERR == 13)
@@ -99,14 +116,6 @@
#define GCC_PRINTFLIKE(fmt,var) /*nothing*/
#endif
-#ifndef GCC_NORETURN
-#define GCC_NORETURN /*nothing*/
-#endif
-
-#ifndef GCC_UNUSED
-#define GCC_UNUSED /*nothing*/
-#endif
-
#ifndef HAVE_WGET_WCH
#undef USE_WIDE_CURSES
#endif

18
dialog-libs.patch Normal file
View File

@@ -0,0 +1,18 @@
Index: dialog-1.2-20121230/makefile.in
===================================================================
--- dialog-1.2-20121230.orig/makefile.in
+++ dialog-1.2-20121230/makefile.in
@@ -179,11 +179,11 @@ dialog$o \
$(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
$(LIB) : $(LIB_OBJECT)
- $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT)
+ $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT) $(LIBS)
$(RANLIB) $@
$(PROG)$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
- $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(LDFLAGS) $(LIBS)
+ $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(LDFLAGS)
clean \
distclean \

20
dialog.changes
View File

@@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu Feb 28 11:09:22 UTC 2013 - werner@suse.de
- Re-add patch dialog-1.2-20121230.dif: Fix problem with moving
shadows during terminal resize
- Use a /etc/dialogrc for openSUSE default coloring/shadow defaults
- Re-add Korean language message file
-------------------------------------------------------------------
Fri Feb 22 22:20:50 UTC 2013 - dmitry_r@opensuse.org
- Update to version 1.2-20121230
* See included CHANGES file for detailes
-------------------------------------------------------------------
Fri Feb 22 22:01:06 UTC 2013 - dmitry_r@opensuse.org
- Fix libraries
* dialog-libs.patch
-------------------------------------------------------------------
Thu Jan 31 16:15:05 UTC 2013 - cfarrell@suse.com

141
dialog.rc Normal file
View File

@@ -0,0 +1,141 @@
#
# Run-time configuration file for dialog, matches openSuSE color scheme.
#
# Types of values:
#
# Number - <number>
# String - "string"
# Boolean - <ON|OFF>
# Attribute - (foreground,background,highlight?)
# Set aspect-ration.
aspect = 0
# Set separator (for multiple widgets output).
separate_widget = ""
# Set tab-length (for textbox tab-conversion).
tab_len = 8
# Make tab-traversal for checklist, etc., include the list.
visit_items = OFF
# Shadow dialog boxes? This also turns on color.
use_shadow = ON
# Turn color support ON or OFF
use_colors = ON
# Screen color
screen_color = (CYAN,BLUE,ON)
# Shadow color
shadow_color = (BLACK,BLACK,ON)
# Dialog box color
dialog_color = (BLACK,WHITE,OFF)
# Dialog box title color
title_color = (YELLOW,WHITE,ON)
# Dialog box border color
border_color = (WHITE,WHITE,ON)
# Active button color
button_active_color = (WHITE,BLUE,ON)
# Inactive button color
button_inactive_color = dialog_color
# Active button key color
button_key_active_color = button_active_color
# Inactive button key color
button_key_inactive_color = (RED,WHITE,OFF)
# Active button label color
button_label_active_color = (YELLOW,BLUE,ON)
# Inactive button label color
button_label_inactive_color = (BLACK,WHITE,ON)
# Input box color
inputbox_color = dialog_color
# Input box border color
inputbox_border_color = dialog_color
# Search box color
searchbox_color = dialog_color
# Search box title color
searchbox_title_color = title_color
# Search box border color
searchbox_border_color = border_color
# File position indicator color
position_indicator_color = title_color
# Menu box color
menubox_color = dialog_color
# Menu box border color
menubox_border_color = border_color
# Item color
item_color = dialog_color
# Selected item color
item_selected_color = button_active_color
# Tag color
tag_color = title_color
# Selected tag color
tag_selected_color = button_label_active_color
# Tag key color
tag_key_color = button_key_inactive_color
# Selected tag key color
tag_key_selected_color = (RED,BLUE,ON)
# Check box color
check_color = dialog_color
# Selected check box color
check_selected_color = button_active_color
# Up arrow color
uarrow_color = (GREEN,WHITE,ON)
# Down arrow color
darrow_color = uarrow_color
# Item help-text color
itemhelp_color = (WHITE,BLACK,OFF)
# Active form text color
form_active_text_color = button_active_color
# Form text color
form_text_color = (WHITE,CYAN,ON)
# Readonly form item color
form_item_readonly_color = (CYAN,WHITE,ON)
# Dialog box gauge color
gauge_color = (BLUE,WHITE,ON)
# Dialog box border2 color
border2_color = dialog_color
# Input box border2 color
inputbox_border2_color = dialog_color
# Search box border2 color
searchbox_border2_color = dialog_color
# Menu box border2 color
menubox_border2_color = dialog_color

45
dialog.spec
View File

@@ -18,18 +18,22 @@
Name: dialog
Url: http://invisible-island.net/dialog/
Version: 1.1
Version: 1.2
Release: 0
%define somajor 6
%define src_date 20121230
%define somajor 11
Summary: Menus and Input Boxes for Shell Scripts
License: LGPL-2.1
Group: Development/Tools/Other
Source: dialog-1.1-20080727.tar.bz2
Source1: dialog.ko.po.bz2
Patch: dialog-1.1-20080727.dif
Source: ftp://invisible-island.net/dialog/%{name}-%{version}-%{src_date}.tgz
Source1: dialog.rc
Source2: dialog.ko.po.bz2
# PATCH-FIX-OPENSUSE : fix shadow during resizing terminal
Patch0: dialog-1.2-20121230.dif
Patch1: dialog-libs.patch
Patch2: dialog-gcc-warnings.patch
BuildRequires: libtool
BuildRequires: ncurses-devel
#BuildRequires: gpm
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -50,10 +54,22 @@ Requires: libdialog%{somajor} = %{version}
%description devel
This program lets you use menus and dialog boxes in shell scripts.
%package examples
Summary: Examples of using dialog tool
Group: Development/Libraries/Other
Requires: %{name} = %{version}
BuildArch: noarch
%description examples
Examples of using menus and dialog boxes in shell scripts.
%prep
%setup -n dialog-1.1-20080727
bzcat %{S:1} > po/ko.po
%patch
%setup -n %{name}-%{version}-%{src_date}
bzcat %{S:2} > po/ko.po
%patch0 -p0
%patch1 -p1
%patch2 -p1
chmod -x samples/*
%build
CC=gcc
@@ -68,13 +84,16 @@ bzcat %{S:1} > po/ko.po
break
done
export CC LIBS CFLAGS
%configure \
--enable-nls \
--enable-included-msgs \
--enable-widec \
--with-ncursesw \
--with-libtool \
--disable-rpath-hack \
--includedir=%{_includedir}/dialog
make %{?_smp_mflags}
%install
@@ -85,6 +104,9 @@ find %{buildroot}%{_libdir} -name '*.a' -type f -delete -print
rm -rf %{buildroot}%{_datadir}/locale/mg/ # Malagasy (Malayalam??)
rm -rf %{buildroot}%{_datadir}/locale/rm/ # Rhaeto-Romance
mkdir %{buildroot}/etc
install -m 0644 %{S:1} %{buildroot}/etc/dialogrc
%find_lang %name
%post -n libdialog%{somajor} -p /sbin/ldconfig
@@ -94,6 +116,7 @@ rm -rf %{buildroot}%{_datadir}/locale/rm/ # Rhaeto-Romance
%files -f %name.lang
%defattr(-,root,root)
%doc CHANGES README VERSION COPYING
%config(noreplace) /etc/dialogrc
%{_bindir}/dialog
%{_mandir}/man1/dialog.1.gz
@@ -108,4 +131,8 @@ rm -rf %{buildroot}%{_datadir}/locale/rm/ # Rhaeto-Romance
%{_includedir}/dialog/
%{_mandir}/man3/dialog.3.gz
%files examples
%defattr(-,root,root)
%doc samples/*
%changelog