[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2123: correct some errors from previous patches (bug 1761)

Mats Wichmann mats at linuxfoundation.org
Fri Aug 2 16:56:19 UTC 2013


------------------------------------------------------------
revno: 2123
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Fri 2013-08-02 10:56:19 -0600
message:
  correct some errors from previous patches (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/libXext.c
  stub_libs/5.0/IA32/libncurses.c
  stub_libs/5.0/IA32/libncursesw.c
  stub_libs/5.0/IA64/libXext.c
  stub_libs/5.0/IA64/libncurses.c
  stub_libs/5.0/IA64/libncursesw.c
  stub_libs/5.0/PPC32/libXext.c
  stub_libs/5.0/PPC32/libncurses.c
  stub_libs/5.0/PPC32/libncursesw.c
  stub_libs/5.0/PPC64/libXext.c
  stub_libs/5.0/PPC64/libncurses.c
  stub_libs/5.0/PPC64/libncursesw.c
  stub_libs/5.0/S390/libXext.c
  stub_libs/5.0/S390/libncurses.c
  stub_libs/5.0/S390/libncursesw.c
  stub_libs/5.0/S390X/libXext.c
  stub_libs/5.0/S390X/libncurses.c
  stub_libs/5.0/S390X/libncursesw.c
  stub_libs/5.0/x86-64/libXext.c
  stub_libs/5.0/x86-64/libncurses.c
  stub_libs/5.0/x86-64/libncursesw.c
-------------- next part --------------
=== modified file 'headers/All/5.0/curses.h.defs'
--- a/headers/All/5.0/curses.h.defs	2013-08-02 15:34:05 +0000
+++ b/headers/All/5.0/curses.h.defs	2013-08-02 16:56:19 +0000
@@ -426,8 +426,6 @@
 extern SCREEN *set_term(SCREEN *);
 extern int setscrreg(int, int);
 extern attr_t slk_attr(void);
-extern int slk_attr_off(const attr_t, void *);
-extern int slk_attr_on(attr_t, void *);
 extern int slk_attr_set(const attr_t, short, void *);
 extern int slk_attroff(const chtype);
 extern int slk_attron(const chtype);

=== modified file 'headers/All/5.0/ncursesw/curses.h.defs'
--- a/headers/All/5.0/ncursesw/curses.h.defs	2013-08-02 15:14:14 +0000
+++ b/headers/All/5.0/ncursesw/curses.h.defs	2013-08-02 16:56:19 +0000
@@ -933,6 +933,7 @@
 extern attr_t slk_attr(void);
 extern int slk_attr_off(const attr_t, void *);
 extern int slk_attr_on(attr_t, void *);
+extern int slk_attr_set(const attr_t, short, void *);
 extern int slk_attroff(const chtype);
 extern int slk_attron(const chtype);
 extern int slk_attrset(const chtype);

=== modified file 'headers/curses.h'
--- a/headers/curses.h	2013-08-02 15:34:05 +0000
+++ b/headers/curses.h	2013-08-02 16:56:19 +0000
@@ -729,10 +729,6 @@
 #if __LSB_VERSION__ >= 50
     extern WINDOW *newscr;
     extern attr_t slk_attr(void);
-#undef slk_attr_off
-    extern int slk_attr_off(const attr_t, void *);
-#undef slk_attr_on
-    extern int slk_attr_on(attr_t, void *);
     extern attr_t term_attrs(void);
 #undef vid_attr
     extern int vid_attr(attr_t, short, void *);

=== modified file 'headers/ncursesw/curses.h'
--- a/headers/ncursesw/curses.h	2013-08-02 15:14:14 +0000
+++ b/headers/ncursesw/curses.h	2013-08-02 16:56:19 +0000
@@ -1130,6 +1130,7 @@
     extern int slk_attr_off(const attr_t, void *);
 #undef slk_attr_on
     extern int slk_attr_on(attr_t, void *);
+    extern int slk_attr_set(const attr_t, short, void *);
     extern int slk_attroff(const chtype);
     extern int slk_attron(const chtype);
     extern int slk_attrset(const chtype);

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-08-02 15:14:14 +0000
+++ b/package/Makefile	2013-08-02 16:56:19 +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=8
+RPM_PACKAGE_RELEASE=9
 
 # 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/libXext.c'
--- a/stub_libs/5.0/IA32/libXext.c	2013-08-02 15:14:14 +0000
+++ b/stub_libs/5.0/IA32/libXext.c	2013-08-02 16:56:19 +0000
@@ -84,8 +84,3 @@
 void XextDestroyExtension() {} ;
 void XextFindDisplay() {} ;
 void XextRemoveDisplay() {} ;
-void slk_attr() {} ;
-void slk_attr_off() {} ;
-void slk_attr_on() {} ;
-void term_attrs() {} ;
-void vid_attr() {} ;

=== modified file 'stub_libs/5.0/IA32/libncurses.c'
--- a/stub_libs/5.0/IA32/libncurses.c	2013-03-04 20:24:26 +0000
+++ b/stub_libs/5.0/IA32/libncurses.c	2013-08-02 16:56:19 +0000
@@ -173,6 +173,7 @@
 void set_term() {} ;
 void setscrreg() {} ;
 void setupterm() {} ;
+void slk_attr() {} ;
 void slk_attr_set() {} ;
 void slk_attroff() {} ;
 void slk_attron() {} ;
@@ -192,6 +193,7 @@
 void subpad() {} ;
 void subwin() {} ;
 void syncok() {} ;
+void term_attrs() {} ;
 void termattrs() {} ;
 void termname() {} ;
 void tgetent() {} ;
@@ -212,6 +214,7 @@
 void ungetch() {} ;
 void untouchwin() {} ;
 void use_env() {} ;
+void vid_attr() {} ;
 void vidattr() {} ;
 void vidputs() {} ;
 void vline() {} ;

=== modified file 'stub_libs/5.0/IA32/libncursesw.c'
--- a/stub_libs/5.0/IA32/libncursesw.c	2013-08-02 15:14:14 +0000
+++ b/stub_libs/5.0/IA32/libncursesw.c	2013-08-02 16:56:19 +0000
@@ -254,6 +254,7 @@
 void slk_attr() {} ;
 void slk_attr_off() {} ;
 void slk_attr_on() {} ;
+void slk_attr_set() {} ;
 void slk_attroff() {} ;
 void slk_attron() {} ;
 void slk_attrset() {} ;

=== modified file 'stub_libs/5.0/IA64/libXext.c'
--- a/stub_libs/5.0/IA64/libXext.c	2013-08-02 15:14:14 +0000
+++ b/stub_libs/5.0/IA64/libXext.c	2013-08-02 16:56:19 +0000
@@ -84,8 +84,3 @@
 void XextDestroyExtension() {} ;
 void XextFindDisplay() {} ;
 void XextRemoveDisplay() {} ;
-void slk_attr() {} ;
-void slk_attr_off() {} ;
-void slk_attr_on() {} ;
-void term_attrs() {} ;
-void vid_attr() {} ;

=== modified file 'stub_libs/5.0/IA64/libncurses.c'
--- a/stub_libs/5.0/IA64/libncurses.c	2013-03-04 20:24:26 +0000
+++ b/stub_libs/5.0/IA64/libncurses.c	2013-08-02 16:56:19 +0000
@@ -173,6 +173,7 @@
 void set_term() {} ;
 void setscrreg() {} ;
 void setupterm() {} ;
+void slk_attr() {} ;
 void slk_attr_set() {} ;
 void slk_attroff() {} ;
 void slk_attron() {} ;
@@ -192,6 +193,7 @@
 void subpad() {} ;
 void subwin() {} ;
 void syncok() {} ;
+void term_attrs() {} ;
 void termattrs() {} ;
 void termname() {} ;
 void tgetent() {} ;
@@ -212,6 +214,7 @@
 void ungetch() {} ;
 void untouchwin() {} ;
 void use_env() {} ;
+void vid_attr() {} ;
 void vidattr() {} ;
 void vidputs() {} ;
 void vline() {} ;

=== modified file 'stub_libs/5.0/IA64/libncursesw.c'
--- a/stub_libs/5.0/IA64/libncursesw.c	2013-08-02 15:14:14 +0000
+++ b/stub_libs/5.0/IA64/libncursesw.c	2013-08-02 16:56:19 +0000
@@ -254,6 +254,7 @@
 void slk_attr() {} ;
 void slk_attr_off() {} ;
 void slk_attr_on() {} ;
+void slk_attr_set() {} ;
 void slk_attroff() {} ;
 void slk_attron() {} ;
 void slk_attrset() {} ;

=== modified file 'stub_libs/5.0/PPC32/libXext.c'
--- a/stub_libs/5.0/PPC32/libXext.c	2013-08-02 15:14:14 +0000
+++ b/stub_libs/5.0/PPC32/libXext.c	2013-08-02 16:56:19 +0000
@@ -84,8 +84,3 @@
 void XextDestroyExtension() {} ;
 void XextFindDisplay() {} ;
 void XextRemoveDisplay() {} ;
-void slk_attr() {} ;
-void slk_attr_off() {} ;
-void slk_attr_on() {} ;
-void term_attrs() {} ;
-void vid_attr() {} ;

=== modified file 'stub_libs/5.0/PPC32/libncurses.c'
--- a/stub_libs/5.0/PPC32/libncurses.c	2013-03-04 20:24:26 +0000
+++ b/stub_libs/5.0/PPC32/libncurses.c	2013-08-02 16:56:19 +0000
@@ -173,6 +173,7 @@
 void set_term() {} ;
 void setscrreg() {} ;
 void setupterm() {} ;
+void slk_attr() {} ;
 void slk_attr_set() {} ;
 void slk_attroff() {} ;
 void slk_attron() {} ;
@@ -192,6 +193,7 @@
 void subpad() {} ;
 void subwin() {} ;
 void syncok() {} ;
+void term_attrs() {} ;
 void termattrs() {} ;
 void termname() {} ;
 void tgetent() {} ;
@@ -212,6 +214,7 @@
 void ungetch() {} ;
 void untouchwin() {} ;
 void use_env() {} ;
+void vid_attr() {} ;
 void vidattr() {} ;
 void vidputs() {} ;
 void vline() {} ;

=== modified file 'stub_libs/5.0/PPC32/libncursesw.c'
--- a/stub_libs/5.0/PPC32/libncursesw.c	2013-08-02 15:14:14 +0000
+++ b/stub_libs/5.0/PPC32/libncursesw.c	2013-08-02 16:56:19 +0000
@@ -254,6 +254,7 @@
 void slk_attr() {} ;
 void slk_attr_off() {} ;
 void slk_attr_on() {} ;
+void slk_attr_set() {} ;
 void slk_attroff() {} ;
 void slk_attron() {} ;
 void slk_attrset() {} ;

=== modified file 'stub_libs/5.0/PPC64/libXext.c'
--- a/stub_libs/5.0/PPC64/libXext.c	2013-08-02 15:14:14 +0000
+++ b/stub_libs/5.0/PPC64/libXext.c	2013-08-02 16:56:19 +0000
@@ -84,8 +84,3 @@
 void XextDestroyExtension() {} ;
 void XextFindDisplay() {} ;
 void XextRemoveDisplay() {} ;
-void slk_attr() {} ;
-void slk_attr_off() {} ;
-void slk_attr_on() {} ;
-void term_attrs() {} ;
-void vid_attr() {} ;

=== modified file 'stub_libs/5.0/PPC64/libncurses.c'
--- a/stub_libs/5.0/PPC64/libncurses.c	2013-03-04 20:24:26 +0000
+++ b/stub_libs/5.0/PPC64/libncurses.c	2013-08-02 16:56:19 +0000
@@ -173,6 +173,7 @@
 void set_term() {} ;
 void setscrreg() {} ;
 void setupterm() {} ;
+void slk_attr() {} ;
 void slk_attr_set() {} ;
 void slk_attroff() {} ;
 void slk_attron() {} ;
@@ -192,6 +193,7 @@
 void subpad() {} ;
 void subwin() {} ;
 void syncok() {} ;
+void term_attrs() {} ;
 void termattrs() {} ;
 void termname() {} ;
 void tgetent() {} ;
@@ -212,6 +214,7 @@
 void ungetch() {} ;
 void untouchwin() {} ;
 void use_env() {} ;
+void vid_attr() {} ;
 void vidattr() {} ;
 void vidputs() {} ;
 void vline() {} ;

=== modified file 'stub_libs/5.0/PPC64/libncursesw.c'
--- a/stub_libs/5.0/PPC64/libncursesw.c	2013-08-02 15:14:14 +0000
+++ b/stub_libs/5.0/PPC64/libncursesw.c	2013-08-02 16:56:19 +0000
@@ -254,6 +254,7 @@
 void slk_attr() {} ;
 void slk_attr_off() {} ;
 void slk_attr_on() {} ;
+void slk_attr_set() {} ;
 void slk_attroff() {} ;
 void slk_attron() {} ;
 void slk_attrset() {} ;

=== modified file 'stub_libs/5.0/S390/libXext.c'
--- a/stub_libs/5.0/S390/libXext.c	2013-08-02 15:14:14 +0000
+++ b/stub_libs/5.0/S390/libXext.c	2013-08-02 16:56:19 +0000
@@ -84,8 +84,3 @@
 void XextDestroyExtension() {} ;
 void XextFindDisplay() {} ;
 void XextRemoveDisplay() {} ;
-void slk_attr() {} ;
-void slk_attr_off() {} ;
-void slk_attr_on() {} ;
-void term_attrs() {} ;
-void vid_attr() {} ;

=== modified file 'stub_libs/5.0/S390/libncurses.c'
--- a/stub_libs/5.0/S390/libncurses.c	2013-03-04 20:24:26 +0000
+++ b/stub_libs/5.0/S390/libncurses.c	2013-08-02 16:56:19 +0000
@@ -173,6 +173,7 @@
 void set_term() {} ;
 void setscrreg() {} ;
 void setupterm() {} ;
+void slk_attr() {} ;
 void slk_attr_set() {} ;
 void slk_attroff() {} ;
 void slk_attron() {} ;
@@ -192,6 +193,7 @@
 void subpad() {} ;
 void subwin() {} ;
 void syncok() {} ;
+void term_attrs() {} ;
 void termattrs() {} ;
 void termname() {} ;
 void tgetent() {} ;
@@ -212,6 +214,7 @@
 void ungetch() {} ;
 void untouchwin() {} ;
 void use_env() {} ;
+void vid_attr() {} ;
 void vidattr() {} ;
 void vidputs() {} ;
 void vline() {} ;

=== modified file 'stub_libs/5.0/S390/libncursesw.c'
--- a/stub_libs/5.0/S390/libncursesw.c	2013-08-02 15:14:14 +0000
+++ b/stub_libs/5.0/S390/libncursesw.c	2013-08-02 16:56:19 +0000
@@ -254,6 +254,7 @@
 void slk_attr() {} ;
 void slk_attr_off() {} ;
 void slk_attr_on() {} ;
+void slk_attr_set() {} ;
 void slk_attroff() {} ;
 void slk_attron() {} ;
 void slk_attrset() {} ;

=== modified file 'stub_libs/5.0/S390X/libXext.c'
--- a/stub_libs/5.0/S390X/libXext.c	2013-08-02 15:14:14 +0000
+++ b/stub_libs/5.0/S390X/libXext.c	2013-08-02 16:56:19 +0000
@@ -84,8 +84,3 @@
 void XextDestroyExtension() {} ;
 void XextFindDisplay() {} ;
 void XextRemoveDisplay() {} ;
-void slk_attr() {} ;
-void slk_attr_off() {} ;
-void slk_attr_on() {} ;
-void term_attrs() {} ;
-void vid_attr() {} ;

=== modified file 'stub_libs/5.0/S390X/libncurses.c'
--- a/stub_libs/5.0/S390X/libncurses.c	2013-03-04 20:24:26 +0000
+++ b/stub_libs/5.0/S390X/libncurses.c	2013-08-02 16:56:19 +0000
@@ -173,6 +173,7 @@
 void set_term() {} ;
 void setscrreg() {} ;
 void setupterm() {} ;
+void slk_attr() {} ;
 void slk_attr_set() {} ;
 void slk_attroff() {} ;
 void slk_attron() {} ;
@@ -192,6 +193,7 @@
 void subpad() {} ;
 void subwin() {} ;
 void syncok() {} ;
+void term_attrs() {} ;
 void termattrs() {} ;
 void termname() {} ;
 void tgetent() {} ;
@@ -212,6 +214,7 @@
 void ungetch() {} ;
 void untouchwin() {} ;
 void use_env() {} ;
+void vid_attr() {} ;
 void vidattr() {} ;
 void vidputs() {} ;
 void vline() {} ;

=== modified file 'stub_libs/5.0/S390X/libncursesw.c'
--- a/stub_libs/5.0/S390X/libncursesw.c	2013-08-02 15:14:14 +0000
+++ b/stub_libs/5.0/S390X/libncursesw.c	2013-08-02 16:56:19 +0000
@@ -254,6 +254,7 @@
 void slk_attr() {} ;
 void slk_attr_off() {} ;
 void slk_attr_on() {} ;
+void slk_attr_set() {} ;
 void slk_attroff() {} ;
 void slk_attron() {} ;
 void slk_attrset() {} ;

=== modified file 'stub_libs/5.0/x86-64/libXext.c'
--- a/stub_libs/5.0/x86-64/libXext.c	2013-08-02 15:14:14 +0000
+++ b/stub_libs/5.0/x86-64/libXext.c	2013-08-02 16:56:19 +0000
@@ -84,8 +84,3 @@
 void XextDestroyExtension() {} ;
 void XextFindDisplay() {} ;
 void XextRemoveDisplay() {} ;
-void slk_attr() {} ;
-void slk_attr_off() {} ;
-void slk_attr_on() {} ;
-void term_attrs() {} ;
-void vid_attr() {} ;

=== modified file 'stub_libs/5.0/x86-64/libncurses.c'
--- a/stub_libs/5.0/x86-64/libncurses.c	2013-03-04 20:24:26 +0000
+++ b/stub_libs/5.0/x86-64/libncurses.c	2013-08-02 16:56:19 +0000
@@ -173,6 +173,7 @@
 void set_term() {} ;
 void setscrreg() {} ;
 void setupterm() {} ;
+void slk_attr() {} ;
 void slk_attr_set() {} ;
 void slk_attroff() {} ;
 void slk_attron() {} ;
@@ -192,6 +193,7 @@
 void subpad() {} ;
 void subwin() {} ;
 void syncok() {} ;
+void term_attrs() {} ;
 void termattrs() {} ;
 void termname() {} ;
 void tgetent() {} ;
@@ -212,6 +214,7 @@
 void ungetch() {} ;
 void untouchwin() {} ;
 void use_env() {} ;
+void vid_attr() {} ;
 void vidattr() {} ;
 void vidputs() {} ;
 void vline() {} ;

=== modified file 'stub_libs/5.0/x86-64/libncursesw.c'
--- a/stub_libs/5.0/x86-64/libncursesw.c	2013-08-02 15:14:14 +0000
+++ b/stub_libs/5.0/x86-64/libncursesw.c	2013-08-02 16:56:19 +0000
@@ -254,6 +254,7 @@
 void slk_attr() {} ;
 void slk_attr_off() {} ;
 void slk_attr_on() {} ;
+void slk_attr_set() {} ;
 void slk_attroff() {} ;
 void slk_attron() {} ;
 void slk_attrset() {} ;



More information about the lsb-messages mailing list