[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2128: fix some recently introduced problems in narrow curses (bug 1761)

Mats Wichmann mats at linuxfoundation.org
Fri Aug 9 12:45:46 UTC 2013


------------------------------------------------------------
revno: 2128
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Fri 2013-08-09 06:45:46 -0600
message:
  fix some recently introduced problems in narrow curses (bug 1761)
modified:
  headers/All/5.0/curses.h.defs
  headers/All/5.0/ncursesw/curses.h.defs
  headers/curses.h
  headers/ncursesw/curses.h
  package/Makefile
  stub_libs/5.0/IA32/libncurses.c
  stub_libs/5.0/IA64/libncurses.c
  stub_libs/5.0/PPC32/libncurses.c
  stub_libs/5.0/PPC64/libncurses.c
  stub_libs/5.0/S390/libncurses.c
  stub_libs/5.0/S390X/libncurses.c
  stub_libs/5.0/x86-64/libncurses.c
-------------- next part --------------
=== modified file 'headers/All/5.0/curses.h.defs'
--- a/headers/All/5.0/curses.h.defs	2013-08-02 16:56:19 +0000
+++ b/headers/All/5.0/curses.h.defs	2013-08-09 12:45:46 +0000
@@ -29,6 +29,7 @@
 #define ACS_BULLET	(acs_map['~'])
 #define setsyx(y,x)	do{if((y)==-1&&(x)==-1)newscr->_leaveok=TRUE;else{newscr->_leaveok=FALSE;wmove(newscr,(y),(x));}}while(0)
 #define getsyx(y,x)	do{if(newscr->_leaveok)(y)=(x)=-1;elsegetyx(newscr,(y),(x));}while(0)
+#define vid_attr(a,pair,opts)	vidattr(a)
 #define getmaxyx(win,y,x)	\
 	(y=(win)?((win)->_maxy+1):ERR,x=(win)?((win)->_maxx+1):ERR)
 #define getbegyx(win,y,x)	\
@@ -446,7 +447,6 @@
 extern WINDOW *subpad(WINDOW *, int, int, int, int);
 extern WINDOW *subwin(WINDOW *, int, int, int, int);
 extern int syncok(WINDOW *, bool);
-extern attr_t term_attrs(void);
 extern chtype termattrs(void);
 extern char *termname(void);
 extern void timeout(int);
@@ -457,7 +457,6 @@
 extern int ungetch(int);
 extern int untouchwin(WINDOW *);
 extern void use_env(bool);
-extern int vid_attr(attr_t, short, void *);
 extern int vidattr(chtype);
 extern int vidputs(chtype, int (*)(int));
 extern int vline(chtype, int);

=== modified file 'headers/All/5.0/ncursesw/curses.h.defs'
--- a/headers/All/5.0/ncursesw/curses.h.defs	2013-08-03 18:01:56 +0000
+++ b/headers/All/5.0/ncursesw/curses.h.defs	2013-08-09 12:45:46 +0000
@@ -117,7 +117,6 @@
 #define NCURSES_EXT_COLORS	20110404
 #define GCC_PRINTFLIKE(fmt,var)	__attribute__((format(printf,fmt,var)))
 #define GCC_SCANFLIKE(fmt,var)	__attribute__((format(scanf,fmt,var)))
-#define vid_attr(a,pair,opts)	vidattr(a)
 #define NCURSES_EXT_FUNCS	20110404
 #define curses_version()	NCURSES_VERSION
 #define NCURSES_SP_FUNCS	20110404

=== modified file 'headers/curses.h'
--- a/headers/curses.h	2013-08-02 16:56:19 +0000
+++ b/headers/curses.h	2013-08-09 12:45:46 +0000
@@ -56,6 +56,7 @@
 #define getattrs(win)	((win)?(win)->_attrs:A_NORMAL)
 #define setsyx(y,x)	do{if((y)==-1&&(x)==-1)newscr->_leaveok=TRUE;else{newscr->_leaveok=FALSE;wmove(newscr,(y),(x));}}while(0)
 #define getsyx(y,x)	do{if(newscr->_leaveok)(y)=(x)=-1;elsegetyx(newscr,(y),(x));}while(0)
+#define vid_attr(a,pair,opts)	vidattr(a)
 #endif				/* __LSB_VERSION__ >= 5.0 */
 
 
@@ -729,9 +730,6 @@
 #if __LSB_VERSION__ >= 50
     extern WINDOW *newscr;
     extern attr_t slk_attr(void);
-    extern attr_t term_attrs(void);
-#undef vid_attr
-    extern int vid_attr(attr_t, short, void *);
 #endif				/* __LSB_VERSION__ >= 5.0 */
 
 #ifdef __cplusplus

=== modified file 'headers/ncursesw/curses.h'
--- a/headers/ncursesw/curses.h	2013-08-03 18:01:56 +0000
+++ b/headers/ncursesw/curses.h	2013-08-09 12:45:46 +0000
@@ -132,7 +132,6 @@
 #define NCURSES_EXT_COLORS	20110404
 #define GCC_PRINTFLIKE(fmt,var)	__attribute__((format(printf,fmt,var)))
 #define GCC_SCANFLIKE(fmt,var)	__attribute__((format(scanf,fmt,var)))
-#define vid_attr(a,pair,opts)	vidattr(a)
 #define NCURSES_EXT_FUNCS	20110404
 #define curses_version()	NCURSES_VERSION
 #define NCURSES_SP_FUNCS	20110404

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-08-08 15:02:47 +0000
+++ b/package/Makefile	2013-08-09 12:45:46 +0000
@@ -46,7 +46,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=2
+RPM_PACKAGE_RELEASE=3
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)

