From 49d7588bff34f47f2f84c561bf36569dda24eede82617d9a0f9253d86e45083e Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 10 Nov 2015 13:35:16 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=227 --- ncurses-6.0-patches.tar.bz2 | 4 +- ncurses-6.0-wildcard_for_ppc64.patch | 47 ---------------------- ncurses.changes | 59 ++++++++++++++++++++++++++++ ncurses.spec | 2 - 4 files changed, 61 insertions(+), 51 deletions(-) delete mode 100644 ncurses-6.0-wildcard_for_ppc64.patch diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2 index 2c5e1ee..37d919a 100644 --- a/ncurses-6.0-patches.tar.bz2 +++ b/ncurses-6.0-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3aeb21efdf6ed458799502f361c5d9d227eed8d557a47d5b2d4435e8fb261e50 -size 202934 +oid sha256:39ee3131b2dc9032ee759fc6b7e0cad509b1f0d69f4e5e445201affcc8a0ea98 +size 326038 diff --git a/ncurses-6.0-wildcard_for_ppc64.patch b/ncurses-6.0-wildcard_for_ppc64.patch deleted file mode 100644 index 110c88e..0000000 --- a/ncurses-6.0-wildcard_for_ppc64.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Michel Normand -Subject: ncurses 6.0 wildcard for ppc64 -Date: Fri, 25 Sep 2015 11:23:32 +0200 - -related to bug openSUSE 946048 -avoid ncurses build error on ppc64 architecture -the nm tool is reporting _is_missing in Data section for ppc64. -(by comparison ppc64le is reporting it in Text section) -=== -[ 102s] /usr/lib64/gcc/powerpc64-suse-linux/5/../../../../powerpc64-suse-linux/bin/ld:resulting.map:113: syntax error in VERSION script -[ 102s] collect2: error: ld returned 1 exit status -=== - -Signed-off-by: Michel Normand ---- - aclocal.m4 | 3 ++- - configure | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -Index: ncurses-6.0/aclocal.m4 -=================================================================== ---- ncurses-6.0.orig/aclocal.m4 -+++ ncurses-6.0/aclocal.m4 -@@ -7625,7 +7625,8 @@ EOF - if make -f conftest.mk 2>&AC_FD_CC >/dev/null - then - # test for missing symbol -- cf_missing=`nm -P conftest.so 2>&AC_FD_CC |fgrep _ismissing | egrep '[[ ]]T[[ ]]'` -+ # could be either Data or Text section -+ cf_missing=`nm -P conftest.so 2>&AC_FD_CC |fgrep _ismissing | egrep '[[ ]][DT][[ ]]'` - test -n "$cf_missing" && WILDCARD_SYMS=yes - fi - AC_MSG_RESULT($WILDCARD_SYMS) -Index: ncurses-6.0/configure -=================================================================== ---- ncurses-6.0.orig/configure -+++ ncurses-6.0/configure -@@ -6660,7 +6660,8 @@ EOF - if make -f conftest.mk 2>&5 >/dev/null - then - # test for missing symbol -- cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ ]T[ ]'` -+ # could be either Data or Text section -+ cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ ][DT][ ]'` - test -n "$cf_missing" && WILDCARD_SYMS=yes - fi - echo "$as_me:6666: result: $WILDCARD_SYMS" >&5 diff --git a/ncurses.changes b/ncurses.changes index d88692b..15f80f3 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Tue Nov 10 13:27:31 UTC 2015 - werner@suse.de + +- Add ncurses patch 20151107 + + modify tset's assignment to TERM in its output to reflect the name by + which the terminal description is found, rather than the primary + name. That was an unnecessary part from the initial conversion of + tset from termcap to terminfo. The termcap program in 4.3BSD did + this to avoid using the short 2-character name (report by Rich + Burridge). + + minor fix to configure script to ensure that rules for resulting.map + are only generated when needed (cf: 20151101). + + modify configure script to handle the case where tic-library is + renamed, but the --with-debug option is used by itself without + normal or shared libraries (prompted by comment in Debian #803482). +- Add ncurses patch 20151101 + + amend change for pkg-config which allows build of pc-files when no + valid pkg-config library directory was configured to suppress the + actual install if it is not overridden to a valid directory at + install time (cf: 20150822). + + modify editing script which generates resulting.map to work with the + clang configuration on recent FreeBSD, which gives an error on an + empty "local" section. + + fix a spurious "(Part)" message in test/ncurses.c b/B tests due + to incorrect attribute-masking. +- Add ncurses patch 20151024 + + modify MKexpanded.c to update the expansion of a temporary filename + to "expanded.c", for use in trace statements. + + modify layout of b/B tests in test/ncurses.c to allow for additional + annotation on the right margin; some terminals with partial support + did not display well. + + fix typo in curs_attr.3x (patch by Sven Joachim). + + fix typo in INSTALL (patch by Tomas Cech). + + improve configure check for setting WILDCARD_SYMS variable; on ppc64 + the variable is in the Data section rather than Text (patch by Michel + Normand). + + using configure option "--without-fallbacks" incorrectly caused + FALLBACK_LIST to be set to "no" (patch by Tomas Cech). + + updated minitel entries to fix kel problem with emacs, and add + minitel1b-nb (Alexandre Montaron). + + reviewed/updated nsterm entry Terminal.app in OSX -TD + + replace some dead URLs in comments with equivalents from the + Internet Archive -TD + + update config.guess, config.sub from + http://git.savannah.gnu.org/cgit/config.git +- Add ncurses patch 20151017 + + modify ncurses/Makefile.in to sort keys.list in POSIX locale + (Debian #801864, patch by Esa Peuha). + + remove an early-return from _nc_do_color, which can interfere with + data needed by bkgd when ncurses is configured with extended colors + (patch by Denis Tikhomirov). + > fixes for OS/2 (patches by KO Myung-Hun) + + use button instead of kbuf[0] in EMX-specific part of lib_mouse.c + + support building with libtool on OS/2 + + use stdc++ on OS/2 kLIBC + + clear cf_XOPEN_SOURCE on OS/2 +- Remove patch ncurses-6.0-wildcard_for_ppc64.patch as this change is + now upstream with patch set 20151024 + ------------------------------------------------------------------- Sat Oct 31 12:04:22 UTC 2015 - sleep_walker@opensuse.org diff --git a/ncurses.spec b/ncurses.spec index a14ae9c..9250148 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -67,7 +67,6 @@ Patch0: ncurses-6.0.dif Patch1: ncurses-5.9-ibm327x.dif Patch4: ncurses-5.7-tack.dif Patch5: ncurses-5.9-environment.dif -Patch7: ncurses-6.0-wildcard_for_ppc64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _miscdir %{_datadir}/misc %global _incdir %{_includedir} @@ -282,7 +281,6 @@ mv tack-* tack %patch -P 4 -p0 -b .hs %patch -P 5 -p0 -b .lc %patch -P 0 -p0 -b .p0 -%patch -P 7 -p1 -b .p7 rm -vf include/ncurses_dll.h rm -vf mkdirs.sh rm -vf tar-copy.sh