fix compatibility between libtinfo and libncurses (#1456340)
This commit is contained in:
parent
227726ff43
commit
333122f9ea
28
ncurses-screenpair.patch
Normal file
28
ncurses-screenpair.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
|
||||||
|
index abe2139..8cc8e8d 100644
|
||||||
|
--- a/ncurses/curses.priv.h
|
||||||
|
+++ b/ncurses/curses.priv.h
|
||||||
|
@@ -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 NCURSES_EXT_FUNCS && 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).
|
@ -12,6 +12,7 @@ Patch8: ncurses-config.patch
|
|||||||
Patch9: ncurses-libs.patch
|
Patch9: ncurses-libs.patch
|
||||||
Patch11: ncurses-urxvt.patch
|
Patch11: ncurses-urxvt.patch
|
||||||
Patch12: ncurses-kbs.patch
|
Patch12: ncurses-kbs.patch
|
||||||
|
Patch13: ncurses-screenpair.patch
|
||||||
BuildRequires: gpm-devel pkgconfig
|
BuildRequires: gpm-devel pkgconfig
|
||||||
|
|
||||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
@ -125,6 +126,7 @@ The ncurses-static package includes static libraries of the ncurses library.
|
|||||||
%patch9 -p1 -b .libs
|
%patch9 -p1 -b .libs
|
||||||
%patch11 -p1 -b .urxvt
|
%patch11 -p1 -b .urxvt
|
||||||
%patch12 -p1 -b .kbs
|
%patch12 -p1 -b .kbs
|
||||||
|
%patch13 -p1 -b .screenpair
|
||||||
|
|
||||||
for f in ANNOUNCE; do
|
for f in ANNOUNCE; do
|
||||||
iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
|
iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
|
||||||
|
Loading…
Reference in New Issue
Block a user