Accepting request 334016 from Base:System
1 OBS-URL: https://build.opensuse.org/request/show/334016 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=109
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
364758359b
@ -17,9 +17,9 @@
|
||||
+++ configure 2013-09-30 09:17:52.000000000 +0000
|
||||
@@ -6956,6 +6956,7 @@ else
|
||||
fi;
|
||||
echo "$as_me:6984: result: $with_overwrite" >&5
|
||||
echo "$as_me:6991: result: $with_overwrite" >&5
|
||||
echo "${ECHO_T}$with_overwrite" >&6
|
||||
+WITH_OVERWRITE="$with_overwrite"
|
||||
|
||||
echo "$as_me:6987: checking if external terminfo-database is used" >&5
|
||||
echo "$as_me:6994: checking if external terminfo-database is used" >&5
|
||||
echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3b53f39b902abe42e92cb9439db0bae29beaa889ecdc60980576a29186b2d4a9
|
||||
size 45308
|
||||
oid sha256:00379206ba6ea322d8fe2697beec9ebe1dfffed3d7db1ec52e2a0273c1e5b2dd
|
||||
size 145857
|
||||
|
||||
47
ncurses-6.0-wildcard_for_ppc64.patch
Normal file
47
ncurses-6.0-wildcard_for_ppc64.patch
Normal file
@ -0,0 +1,47 @@
|
||||
From: Michel Normand <normand@linux.vnet.ibm.com>
|
||||
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 <normand@linux.vnet.ibm.com>
|
||||
---
|
||||
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
|
||||
@ -1,3 +1,50 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 25 09:42:43 UTC 2015 - normand@linux.vnet.ibm.com
|
||||
|
||||
- New patch to avoid ppc64 build error, related to bnc#946048
|
||||
ncurses-6.0-wildcard_for_ppc64.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 14 08:02:36 UTC 2015 - werner@suse.de
|
||||
|
||||
- Add ncurses patch 20150912
|
||||
+ fixes for configure/build using clang on OSX (prompted by report by
|
||||
William Gallafent).
|
||||
+ do not redefine "inline" in ncurses_cfg.h; this was originally to
|
||||
solve a problem with gcc/g++, but is aggravated by clang's misuse
|
||||
of symbols to pretend it is gcc.
|
||||
+ add braces to configure script to prevent unwanted add of
|
||||
"-lstdc++" to the CXXLIBS symbol.
|
||||
+ improve/update test-program used for checking existence of stdc++
|
||||
library.
|
||||
+ if $CXXLIBS is set, the linkage test uses that in addition to $LIBS
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 7 09:02:07 UTC 2015 - werner@suse.de
|
||||
|
||||
- Add ncurses patch 20150905
|
||||
+ add note in curs_addch.3x about line-drawing when it depends upon
|
||||
UTF-8.
|
||||
+ add tic -q option for consistency with infocmp, use it to suppress
|
||||
all comments from the "tic -I" output.
|
||||
+ modify infocmp -q option to suppress the "Reconstructed from"
|
||||
header.
|
||||
+ add infocmp/tic -Q option, which allows one to dump the compiled
|
||||
form of the terminal entry, in hexadecimal or base64.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 31 13:13:43 UTC 2015 - werner@suse.de
|
||||
|
||||
- Add ncurses patch 20150822
|
||||
+ sort options in usage message for infocmp, to make it simpler to
|
||||
see unused letters.
|
||||
+ update usage message for tic, adding "-0" option.
|
||||
+ documented differences in ESCDELAY versus AIX's implementation.
|
||||
+ fix some compiler warnings from ports.
|
||||
+ modify --with-pkg-config-libdir option to make it possible to install
|
||||
".pc" files even if pkg-config is not found (adapted by patch by
|
||||
Joshua Root).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 17 07:18:34 UTC 2015 - werner@suse.de
|
||||
|
||||
|
||||
@ -64,6 +64,7 @@ Patch3: ncurses-5.9-overwrite.dif
|
||||
Patch4: ncurses-5.7-tack.dif
|
||||
Patch5: ncurses-5.9-environment.dif
|
||||
Patch6: ncurses-6.0-avoid-line-markers.dif
|
||||
Patch7: ncurses-6.0-wildcard_for_ppc64.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%global _sysconfdir /etc
|
||||
%global _miscdir %{_datadir}/misc
|
||||
@ -283,6 +284,7 @@ mv tack-* tack
|
||||
%patch -P 5 -p0 -b .lc
|
||||
%patch -P 0 -p0 -b .p0
|
||||
%patch -P 6 -p0 -b .p6
|
||||
%patch -P 7 -p1 -b .p7
|
||||
rm -vf include/ncurses_dll.h
|
||||
rm -vf mkdirs.sh
|
||||
rm -vf tar-copy.sh
|
||||
@ -299,6 +301,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
|
||||
SCREENLOG=${SCREENDIR}/log
|
||||
cat > $SCREENRC<<-EOF
|
||||
deflogin off
|
||||
deflog on
|
||||
logfile $SCREENLOG
|
||||
logfile flush 1
|
||||
logtstamp off
|
||||
|
||||
Loading…
Reference in New Issue
Block a user