diff --git a/.gitignore b/.gitignore index 13ef66a..9ec7a25 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/ncurses-6.0-20170520.tgz +/ncurses-6.0-20170722.tgz diff --git a/ncurses-screenpair.patch b/ncurses-screenpair.patch deleted file mode 100644 index 7c8d749..0000000 --- a/ncurses-screenpair.patch +++ /dev/null @@ -1,28 +0,0 @@ -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). diff --git a/ncurses.spec b/ncurses.spec index 389a08b..906157f 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,4 +1,4 @@ -%global revision 20170520 +%global revision 20170722 Summary: Ncurses support utilities Name: ncurses Version: 6.0 @@ -12,7 +12,6 @@ Patch8: ncurses-config.patch Patch9: ncurses-libs.patch Patch11: ncurses-urxvt.patch Patch12: ncurses-kbs.patch -Patch13: ncurses-screenpair.patch BuildRequires: gpm-devel pkgconfig Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -126,7 +125,6 @@ The ncurses-static package includes static libraries of the ncurses library. %patch9 -p1 -b .libs %patch11 -p1 -b .urxvt %patch12 -p1 -b .kbs -%patch13 -p1 -b .screenpair for f in ANNOUNCE; do iconv -f iso8859-1 -t utf8 -o ${f}{_,} && diff --git a/sources b/sources index 19c4f7e..608c07c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ncurses-6.0-20170520.tgz) = 025b39ea8e68dc36ef5641ba1e665354deea07f3457141564605569e3ca64f22cca4c015e4f97303cada9c6978d98e18d1d8f1566c582bfacf31b52b734ae4c5 +SHA512 (ncurses-6.0-20170722.tgz) = 85726c76e99285c2024dd007156d29eb856016fd303398164000b8a0076d9c6e6f72ecc5567f85cbab3473e4fad21d74df02c844e29c8b00148bfd2ef19c0450