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

Accepting request 499601 from Base:System

Browse Source 
- Add patch ncurses-6.0-crashw.patch as a temporary fix which will
  become part of next patch level: solve binary incompatiblity of
  libtinfow and libtinfo

- Add ncurses patch 20170527
  + improved test/picsmap.c:
  + lookup named colors for xpm files in rgb.txt
  + accept blanks in color-keys for xpm files.
  + if neither xbm/xpm work, try "convert", which may be available.

OBS-URL: https://build.opensuse.org/request/show/499601
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=131
This commit is contained in:
Dominique Leuenberger 2017-06-07 07:50:58 +00:00 committed by Git OBS Bridge
commit 03f1e112d0
4 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ncurses-6.0-crashw.patch Normal file
View File

@ -0,0 +1,30 @@
---
ncurses/curses.priv.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2017-05-30 07:21:41.456357778 +0000
@@ -1137,11 +1137,6 @@ struct screen {
int _pair_count; /* same as COLOR_PAIRS */
int _pair_limit; /* actual limit of color-pairs */
#if NCURSES_EXT_FUNCS
-#if USE_NEW_PAIR
- void *_ordered_pairs; /* index used by alloc_pair() */
- int _pairs_used; /* actual number of color-pairs used */
- int _recent_pair; /* number for most recent free-pair */
-#endif
bool _assumed_color; /* use assumed colors */
bool _default_color; /* use default colors */
bool _has_sgr_39_49; /* has ECMA default color support */
@@ -1295,6 +1290,11 @@ struct screen {
/*
* ncurses/ncursesw are the same up to this point.
*/
+#if USE_NEW_PAIR
+ void *_ordered_pairs; /* index used by alloc_pair() */
+ int _pairs_used; /* actual number of color-pairs used */
+ int _recent_pair; /* number for most recent free-pair */
+#endif
#if USE_WIDEC_SUPPORT
/* recent versions of 'screen' have partially-working support for
* UTF-8, but do not permit ACS at the same time (see tty_update.c).

4
ncurses-6.0-patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e47a61a7f1201f4e5bb07bc34c8db6ca1eaeb9f3bc12911d69c24f3f81619fb7
size 2562098
oid sha256:9edbe2cd0ffbfee005f83b1f4da69e8167729f1004ee5d35abf1e519de077c25
size 2565370

16
ncurses.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue May 30 07:29:14 UTC 2017 - werner@suse.de
- Add patch ncurses-6.0-crashw.patch as a temporary fix which will
become part of next patch level: solve binary incompatiblity of
libtinfow and libtinfo
-------------------------------------------------------------------
Mon May 29 06:51:13 UTC 2017 - werner@suse.de
- Add ncurses patch 20170527
+ improved test/picsmap.c:
+ lookup named colors for xpm files in rgb.txt
+ accept blanks in color-keys for xpm files.
+ if neither xbm/xpm work, try "convert", which may be available.
-------------------------------------------------------------------
Wed May 24 07:10:12 UTC 2017 - werner@suse.de

4
ncurses.spec
View File

@ -66,6 +66,9 @@ Source7: baselibs.conf
Patch0: ncurses-6.0.dif
Patch1: ncurses-5.9-ibm327x.dif
Patch4: ncurses-5.7-tack.dif
# PATCH-FIX-UPSTREAM ... temporary patch which will become part of next
# patch level: fix binary incompatiblity of libtinfow with libtinfo
Patch40: ncurses-6.0-crashw.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _miscdir %{_datadir}/misc
%global _incdir %{_includedir}
@ -237,6 +240,7 @@ find -name '*.orig' -delete
rm -fr tack
tar -xzf %{S:5}
mv tack-* tack
%patch40 -p0 -b .crash
%patch1 -p0 -b .327x
%patch4 -p0 -b .hs
%patch0 -p0 -b .p0