=== modified file 'stub_libs/5.0/IA32/libncurses.c'
--- a/stub_libs/5.0/IA32/libncurses.c	2013-08-02 16:56:19 +0000
+++ b/stub_libs/5.0/IA32/libncurses.c	2013-08-09 12:45:46 +0000
@@ -193,7 +193,6 @@
 void subpad() {} ;
 void subwin() {} ;
 void syncok() {} ;
-void term_attrs() {} ;
 void termattrs() {} ;
 void termname() {} ;
 void tgetent() {} ;
@@ -214,7 +213,6 @@
 void ungetch() {} ;
 void untouchwin() {} ;
 void use_env() {} ;
-void vid_attr() {} ;
 void vidattr() {} ;
 void vidputs() {} ;
 void vline() {} ;

=== modified file 'stub_libs/5.0/IA64/libncurses.c'
--- a/stub_libs/5.0/IA64/libncurses.c	2013-08-02 16:56:19 +0000
+++ b/stub_libs/5.0/IA64/libncurses.c	2013-08-09 12:45:46 +0000
@@ -193,7 +193,6 @@
 void subpad() {} ;
 void subwin() {} ;
 void syncok() {} ;
-void term_attrs() {} ;
 void termattrs() {} ;
 void termname() {} ;
 void tgetent() {} ;
@@ -214,7 +213,6 @@
 void ungetch() {} ;
 void untouchwin() {} ;
 void use_env() {} ;
-void vid_attr() {} ;
 void vidattr() {} ;
 void vidputs() {} ;
 void vline() {} ;

=== modified file 'stub_libs/5.0/PPC32/libncurses.c'
--- a/stub_libs/5.0/PPC32/libncurses.c	2013-08-02 16:56:19 +0000
+++ b/stub_libs/5.0/PPC32/libncurses.c	2013-08-09 12:45:46 +0000
@@ -193,7 +193,6 @@
 void subpad() {} ;
 void subwin() {} ;
 void syncok() {} ;
-void term_attrs() {} ;
 void termattrs() {} ;
 void termname() {} ;
 void tgetent() {} ;
@@ -214,7 +213,6 @@
 void ungetch() {} ;
 void untouchwin() {} ;
 void use_env() {} ;
-void vid_attr() {} ;
 void vidattr() {} ;
 void vidputs() {} ;
 void vline() {} ;

=== modified file 'stub_libs/5.0/PPC64/libncurses.c'
--- a/stub_libs/5.0/PPC64/libncurses.c	2013-08-02 16:56:19 +0000
+++ b/stub_libs/5.0/PPC64/libncurses.c	2013-08-09 12:45:46 +0000
@@ -193,7 +193,6 @@
 void subpad() {} ;
 void subwin() {} ;
 void syncok() {} ;
-void term_attrs() {} ;
 void termattrs() {} ;
 void termname() {} ;
 void tgetent() {} ;
@@ -214,7 +213,6 @@
 void ungetch() {} ;
 void untouchwin() {} ;
 void use_env() {} ;
-void vid_attr() {} ;
 void vidattr() {} ;
 void vidputs() {} ;
 void vline() {} ;

=== modified file 'stub_libs/5.0/S390/libncurses.c'
--- a/stub_libs/5.0/S390/libncurses.c	2013-08-02 16:56:19 +0000
+++ b/stub_libs/5.0/S390/libncurses.c	2013-08-09 12:45:46 +0000
@@ -193,7 +193,6 @@
 void subpad() {} ;
 void subwin() {} ;
 void syncok() {} ;
-void term_attrs() {} ;
 void termattrs() {} ;
 void termname() {} ;
 void tgetent() {} ;
@@ -214,7 +213,6 @@
 void ungetch() {} ;
 void untouchwin() {} ;
 void use_env() {} ;
-void vid_attr() {} ;
 void vidattr() {} ;
 void vidputs() {} ;
 void vline() {} ;

=== modified file 'stub_libs/5.0/S390X/libncurses.c'
--- a/stub_libs/5.0/S390X/libncurses.c	2013-08-02 16:56:19 +0000
+++ b/stub_libs/5.0/S390X/libncurses.c	2013-08-09 12:45:46 +0000
@@ -193,7 +193,6 @@
 void subpad() {} ;
 void subwin() {} ;
 void syncok() {} ;
-void term_attrs() {} ;
 void termattrs() {} ;
 void termname() {} ;
 void tgetent() {} ;
@@ -214,7 +213,6 @@
 void ungetch() {} ;
 void untouchwin() {} ;
 void use_env() {} ;
-void vid_attr() {} ;
 void vidattr() {} ;
 void vidputs() {} ;
 void vline() {} ;

=== modified file 'stub_libs/5.0/x86-64/libncurses.c'
--- a/stub_libs/5.0/x86-64/libncurses.c	2013-08-02 16:56:19 +0000
+++ b/stub_libs/5.0/x86-64/libncurses.c	2013-08-09 12:45:46 +0000
@@ -193,7 +193,6 @@
 void subpad() {} ;
 void subwin() {} ;
 void syncok() {} ;
-void term_attrs() {} ;
 void termattrs() {} ;
 void termname() {} ;
 void tgetent() {} ;
@@ -214,7 +213,6 @@
 void ungetch() {} ;
 void untouchwin() {} ;
 void use_env() {} ;
-void vid_attr() {} ;
 void vidattr() {} ;
 void vidputs() {} ;
 void vline() {} ;



More information about the lsb-messages mailing list